Changeset 138ac69 in sasview

Timestamp:

May 13, 2009 7:38:25 PM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

7f7e5f1

Parents:

dad49a0

Message:

sansview: modify build script to default to simple checkout of the release version on non-windows platforms.

File:

• sansview/build_sansview.py (modified) (5 diffs)

sansview/build_sansview.py

@@ -24 +24 @@
 
 import os
+import sys
 import shutil
 import logging
@@ -38 +39 @@
 
 CWD    = os.getcwd()
-PYTHON = "c:\python25\python"
+
+# On Windows, the python executable is not always on the path.
+# Use its most frequent location as the default.
+if sys.platform == 'win32':
+    PYTHON = "c:\python25\python"
+else:
+    PYTHON = 'python'
+
 SVN    = "svn"
 INNO   = "\"c:\Program Files\Inno Setup 5\ISCC\""
@@ -218 +226 @@
         
 if __name__ == "__main__": 
-    import sys
-    
     print "Build script for SansView %s" % SANSVIEW
     
@@ -240 +246 @@
             print "    -r: Builds a SansView using the released modules"
             print "    -t: Builds SansView from the trunk"
-            print "    -i: Builds an installer from the release version"        
+            print "    -i: Builds an installer from the release version [Windows only]"        
             print "    -n: Print out the dependencies for the release notes"
         elif sys.argv[1]=="-n":
@@ -268 +274 @@
                 logging.info("Building release version")
                 checkout(True)
-                logging.info("Building installer from release version")
-                os.chdir("sansview-%s" % (SANSVIEW))
-                os.system("%s setup_exe.py -q py2exe" % PYTHON)
-                os.system("%s/Q installer.iss" % INNO)
-                shutil.copy2(os.path.join("Output","setupSansView.exe"), 
-                             os.path.join(CWD, "setupSansView_%s.exe" % str(timestamp)))
-                
-    
+                if sys.platform=='win32':
+                    logging.info("Building installer from release version")
+                    os.chdir("sansview-%s" % (SANSVIEW))
+                    os.system("%s setup_exe.py -q py2exe" % PYTHON)
+                    os.system("%s/Q installer.iss" % INNO)
+                    shutil.copy2(os.path.join("Output","setupSansView.exe"), 
+                                 os.path.join(CWD, "setupSansView_%s.exe" % str(timestamp)))
+                    
+