Changeset 674 for branches


Ignore:
Timestamp:
Oct 24, 2007 5:15:54 PM (12 years ago)
Author:
jpfasano
Message:

Tried to create a nicer vpath directory name.
Added log message to indicate current directory.

Location:
branches/testScripts
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/testScripts/NBbuildConfig.py

    r673 r674  
    3535#   code will be skipped.
    3636#
    37 #  configuration['configOptions']= Parameters to be passed to configure.
     37#  configuration['configOptions']: Parameters to be passed to configure.
    3838#   The -C option and the options for skipping 3rd party code do not
    3939#   need to be specified.  These will be generated by this function.
    40 #   Examples are: "", "--enable-debug"
     40#   There are two types of configOptions to be specified.
     41#  configuration['configOptions']['unique']= These are options that
     42#   distinguish different build configurations.  These options are used
     43#   to generate the vpath directory name where the code will be built.
     44#   Examples are: "", "--enable-debug" "--enable-parrallel"
     45#  configuration['configOptions']['invariant']= These are options that
     46#   that are the same for every build configuration so they don't need
     47#   to be part of the vpath directory name.
     48#   Example: 'CXX=g++ -m64 LDFLAGS=-lstdc++'
    4149#
    4250#  configuration['SkipProjects']= List of COIN projects to skip (exclude)
     
    6472  projectBaseDir=os.path.join(configuration['rootDir'],configuration['project'])
    6573  projectCheckOutDir=os.path.join(projectBaseDir,svnVersionFlattened)
     74
     75  os.chdir(projectBaseDir)
    6676
    6777  # Don't get source from subversion if previously done
     
    142152  # Determine the build directory, and make sure it exists   
    143153  vpathDir=svnVersionFlattened+\
    144           configuration['configOptions']+\
     154          configuration['configOptions']['unique']+\
    145155          vpathDir
    146156  vpathDir=vpathDir.replace(' ','')
     157  vpathDir=vpathDir.replace('"','')
     158  vpathDir=vpathDir.replace("'",'')
    147159  vpathDir=vpathDir.replace('--enable','')
    148160  if vpathDir==svnVersionFlattened : vpathDir+='-default'
     
    152164    os.makedirs(fullVpathDir)
    153165  os.chdir(fullVpathDir)
     166  NBlogMessages.writeMessage('  Current directory: '+fullVpathDir)
    154167
    155168  # Assemble all config options together and create config command
    156   configOptions="-C "+configuration['configOptions']+skipOptions
     169  configOptions ="-C "+configuration['configOptions']['unique']
     170  configOptions+=configuration['configOptions']['unique']
     171  configOptions+=configuration['configOptions']['invariant']
     172  configOptions+=skipOptions
    157173  configCmd = os.path.join(projectCheckOutDir,"configure "+configOptions)
    158174
     
    164180  else :
    165181    NBlogMessages.writeMessage("  "+configCmd)
    166     NBlogMessages.writeMessage("    in "+fullVpathDir)
    167182
    168183    # Finally run config
     
    213228    unitTestPath = os.path.join(fullVpathDir,unitTestRelPath)
    214229    os.chdir(unitTestPath)
     230    NBlogMessages.writeMessage('  Current directory: '+unitTestPath)
    215231
    216232    unitTestCmdTemplate=configuration['unitTest']['command']
  • branches/testScripts/NBsvnCommand.py

    r648 r674  
    1919  retVal='OK'
    2020  os.chdir(dir)
     21  NBlogMessages.writeMessage('  Current directory: '+dir)
    2122  NBlogMessages.writeMessage('  '+svnCmd)
    2223  result = NBosCommand.run(svnCmd)
  • branches/testScripts/newNightlyBuild.py

    r673 r674  
    105105    # Set config options
    106106    #--------------------------------------------------------------------
    107     configuration['configOptions']=""
     107    configuration['configOptions']={}
     108    configuration['configOptions']['unique']=""
     109    configuration['configOptions']['invariant']=""
    108110    if 'OptLevel' not in bc :
    109111      print 'Error. BUILDS does not contain OptLevel'
     
    112114      sys.exit(1)
    113115    if bc['OptLevel']=='Debug' :
    114       configuration['configOptions']+=" --enable-debug"
     116      configuration['configOptions']['unique']+=" --enable-debug"
    115117    if 'AdditionalConfigOptions' in bc :
    116       configuration['configOptions']+=" "+bc['AdditionalConfigOptios']
     118      configuration['configOptions']['unique']+=" "+bc['AdditionalConfigOptions']
    117119
    118     configuration['configOptions']+=" "+NBuserConfig.CONFIGURE_FLAGS
     120    configuration['configOptions']['invariant']+=" "+NBuserConfig.CONFIGURE_FLAGS
    119121
    120122    #--------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.