Changeset 644

Timestamp:

Oct 21, 2007 9:03:32 AM (12 years ago)

Author:

jpfasano

Message:

Started moving code from nightlyBuildMod.py to nightlyBuild.py

File:

• branches/testScripts/nightlyBuild.py (modified) (3 diffs)

branches/testScripts/nightlyBuild.py

@@ -3 +3 @@
 import os
 import sys
+import distutils.dir_util
 
 import NBuserConfig
@@ -93 +94 @@
   #---------------------------------------------------------------------
 
-
-  #---------------------------------------------------------------------
-  # Run configure part of buid
-  #---------------------------------------------------------------------
-  os.chdir(projectCheckOutDir)
-  configCmd = os.path.join('.','configure -C')
+  
+  #---------------------------------------------------------------------
+  # Setup the directory where the build will be done
+  #---------------------------------------------------------------------
+  vpathDir = 'defaultBuild'
+  fullVpathDir = os.path.join(projectBaseDir,vpathDir)
+  #TODO: if (MAKE_CLEAN) : distutils.dir_util.remove_tree(fullVpathDir)
+  if not os.path.isdir(fullVpathDir) : os.mkdir(fullVpathDir)
+  print fullVpathDir
+
+  #---------------------------------------------------------------------
+  # Run configure part of build (only if config has not previously 
+  # ran successfully).
+  #---------------------------------------------------------------------
+  os.chdir(fullVpathDir)
+  #configCmd = os.path.join('.','configure -C')
+  configCmd = os.path.join('.',projectCheckOutDir,"configure -C")
+  print configCmd
   if NBcheckResult.didConfigRunOK() :
     NBlogMessages.writeMessage("  '"+configCmd+"' previously ran. Not rerunning")
@@ -146 +159 @@
   #---------------------------------------------------------------------
   if NBprojectConfig.UNITTEST_CMD.has_key(p) :
-    unitTestPath = os.path.join(projectCheckOutDir,NBprojectConfig.UNITTEST_DIR[p])
+    unitTestPath = os.path.join(fullVpathDir,NBprojectConfig.UNITTEST_DIR[p])
     os.chdir(unitTestPath)
+    print unitTestPath
 
     unitTestCmdTemplate=NBprojectConfig.UNITTEST_CMD[p]