diff options
| -rw-r--r-- | pavement.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/pavement.py b/pavement.py index 41134b324..033e0bd9f 100644 --- a/pavement.py +++ b/pavement.py @@ -15,7 +15,7 @@ as follows:: # remove build dir, and everything generated by previous paver calls # (included generated installers). Use with care ! paver nuke - paver bootstrap && source boostrap/bin/activate + paver bootstrap && source bootstrap/bin/activate # Installing numpy is necessary to build the correct documentation (because # of autodoc) python setupegg.py install @@ -93,7 +93,7 @@ options(bootstrap=Bunch(bootstrap_dir="bootstrap"), superpack=Bunch(builddir="build-superpack"), installers=Bunch(releasedir="release", installersdir=os.path.join("release", "installers")), - doc=Bunch(doc_root="doc", + doc=Bunch(doc_root="doc", sdir=os.path.join("doc", "source"), bdir=os.path.join("doc", "build"), bdir_latex=os.path.join("doc", "build", "latex"), @@ -117,8 +117,8 @@ SITECFG = {"sse2" : SSE2_CFG, "sse3" : SSE3_CFG, "nosse" : NOSSE_CFG} if sys.platform =="darwin": WINDOWS_PYTHON = { - "2.6": ["wine", "/Users/david/.wine/drive_c/Python26/python.exe"], - "2.5": ["wine", "/Users/david/.wine/drive_c/Python25/python.exe"] + "2.6": ["wine", os.environ['HOME'] + "/.wine/drive_c/Python26/python.exe"], + "2.5": ["wine", os.environ['HOME'] + "/.wine/drive_c/Python25/python.exe"] } WINDOWS_ENV = os.environ WINDOWS_ENV["DYLD_FALLBACK_LIBRARY_PATH"] = "/usr/X11/lib:/usr/lib" @@ -134,16 +134,16 @@ elif sys.platform == "win32": MAKENSIS = ["makensis"] else: WINDOWS_PYTHON = { - "2.6": ["wine", "/home/david/.wine/drive_c/Python26/python.exe"], - "2.5": ["wine", "/home/david/.wine/drive_c/Python25/python.exe"] + "2.6": ["wine", os.environ['HOME'] + "/.wine/drive_c/Python26/python.exe"], + "2.5": ["wine", os.environ['HOME'] + "/.wine/drive_c/Python25/python.exe"] } WINDOWS_ENV = os.environ MAKENSIS = ["wine", "makensis"] # Start/end of the log (from git) -LOG_START = 'svn/tags/1.3.0' +LOG_START = 'svn/tags/1.4.0' LOG_END = 'master' -RELEASE_NOTES = 'doc/release/1.4.0-notes.rst' +RELEASE_NOTES = 'doc/release/1.5.0-notes.rst' #------------------- # Windows installers @@ -208,7 +208,7 @@ def bdist_superpack(options): copy_bdist("sse2") bdist_wininst_arch(pyver, 'sse3') copy_bdist("sse3") - + idirs = options.installers.installersdir pyver = options.python_version prepare_nsis_script(pyver, FULLVERSION) @@ -275,8 +275,8 @@ def bootstrap(options): options.virtualenv.script_name = os.path.join(options.bootstrap_dir, bscript) - options.virtualenv.no_site_packages = True - options.bootstrap.no_site_packages = True + options.virtualenv.no_site_packages = False + options.bootstrap.no_site_packages = False call_task('paver.virtual.bootstrap') sh('cd %s; %s %s' % (bdir, sys.executable, bscript)) |