Changeset 779 for branches


Ignore:
Timestamp:
Nov 16, 2007 11:12:18 PM (12 years ago)
Author:
jpfasano
Message:

Fixed up FlopC++ project configuration

Location:
branches/testScripts
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/testScripts/NBbuildConfig.py

    r775 r779  
    349349    # Source is now available, so now it is time to run vcbuild
    350350    #---------------------------------------------------------------------
    351    
    352     slnFileDir = os.path.join(projectCheckOutDir,\
     351
     352    if configuration.has_key('slnDir') :
     353      slnFileDir = os.path.join(projectCheckOutDir,configuration['slnDir'])
     354    else :
     355      slnFileDir = os.path.join(projectCheckOutDir,\
    353356                          configuration['project'],\
    354357                          'MSVisualStudio',\
  • branches/testScripts/NBprojectConfig.py

    r774 r779  
    1919CFG_BLD_TEST = {}
    2020SLN_FILE = {}
     21SLN_DIR = {}
    2122
    2223
     
    157158                  {'dir':'',
    158159                   'cmd':'make test',
    159                    'check':[ NBcheckResult.rc0
    160                              #,NBcheckResult.standardSuccessMessage
    161                   ] } ]
     160                   'check':[ NBcheckResult.rc0 ] } ]
    162161#third party packages are not optional here
    163162
     
    180179                             NBcheckResult.standardSuccessMessage ] } ]
    181180SLN_FILE['FlopC++']=r'FlopCpp.sln'
     181SLN_DIR['FlopC++']=r'FlopCpp\MSVisualStudio\v8'
    182182SLN_BLD_TEST['FlopC++']=[
    183183                  {'dir':r'FlopCpp\MSVisualStudio\v8\Release',
  • branches/testScripts/nightlyBuild.py

    r776 r779  
    2828# TODO:
    2929#   -Reduce size of email messages.
    30 #   -Get working on windows
     30#   -Get config style build working on Windows
    3131
    3232
     
    226226      else :
    227227        configuration.pop('slnFile')
     228      configuration['slnDir']=''
     229      if NBprojectConfig.SLN_DIR.has_key(p) :
     230        configuration['slnDir']=NBprojectConfig.SLN_DIR[p]         
     231      else :
     232        configuration.pop('slnDir')
     233       
    228234
    229235      #--------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.