Changeset 659 for branches


Ignore:
Timestamp:
Oct 22, 2007 1:45:45 AM (12 years ago)
Author:
kmartin
Message:

put in functionality to skip third party projects

Location:
branches/testScripts
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/testScripts/NBprojectConfig.py

    r652 r659  
    3030                STANDARD_CONFIG_LINES[key] = val
    3131        else :
    32                 key += "-no3rdParty"
    33                 val += ' '+SKIP3RDPARTY_CONFIG_LINE
    34                 SKIP3RDPARTY_CONFIG_LINES[key] = val
     32                #key += "-no3rdParty"
     33                key += "-NoThirdParty"
     34                #val += ' '+SKIP3RDPARTY_CONFIG_LINE
     35                #SKIP3RDPARTY_CONFIG_LINES[key] = val
     36                STANDARD_CONFIG_LINES[key] = val
    3537
    3638#----------------------------------------------------------------------
  • branches/testScripts/NBuserConfig.py

    r655 r659  
    144144elif gethostname()=='sol10vm' :
    145145  DOWNLOAD_3RD_PARTY=1
     146elif gethostname()=='kmartin-maclt.local' :
     147  DOWNLOAD_3RD_PARTY=1
    146148
    147149#----------------------------------------------------------------------
     
    158160PROJECTS = ['CoinUtils','DyLP','Clp','SYMPHONY','Vol','Osi','Cgl','Cbc',\
    159161            'Ipopt','Bonmin','FlopC++','OS','CppAD']
     162
     163
     164PROJECTS = ['SYMPHONY']
    160165
    161166
     
    177182              ]
    178183
    179                
     184BUILD_TYPES = [\
     185              ['Default',  'NoThirdParty' ]\
     186              ]               
    180187
    181188#----------------------------------------------------------------------
  • branches/testScripts/nightlyBuild.py

    r658 r659  
    116116    #---------------------------------------------------------------------
    117117    buildtypes=NBprojectConfig.PROJECT_CONFIG_LINES[p]
     118
     119    print buildtypes
     120   
    118121    for buildType, configLine in buildtypes.iteritems() :
    119122   
     
    124127      vpathDir=projectVersion[0]+'-'+buildType
    125128      configOptions='-C '+NBuserConfig.CONFIGURE_FLAGS+' '+configLine
     129
     130      print 'HERE ARE THE CONFIG OPTIONS SO FAR'
     131      print configOptions
     132
    126133
    127134#      if "ThirdParty" in buildType :
     
    136143#            skipOptions+=' ThirdParty/'+d
    137144#          configOptions+=' COIN_SKIP_PROJECTS="'+skipOptions+'"'
    138      
     145
     146# Added by Kipp -- Sunday, Oct 21
     147      print buildType
     148      print configLine
     149      if "NoThirdParty" in buildType :
     150        skipOptions=''
     151        thirdPartyBaseDir=os.path.join(projectCheckOutDir,'ThirdParty')
     152        if os.path.isdir(thirdPartyBaseDir) :
     153          thirdPartyDirs = os.listdir(thirdPartyBaseDir)
     154          for d in thirdPartyDirs :
     155            skipOptions+=' ThirdParty/'+d
     156        configOptions+=' COIN_SKIP_PROJECTS="'+skipOptions+'"'
     157# End Kipp
     158
     159
    139160      fullVpathDir = os.path.join(projectBaseDir,vpathDir)
    140161      #TODO: if (MAKE_CLEAN) : distutils.dir_util.remove_tree(fullVpathDir)
Note: See TracChangeset for help on using the changeset viewer.