Changeset d3d955e in sasview

Timestamp:

Apr 28, 2010 5:19:00 PM (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:

91f151a

Parents:

017ec0b7

Message:

sansview: updated build script

File:

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

sansview/build_sansview.py

@@ -34 +34 @@
 import time
 timestamp = int(time.time())
+CWD    = os.getcwd()
+
 INSTALL_FOLDER = "install_%s" % str(timestamp)
+LIB_FOLDER = "%s\%s" % (CWD, INSTALL_FOLDER)
 
 logging.basicConfig(level=logging.INFO,
@@ -41 +44 @@
                     filemode='w')
 
-CWD    = os.getcwd()
 
 # On Windows, the python executable is not always on the path.
@@ -53 +55 @@
 INNO   = "\"c:\Program Files\Inno Setup 5\ISCC\""
 
-# Release version 1.0.0
-SANSMODELS = "0.4.5"
-DATALOADER = "0.2.5"
-GUICOMM    = "0.1.3"
-GUIFRAME   = "0.1.8"
-SANSVIEW   = "1.0.0"
-PLOTTOOLS  = "0.1.7"
-UTIL       = "0.1.3"
-PARK       = "1.2"
-PARK_INTEG = "0.1.3"
+# Release version 1.3.0
+SANSMODELS = "0.4.6"
+DATALOADER = "0.2.6"
+GUICOMM    = "0.1.4"
+GUIFRAME   = "0.1.9"
+SANSVIEW   = "1.3.0"
+PLOTTOOLS  = "0.1.8"
+UTIL       = "0.1.4"
+PARK       = "1.2" # May need update
+PARK_INTEG = "0.1.4"
 PRVIEW     = "0.3.1"
-PR_INV     = "0.2.3"
+PR_INV     = "0.2.4"
+CALCULATOR = "0.1.0"
+CALC_VIEW  = "0.1.0"
+INVARIANT  = "0.1.0"
+INV_VIEW   = "0.1.0"
+THEORY_VIEW= "0.1.0"
+ELEMENTS = "1.0.2"
 
 # URLs for SVN repos
@@ -78 +86 @@
 PRVIEW_URL = "svn://danse.us/sans/releases/prview-%s" % PRVIEW
 PR_INV_URL = "svn://danse.us/sans/releases/pr_inversion-%s" % PR_INV
-
+CALC_URL = "svn://danse.us/sans/releases/calculator-%s" % CALCULATOR
+CALC_VIEW_URL = "svn://danse.us/sans/releases/calculatorview-%s" % CALC_VIEW
+INV_URL = "svn://danse.us/sans/releases/Invariant-%s" % INVARIANT
+INV_VIEW_URL = "svn://danse.us/sans/releases/invariantview-%s" % INV_VIEW
+THEO_VIEW_URL = "svn://danse.us/sans/releases/theoryview-%s" % THEORY_VIEW
+ELEMENTS_URL = "svn://danse.us/common/elements/releases/elements-%s" % ELEMENTS
 
 def check_system():
@@ -115 +128 @@
         @param url: URL of the SVN repo
     """
-    if not os.path.isdir(install_dir):
-        os.mkdir(install_dir)
-    os.chdir(install_dir)   
-    os.system("%s checkout -q %s" % (SVN, url))        
-    os.chdir(setup_dir)
-    os.system("%s setup.py -q build -cmingw32" % PYTHON)
-    os.system("%s setup.py -q install" % PYTHON)
+    logging.info("Installing %s" % url)
+    try:
+        if not os.path.isdir(install_dir):
+            os.mkdir(install_dir)
+        os.chdir(install_dir)   
+        os.system("%s checkout -q %s" % (SVN, url))        
+        os.chdir(setup_dir)
+        if sys.platform == 'win32':
+            os.system("%s setup.py -q build -cmingw32" % PYTHON)
+        else:
+            os.system("%s setup.py -q build" % PYTHON)
+        os.system("%s setup.py -q install --root \"%s\"" % (PYTHON, LIB_FOLDER))
+    except:
+        logging.error("Install failed for %s" % url)
+        logging.error(sys.exc_value)
+        raw_input("Press enter to continue\n")
+        sys.exit()
     
 def checkout(release=False):
@@ -185 +208 @@
     os.chdir(wd)
     if release:
-        pass
+        install_pkg(".", "Invariant-%s" % INVARIANT, INV_URL)
     else:
         install_pkg(".", "Invariant", "svn://danse.us/sans/trunk/Invariant")
@@ -191 +214 @@
     os.chdir(wd)
     if release:
-        pass
+        install_pkg(".", "invariantview-%s" % INV_VIEW, INV_VIEW_URL)
     else:
         install_pkg(".", "invariantview", "svn://danse.us/sans/trunk/invariantview")
@@ -197 +220 @@
     os.chdir(wd)
     if release:
-        pass
+        install_pkg(".", "calculatorview-%s" % CALC_VIEW, CALC_VIEW_URL)
     else:
         install_pkg(".", "calculatorview", "svn://danse.us/sans/trunk/calculatorview")
@@ -203 +226 @@
     os.chdir(wd)
     if release:
-        pass
+        install_pkg(".", "calculator-%s" % CALCULATOR, CALC_URL)
     else:
         install_pkg(".", "calculator", "svn://danse.us/sans/trunk/calculator")
@@ -209 +232 @@
     os.chdir(wd)
     if release:
-        pass
+        install_pkg(".", "theoryview-%s" % THEORY_VIEW, THEO_VIEW_URL)
     else:
         install_pkg(".", "theoryview", "svn://danse.us/sans/trunk/theoryview")
 
-    #TODO: need a release version of PARK
+    os.chdir(wd)
+    if release:
+        #install_pkg(".", "elements-%s" % ELEMENTS, ELEMENTS_URL)
+        install_pkg("elements", "trunk", "svn://danse.us/common/elements/trunk")
+    else:
+        install_pkg("elements", "trunk", "svn://danse.us/common/elements/trunk")
+
     os.chdir(wd)
     if release:
@@ -229 +258 @@
     """
         Prepare the build
+        
+        @param wipeout: If True, the DANSE modules in the standard site-packages will be
+        removed to avoid conflicts.
     """
     # Remove existing libraries
     if wipeout == True:
-        print "Deleting old modules"
+        logging.info("Deleting DANSES modules in site-packages")
         from distutils.sysconfig import get_python_lib
         libdir = get_python_lib()
@@ -326 +358 @@
                     logging.info("Building installer from release version")
                     os.chdir("sansview-%s" % (SANSVIEW))
-                    os.system("%s setup_exe.py -q py2exe" % PYTHON)
+                    os.system("%s setup_exe.py -q 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)))
                     
-    
+    raw_input("Press enter to continue\n")
+