[Scipy-svn] r6385 - trunk

[scipy-svn at scipy.org]

Author: rgommers
Date: 2010-05-08 09:16:06 -0500 (Sat, 08 May 2010)
New Revision: 6385

Modified:
   trunk/pavement.py
Log:
REL: cleanups of Paver script taken from the 0.7.x branch.

Modified: trunk/pavement.py
===================================================================
--- trunk/pavement.py	2010-05-08 10:35:37 UTC (rev 6384)
+++ trunk/pavement.py	2010-05-08 14:16:06 UTC (rev 6385)
@@ -77,14 +77,15 @@
 if sys.platform == "win32":
     WINE_PY25 = [r"C:\Python25\python.exe"]
     WINE_PY26 = [r"C:\Python26\python26.exe"]
+    MAKENSIS = ["makensis"]
 elif sys.platform == "darwin":
-    WINE_PY25 = ["/Applications/Darwine/Wine.bundle/Contents/bin/wine",
-                 "/Users/david/.wine/drive_c/Python25/python.exe"]
-    WINE_PY26 = ["/Applications/Darwine/Wine.bundle/Contents/bin/wine",
-                 "/Users/david/.wine/drive_c/Python26/python.exe"]
+    WINE_PY25 = ["wine", os.environ['HOME'] + "/.wine/drive_c/Python25/python.exe"]
+    WINE_PY26 = ["wine", os.environ['HOME'] + "/.wine/drive_c/Python26/python.exe"]
+    MAKENSIS = ["wine", "makensis"]
 else:
-    WINE_PY25 = ["/home/david/.wine/drive_c/Python25/python.exe"]
-    WINE_PY26 = ["/home/david/.wine/drive_c/Python26/python.exe"]
+    WINE_PY25 = [os.environ['HOME'] + "/.wine/drive_c/Python25/python.exe"]
+    WINE_PY26 = [os.environ['HOME'] + "/.wine/drive_c/Python26/python.exe"]
+    MAKENSIS = ["wine", "makensis"]
 WINE_PYS = {'2.6' : WINE_PY26, '2.5': WINE_PY25}
 SUPERPACK_BUILD = 'build-superpack'
 SUPERPACK_BINDIR = os.path.join(SUPERPACK_BUILD, 'binaries')
@@ -123,11 +124,15 @@
 
 options(sphinx=Bunch(builddir="build", sourcedir="source", docroot='doc'),
         virtualenv=Bunch(script_name=BOOTSTRAP_SCRIPT,
-        packages_to_install=["sphinx==0.6.1"]),
-        wininst=Bunch(pyver="2.5", scratch=True))
+        packages_to_install=["sphinx==0.6.5"]),
+        wininst=Bunch(pyver=PYVER, scratch=True))
 
 def parse_numpy_version(pyexec):
-    cmd = [pyexec, "-c", '"import numpy; print numpy.version.version"']
+    if isinstance(pyexec, str):
+        cmd = [pyexec, "-c", "'import numpy; print numpy.version.version'"]
+    else:
+        # sequence for pyexec
+        cmd = pyexec + ["-c", "'import numpy; print numpy.version.version'"]
 
     # Execute in shell because launching python from python does not work
     # (hangs)
@@ -357,8 +362,8 @@
 def bdist_superpack(options):
     """Build all arch specific wininst installers."""
     prepare_nsis_script(options.wininst.pyver, FULLVERSION)
-    subprocess.check_call(['makensis', 'scipy-superinstaller.nsi'],
-            cwd=SUPERPACK_BUILD)
+    subprocess.check_call(MAKENSIS + ['scipy-superinstaller.nsi'],
+                          cwd=SUPERPACK_BUILD)
 
     # Copy the superpack into installers dir
     if not os.path.exists(INSTALLERS_DIR):