Changeset 774


Ignore:
Timestamp:
Nov 14, 2007 11:22:50 AM (12 years ago)
Author:
jpfasano
Message:

Modified so vcbuild is run from directory containing sln file.
Fixed up the removal of "NBalltestspassed" file (I hope).
Changed subject on one of the email messages.

Location:
branches/testScripts
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/testScripts/NBbuildConfig.py

    r773 r774  
    172172      dirs = os.listdir("..")
    173173      for d in dirs :
    174         if d.startswith(configuration['svnVersion']) :
     174        if d.startswith(svnVersionFlattened) :
    175175          fileToBeRemoved=os.path.join("..",d,'NBallTestsPassed')
    176176          if os.path.isfile(fileToBeRemoved) :
     
    350350    #---------------------------------------------------------------------
    351351   
    352     os.chdir(projectCheckOutDir)
    353     NBlogMessages.writeMessage('  cd '+projectCheckOutDir)
    354 
    355     if configuration.has_key('slnFile') :
    356       slnFileName = os.path.join(projectCheckOutDir,configuration['slnFile'])
    357     else :
    358       slnFileName = os.path.join(projectCheckOutDir,\
     352    slnFileDir = os.path.join(projectCheckOutDir,\
    359353                          configuration['project'],\
    360354                          'MSVisualStudio',\
    361                           'v8',\
    362                           configuration['project']) +\
    363                     '.sln'
     355                          'v8')
     356    if not os.path.isdir(slnFileDir) :
     357      NBlogMessages.writeMessage("  Solution file directory does not exist: "+slnFileDir)
     358      return
     359
     360    os.chdir(slnFileDir)
     361    NBlogMessages.writeMessage('  cd '+slnFileDir)
     362
     363    if configuration.has_key('slnFile') :
     364      slnFileName = os.path.join(slnFileDir,configuration['slnFile'])
     365    else :
     366      slnFileName = os.path.join(slnFileDir,configuration['project'])+'.sln'
    364367    if not os.path.isfile(slnFileName) :
    365368      NBlogMessages.writeMessage("  Solution file does not exist: "+slnFileName)
     
    368371    vcbuild='vcbuild /u ' + slnFileName + ' $ALL'
    369372             
    370 
    371373    NBlogMessages.writeMessage("  "+vcbuild)
    372374    commandHistory+=[ vcbuild ]
  • branches/testScripts/NBprojectConfig.py

    r764 r774  
    179179                   'check':[ NBcheckResult.rc0,
    180180                             NBcheckResult.standardSuccessMessage ] } ]
    181 SLN_FILE['FlopC++']=r'FlopCpp\MSVisualStudio\v8\FlopCpp.sln'
     181SLN_FILE['FlopC++']=r'FlopCpp.sln'
    182182SLN_BLD_TEST['FlopC++']=[
    183183                  {'dir':r'FlopCpp\MSVisualStudio\v8\Release',
  • branches/testScripts/nightlyBuild.py

    r773 r774  
    259259# Email log messages to person running script
    260260toAddrs = [NBemail.unscrambleAddress(MY_EMAIL_ADDR)]
    261 subject = "NightlyBuild Log from "+gethostname()+" on "+sys.platform
     261subject = "NightlyBuild Log on "+sys.platform+" from "+gethostname()
    262262NBemail.send(toAddrs,subject,NBlogMessages.getAllMessages())
    263263
Note: See TracChangeset for help on using the changeset viewer.