Permalink
Browse files

ENH: Several changes to Paver script taken from 1.4.x branch.

Backport of r8513.
  • Loading branch information...
1 parent 7d10ac5 commit 54d2f18f100ee9bb4872ff87594918853c4b3444 @rgommers rgommers committed Jul 24, 2010
Showing with 11 additions and 11 deletions.
  1. +11 −11 pavement.py
View
22 pavement.py
@@ -15,7 +15,7 @@
# 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 @@
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 @@
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 @@
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 copy_bdist(arch):
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))

0 comments on commit 54d2f18

Please sign in to comment.