[Scipy-svn] r6314 - branches/0.7.x

[scipy-svn at scipy.org]

Author: stefan
Date: 2010-04-08 09:25:40 -0500 (Thu, 08 Apr 2010)
New Revision: 6314

Modified:
   branches/0.7.x/pavement.py
Log:
Fix MakeNSIS call when building superpack.

Modified: branches/0.7.x/pavement.py
===================================================================
--- branches/0.7.x/pavement.py	2010-04-08 14:25:03 UTC (rev 6313)
+++ branches/0.7.x/pavement.py	2010-04-08 14:25:40 UTC (rev 6314)
@@ -77,12 +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 = ["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 = [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')
@@ -359,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)
 
     pyver = options.wininst.pyver