Changeset 391c480 in sasview

Timestamp:

Dec 15, 2011 3:05:20 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

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:

13bc1b3a

Parents:

cf81aaa

Message:

correct v# for park

File:

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

sansview/build_sansview.py

@@ -44 +44 @@
 # On Windows, the python executable is not always on the path.
 # Use its most frequent location as the default.
+# Select the appropriate python version to use.
+if sys.version_info >= (3, 0) or sys.version_info < (2, 5):
+    print "*** This script only works with Python 2.5, 2.6, or 2.7."
+    sys.exit()
+elif sys.version_info > (2, 6):
+    P_version = 27
+elif sys.version_info > (2, 5):
+    P_version = 26
+else:
+    P_version = 25
+    
 if sys.platform == 'win32':
-    PYTHON = "c:\python25\python"
+    PYTHON = "c:\python%s\python"% str(P_version)
     LIB_FOLDER = "%s/%s" % (CWD, INSTALL_FOLDER)
 else:
@@ -193 +204 @@
     os.chdir(wd)
     if release:
-        install_pkg(".", "util-%s" % UTIL, UTIL_URL)
-    else:
-        install_pkg(".", "util", "https://sansviewproject.svn.sourceforge.net/svnroot/sansviewproject/trunk/sansutil")
+        install_pkg(".", "sansutil-%s" % UTIL, UTIL_URL)
+    else:
+        install_pkg(".", "sansutil", "https://sansviewproject.svn.sourceforge.net/svnroot/sansviewproject/trunk/sansutil")
     
     os.chdir(wd)
@@ -244 +255 @@
         install_pkg(".", "park-%s" % PARK, PARK_URL)
     else:
-        install_pkg(".", "park-1.2", "https://sansviewproject.svn.sourceforge.net/svnroot/sansviewproject/trunk/park-1.2")
+        install_pkg(".", "park-1.2.1", "https://sansviewproject.svn.sourceforge.net/svnroot/sansviewproject/trunk/park-1.2.1")
         
     os.chdir(wd)