Changeset 783 for branches

Timestamp:

Nov 18, 2007 7:33:39 PM (12 years ago)

Author:

jpfasano

Message:

Moved the deleting of the build directory to be before the svn commands.
This is because on windows the build directory and source directory are the same.

Before this change the source directory would be deleted.
Now the source directory will still be deleted but an svn checkkout will be done to get a new copy of the source.

File:

• branches/testScripts/NBbuildConfig.py (modified) (2 diffs)

branches/testScripts/NBbuildConfig.py

@@ -152 +152 @@
   #for a list of commands that have been executed
   commandHistory = []
+
+  #---------------------------------------------------------------------
+  # Completely remove a previous build if the user indicates this
+  #---------------------------------------------------------------------
+  if configuration['clear previous build'] and os.path.isdir(fullBuildDir) :
+    NBlogMessages.writeMessage('  Remove previous build in directory '+fullBuildDir)
+    try:
+      shutil.rmtree(fullBuildDir)
+    except shutils.Error :
+      NBlogMessages.writeMessage('  Warning: removal of directory '+fullBuildDir+' failed.')
 
   #---------------------------------------------------------------------
@@ -253 +263 @@
           NBlogMessages.writeMessage('  Skipped a new download into '+thirdPartyBaseDir)
 
-  #---------------------------------------------------------------------
-  # Completely remove a previous build if the user indicates this
-  #---------------------------------------------------------------------
-  if configuration['clear previous build'] and os.path.isdir(fullBuildDir) :
-    NBlogMessages.writeMessage('  Remove previous build in directory '+fullBuildDir)
-    try:
-      shutil.rmtree(fullBuildDir)
-    except shutils.Error :
-      NBlogMessages.writeMessage('  Warning: removal of directory '+fullBuildDir+' failed.')
     
   #---------------------------------------------------------------------