Changeset 795


Ignore:
Timestamp:
Dec 3, 2007 3:24:07 AM (12 years ago)
Author:
kmartin
Message:

add a install command to the CoinUtils? and OS projects

Location:
branches/testScripts
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/testScripts/NBbuildConfig.py

    r794 r795  
    475475      commandHistory+=[ testCmd ]
    476476      result=NBosCommand.run(testCmd)
    477       writeResults(result,testCmd)
     477      writeResults(result,testCmd)
     478
    478479       
    479480      for testFunc in configuration['test'][t]['check'] :
     
    486487          return
    487488
     489  #---------------------------------------------------------------------
     490  # Run all install executables
     491  #---------------------------------------------------------------------
     492  if "install" in configuration :
     493    for t in range( len(configuration['install']) ) :
     494      installRelDir=configuration['install'][t]['dir']
     495      installDir = os.path.join(fullBuildDir, installRelDir)
     496      installCmd=configuration['install'][t]['cmd']
     497      if not os.path.isdir( installDir) :
     498        NBlogMessages.writeMessage('  Directory to run install from does not exist:')
     499        NBlogMessages.writeMessage('    Intended directory: '+installDir)
     500        NBlogMessages.writeMessage('    Intended command: '+installCmd)
     501        continue
     502      os.chdir(installDir)
     503      NBlogMessages.writeMessage('  cd '+installDir)
     504      NBlogMessages.writeMessage( '  '+installCmd )
     505      commandHistory+=[ installCmd ]
     506      result=NBosCommand.run(installCmd)
     507      writeResults(result,installCmd)
     508      if result['returnCode'] != 0 :
     509          result['svn version']=configuration['svnVersion']
     510          result['install']=installResultFail
     511          result['command history']=commandHistory
     512          NBemail.sendCmdMsgs(configuration['project'],result,installCmd)
     513          return
     514
     515     
    488516
    489517  #---------------------------------------------------------------------
  • branches/testScripts/NBprojectConfig.py

    r790 r795  
    1818SLN_BLD_TEST = {}
    1919CFG_BLD_TEST = {}
     20CFG_BLD_INSTALL = {}
    2021SLN_FILE = {}
    2122SLN_DIR = {}
     
    3031                   'check':[ NBcheckResult.rc0,
    3132                             NBcheckResult.standardSuccessMessage ] } ]
     33
     34CFG_BLD_INSTALL['CoinUtils']=[
     35                  {'dir':'',
     36                   'cmd':'make install',
     37                   'check':[ NBcheckResult.rc0,
     38                             NBcheckResult.standardSuccessMessage ] } ]
     39
    3240SLN_BLD_TEST['CoinUtils']=[
    3341                  {'dir':r'CoinUtils\MSVisualStudio',
     
    208216                   'check':[ NBcheckResult.rc0,
    209217                             NBcheckResult.standardSuccessMessage ] } ]
     218CFG_BLD_INSTALL['OS']=[
     219                  {'dir':'',
     220                   'cmd':'make install',
     221                   'check':[ NBcheckResult.rc0,
     222                             NBcheckResult.standardSuccessMessage ] } ]
     223
    210224SLN_BLD_TEST['OS']=[
    211225                  {'dir':r'OS\test',
  • branches/testScripts/nightlyBuild.py

    r787 r795  
    206206      else :
    207207        # No test commands so remove from configuration
    208         configuration.pop('test') 
     208        configuration.pop('test')
     209       
     210      #kipp add
     211      #---------------------------------------------------------------------
     212      # Set up install executables
     213      #---------------------------------------------------------------------
     214      configuration['install']={}
     215      if NBprojectConfig.CFG_BLD_INSTALL.has_key(p) :
     216        configuration['install']=NBprojectConfig.CFG_BLD_INSTALL[p]
     217      else :
     218        # No test executables so remove from configuration
     219        configuration.pop('install')
    209220
    210221
     
    223234        # No test executables so remove from configuration
    224235        configuration.pop('test')
     236
    225237       
    226238      #---------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.