Changeset 686

Timestamp:

Oct 25, 2007 1:32:39 PM (13 years ago)

Author:

jpfasano

Message:

Moved to computing of the vpath directory to the top of the function

File:

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

branches/testScripts/NBbuildConfig.py

@@ -68 +68 @@
 
   #---------------------------------------------------------------------
-  # svn checkout or update the project
+  # Create names of directory where source is located and
+  # and were object, libs and executables are located (vpath).
+  # To compute vpath directory, the ./configure options need to be 
+  # generated.
   #---------------------------------------------------------------------
   projectBaseDir=os.path.join(configuration['rootDir'],configuration['project'])
   projectCheckOutDir=os.path.join(projectBaseDir,svnVersionFlattened)
 
+  vpathDir=''
+
+  if 'SkipProjects' in configuration :
+    vpathDir+="No"+configuration['SkipProjects']
+  if 'noThirdParty' in configuration : 
+    if configuration['noThirdParty'] :
+      vpathDir+='-NoThirdParty'
+  vpathDir=svnVersionFlattened+\
+          configuration['configOptions']['unique']+\
+          vpathDir
+  vpathDir=vpathDir.replace(' ','')
+  vpathDir=vpathDir.replace('"','')
+  vpathDir=vpathDir.replace("'",'')
+  vpathDir=vpathDir.replace('--enable','')
+  if vpathDir==svnVersionFlattened : vpathDir+='-default'
+
+  fullVpathDir = os.path.join(projectBaseDir,vpathDir)
+
+  #---------------------------------------------------------------------
+  # Create the vpath directory if it doesn't exist
+  # and remove file that indicates prior run tested ok.
+  #---------------------------------------------------------------------
+  if not os.path.isdir(fullVpathDir) : 
+    os.makedirs(fullVpathDir)
+  os.chdir(fullVpathDir)
+  if os.path.isfile('NBallTestsPassed') : os.remove('NBallTestsPassed')
+
+  #---------------------------------------------------------------------
+  # svn checkout or update the project
+  #---------------------------------------------------------------------
   # Don't get source from subversion if previously done
   if projectCheckOutDir not in SVN_HISTORY :
@@ -135 +168 @@
   #---------------------------------------------------------------------
   skipOptions=''
-  vpathDir=''
 
   if 'SkipProjects' in configuration :
@@ -146 +178 @@
   elif configuration['noThirdParty'] :
     needSkip3PartySkipOptions=True
-    vpathDir='-NoThirdParty'
   if needSkip3PartySkipOptions :
     thirdPartyBaseDir=os.path.join(projectCheckOutDir,'ThirdParty')
@@ -157 +188 @@
     skipOptions=' COIN_SKIP_PROJECTS="'+skipOptions+'"'
 
-  # Determine the build directory, and make sure it exists   
-  vpathDir=svnVersionFlattened+\
-          configuration['configOptions']['unique']+\
-          vpathDir
-  vpathDir=vpathDir.replace(' ','')
-  vpathDir=vpathDir.replace('"','')
-  vpathDir=vpathDir.replace("'",'')
-  vpathDir=vpathDir.replace('--enable','')
-  if vpathDir==svnVersionFlattened : vpathDir+='-default'
-
-  fullVpathDir = os.path.join(projectBaseDir,vpathDir)
-  if not os.path.isdir(fullVpathDir) : 
-    os.makedirs(fullVpathDir)
   os.chdir(fullVpathDir)
   NBlogMessages.writeMessage('  Current directory: '+fullVpathDir)
-
+  
   # Assemble all config options together and create config command
   configOptions ="-C "+configuration['configOptions']['unique']
@@ -283 +301 @@
   # Everything build and all tests passed.
   #---------------------------------------------------------------------
-  os.chdir(fullVpathDir)
-  f=open('NBallTestsPassed','w')
-  f.close()
+  #os.chdir(fullVpathDir)
+  #f=open('NBallTestsPassed','w')
+  #f.close()