Changeset b470477 in sasview

Timestamp:

Aug 18, 2011 12:52:22 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:

f67ed10

Parents:

c648414

Message:

fixes of build scripts

File:

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

sansview/build_sansview.py

@@ -79 +79 @@
 DATALOADER_URL = "svn://danse.us/sans/releases/sansdataloader-%s" % DATALOADER
 GUIFRAME_URL = "svn://danse.us/sans/releases/sansguiframe-%s" % GUIFRAME
-PLOTTOOLS_URL = "svn://danse.us/common/releases/plottools-%s/trunk" % PLOTTOOLS
+PLOTTOOLS_URL = "svn://danse.us/common/releases/plottools-%s" % PLOTTOOLS
 UTIL_URL = "svn://danse.us/common/releases/util-%s" % UTIL
 SANSVIEW_URL = "svn://danse.us/sans/releases/sansview-%s" % SANSVIEW
@@ -177 +177 @@
     os.chdir(wd)
     if release:
-        install_pkg("plottools-%s" % PLOTTOOLS, "trunk", PLOTTOOLS_URL)
-    else:
-        install_pkg("plottools", "trunk", "svn://danse.us/common/plottools/trunk")
+        install_pkg(".", "plottools-%s" % PLOTTOOLS, PLOTTOOLS_URL)
+    else:
+        install_pkg(".", "plottools", "svn://danse.us/common/plottools")
     
     os.chdir(wd)
@@ -197 +197 @@
         install_pkg(".", "inversionview-%s" % PRVIEW, PRVIEW_URL)
     else:
-        install_pkg(".", "prview", "svn://danse.us/sans/trunk/inversionview")
+        install_pkg(".", "inversionview", "svn://danse.us/sans/trunk/inversionview")
     
     os.chdir(wd)
@@ -209 +209 @@
         install_pkg(".", "sansinvariant-%s" % INVARIANT, INV_URL)
     else:
-        install_pkg(".", "Invariant", "svn://danse.us/sans/trunk/sansinvariant")
+        install_pkg(".", "sansinvariant", "svn://danse.us/sans/trunk/sansinvariant")
     
     os.chdir(wd)
@@ -238 +238 @@
     os.chdir(wd)
     if release:
-        os.system(".", "fittingview-%s" % FIT_VIEW, FIT_URL)
-    else:
-        os.system(".", "fittingview", "svn://danse.us/sans/trunk/fittingview")
+        install_pkg(".", "fittingview-%s" % FIT_VIEW, FIT_URL)
+    else:
+        install_pkg(".", "fittingview", "svn://danse.us/sans/trunk/fittingview")
             
     os.chdir(wd)
@@ -262 +262 @@
         old_dirs = [os.path.join(libdir, 'danse'),
                     os.path.join(libdir, 'data_util'),
-                    os.path.join(libdir, 'DataLoader'),
                     os.path.join(libdir, 'park'),
                     os.path.join(libdir, 'sans'),
-                    os.path.join(libdir, 'sans_extension'),
                     ]
         for d in old_dirs: