Changeset db7b92e in sasview

Timestamp:

May 3, 2010 10:28:58 AM (15 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:

ee370db

Parents:

481ad37

Message:

sansview: update build script for mac

File:

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

sansview/build_sansview.py

@@ -16 +16 @@
 #
 #   - mingw must be installed
+#
+# On Mac:
+#   - Macholib must be installed to use py2app
 #
 # Usage:
@@ -35 +38 @@
 timestamp = int(time.time())
 CWD    = os.getcwd()
-
 INSTALL_FOLDER = "install_%s" % str(timestamp)
-LIB_FOLDER = "%s\%s" % (CWD, INSTALL_FOLDER)
+
+# 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"
+    LIB_FOLDER = "%s/%s" % (CWD, INSTALL_FOLDER)
+else:
+    PYTHON = 'python'
 
 logging.basicConfig(level=logging.INFO,
@@ -43 +52 @@
                     filename='build_%s.log' % str(timestamp),
                     filemode='w')
-
-
-# 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"
@@ -137 +138 @@
         if sys.platform == 'win32':
             os.system("%s setup.py -q build -cmingw32" % PYTHON)
+            os.system("%s setup.py -q install --root \"%s\"" % (PYTHON, LIB_FOLDER))
         else:
-            os.system("%s setup.py -q build" % PYTHON)
-        os.system("%s setup.py -q install --root \"%s\"" % (PYTHON, LIB_FOLDER))
+            os.system("%s setup.py build" % PYTHON)
+            os.system("%s setup.py install --prefix ~/.local" % PYTHON)
     except:
         logging.error("Install failed for %s" % url)
@@ -154 +156 @@
     os.chdir(wd)
     if release:
+        install_pkg(".", "DataLoader-%s" % DATALOADER, DATALOADER_URL)
+    else:
+        install_pkg(".", "DataLoader", "svn://danse.us/sans/trunk/DataLoader")
+    
+    os.chdir(wd)
+    if release:
         install_pkg(".", "sansmodels-%s/src" % SANSMODELS, SANSMODELS_URL)
     else:
         install_pkg(".", "sansmodels/src", "svn://danse.us/sans/trunk/sansmodels")
-    
-    os.chdir(wd)
-    if release:
-        install_pkg(".", "DataLoader-%s" % DATALOADER, DATALOADER_URL)
-    else:
-        install_pkg(".", "DataLoader", "svn://danse.us/sans/trunk/DataLoader")
     
     os.chdir(wd)
@@ -355 +357 @@
                 checkout(True)
                 if sys.platform=='win32':
-                    logging.info("Building installer from release version")
+                    logging.info("Building Windows installer from release version")
                     os.chdir("sansview-%s" % (SANSVIEW))
-                    os.system("%s setup_exe.py -q py2exe --extrapath \"%s\python25\lib\site-packages\"" % (PYTHON, LIB_FOLDER))
+                    os.system("%s setup_exe.py py2exe --extrapath \"%s\python25\lib\site-packages\"" % (PYTHON, LIB_FOLDER))
                     os.system("%s/Q installer.iss" % INNO)
                     shutil.copy2(os.path.join("Output","setupSansView.exe"), 
                                  os.path.join(CWD, "setupSansView_%s.exe" % str(timestamp)))
                 elif sys.platform=='darwin':
-                    #TODO: bundle a Mac app
-                    pass
+                    logging.info("Building Mac application from release version")
+                    os.chdir("sansview-%s" % (SANSVIEW))
+                    os.system("%s setup_mac.py py2app" % PYTHON)                    
                     
     raw_input("Press enter to continue\n")