Changeset 750

Timestamp:

Nov 10, 2007 3:37:07 PM (12 years ago)

Author:

jpfasano

Message:

Added some additional checks that configuration is specified correctly.

File:

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

branches/testScripts/nightlyBuild.py

@@ -130 +130 @@
 
     #--------------------------------------------------------------------
+    # Make sure optlevel specified
+    #--------------------------------------------------------------------
+    if 'OptLevel' not in bc :
+      print 'Error. BUILDS does not contain OptLevel'
+      print '       Project is '+p
+      print '       BuildConfig is '+str(bc)
+      sys.exit(1)
+    elif bc['OptLevel']!="Debug" and bc['OptLevel']!="Default" :
+      print 'Error. BUILDS has unrecognized OptLevel'
+      print '       Project is '+p
+      print '       BuildConfig is '+str(bc)
+      print '       Expected OptLevel: Debug or Default'
+      sys.exit(1)
+
+    #--------------------------------------------------------------------
     # Process Parameters that are used by unix configure style build
     #--------------------------------------------------------------------
@@ -153 +168 @@
       configuration['configOptions']['unique']=""
       configuration['configOptions']['invariant']=""
-      if 'OptLevel' not in bc :
-        print 'Error. BUILDS does not contain OptLevel'
-        print '       Project is '+p
-        print '       BuildConfig is '+str(bc)
-        sys.exit(1)
+
       if bc['OptLevel']=='Debug' :
         configuration['configOptions']['unique']+=" --enable-debug"
@@ -206 +217 @@
       else :
         configuration.pop('slnFile')
+
+      #--------------------------------------------------------------------
+      # Set msbuild configuration parm (Release or Debug)
+      #--------------------------------------------------------------------
+      #if bc['OptLevel']=='Debug' :
+      #  configuration['msbuild']="Debug"
+      #else :
+      #  configuration['msbuild']="Release"
+ 
                
     #---------------------------------------------------------------------