Changeset 750 for branches


Ignore:
Timestamp:
Nov 10, 2007 3:37:07 PM (12 years ago)
Author:
jpfasano
Message:

Added some additional checks that configuration is specified correctly.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/testScripts/nightlyBuild.py

    r748 r750  
    130130
    131131    #--------------------------------------------------------------------
     132    # Make sure optlevel specified
     133    #--------------------------------------------------------------------
     134    if 'OptLevel' not in bc :
     135      print 'Error. BUILDS does not contain OptLevel'
     136      print '       Project is '+p
     137      print '       BuildConfig is '+str(bc)
     138      sys.exit(1)
     139    elif bc['OptLevel']!="Debug" and bc['OptLevel']!="Default" :
     140      print 'Error. BUILDS has unrecognized OptLevel'
     141      print '       Project is '+p
     142      print '       BuildConfig is '+str(bc)
     143      print '       Expected OptLevel: Debug or Default'
     144      sys.exit(1)
     145
     146    #--------------------------------------------------------------------
    132147    # Process Parameters that are used by unix configure style build
    133148    #--------------------------------------------------------------------
     
    153168      configuration['configOptions']['unique']=""
    154169      configuration['configOptions']['invariant']=""
    155       if 'OptLevel' not in bc :
    156         print 'Error. BUILDS does not contain OptLevel'
    157         print '       Project is '+p
    158         print '       BuildConfig is '+str(bc)
    159         sys.exit(1)
     170
    160171      if bc['OptLevel']=='Debug' :
    161172        configuration['configOptions']['unique']+=" --enable-debug"
     
    206217      else :
    207218        configuration.pop('slnFile')
     219
     220      #--------------------------------------------------------------------
     221      # Set msbuild configuration parm (Release or Debug)
     222      #--------------------------------------------------------------------
     223      #if bc['OptLevel']=='Debug' :
     224      #  configuration['msbuild']="Debug"
     225      #else :
     226      #  configuration['msbuild']="Release"
     227 
    208228               
    209229    #---------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.