Changeset b81cf5c in sasview

Timestamp:

Jun 14, 2009 8:59:31 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:

57acd41

Parents:

c405c69

Message:

sansview: modified builder

File:

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

sansview/build_sansview.py

@@ -177 +177 @@
         os.system("%s checkout -q svn://danse.us/sans/trunk/sansview" % SVN)
     
-def prepare():
+def prepare(wipeout = False):
     """
         Prepare the build
     """
     # Remove existing libraries
-    from distutils.sysconfig import get_python_lib
-    libdir = get_python_lib()
-    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:
-        if os.path.isdir(d):
-            shutil.rmtree(d)
-    
+    if wipeout == True:
+        print "Deleting old modules"
+        from distutils.sysconfig import get_python_lib
+        libdir = get_python_lib()
+        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:
+            if os.path.isdir(d):
+                shutil.rmtree(d)
+        
     # Create a fresh installation folder
     if os.path.isdir(INSTALL_FOLDER):
@@ -212 +214 @@
         Ask the user whether he wants to proceed.
     """
-    print "WARNING!n"
+    print "WARNING!\n"
     print "In order to build a clean version of SansView, this script"
     print "deletes anything found under site-packages for the following"
@@ -222 +224 @@
     print "   - sans"
     print "   - sans_extension\n"
-    answer = raw_input("Are you sure you want to proceed? [Y|N]")
+    answer = raw_input("Do you want to delete those modules [Y] or continue with a dirty installation [N]? [Y|N]")
     return answer.upper()=="Y"
         
 if __name__ == "__main__": 
     print "Build script for SansView %s" % SANSVIEW
-    
-    # Make sure the user really wants to proceed
-    if not warning():
-        print "Execution canceled" 
-        sys.exit()
     
     if len(sys.argv)==1:
@@ -261 +258 @@
         else:
             logging.info("Build script for SansView %s" % SANSVIEW)
+                    
             # Prepare installation folder
-            prepare()
+            prepare(warning())
             
             # Check the command line argument