Changeset 650 for branches


Ignore:
Timestamp:
Oct 21, 2007 2:41:21 PM (12 years ago)
Author:
stefan
Message:

make it possible to define project dependent build types (configure call parameters)

Location:
branches/testScripts
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/testScripts/NBprojectConfig.py

    r639 r650  
    22
    33import os
     4import NBuserConfig
    45
    56#----------------------------------------------------------------------
    67# This file defines variables which describe how the specific
    7 # coin-or projects are to be built and tested.
     8# coin-or projects are to be build and tested.
    89#----------------------------------------------------------------------
    910
    1011#----------------------------------------------------------------------
    1112PROJECT_EMAIL_ADDRS = {}
     13PROJECT_CONFIG_LINES = {}
    1214UNITTEST_DIR = {}
    1315UNITTEST_CMD = {}
    1416ALL_TESTS_COMPLETED_SUCCESSFULLY_CMDS = {}
     17SKIP3RDPARTY_CONFIG_LINE = 'COIN_SKIP_PROJECTS="ThirdParty/ASL ThirdParty/Blas ThirdParty/Glpk ThirdParty/HSL ThirdParty/Lapack ThirdParty/Mumps"'
     18STANDARD_CONFIG_LINES = {}
     19SKIP3RDPARTY_CONFIG_LINES = {}
     20
     21for buildType in NBuserConfig.BUILD_TYPES :
     22        if "Debug" in buildType :
     23                key = 'Debug'
     24                val = '--enable-debug'
     25        else :
     26                key = 'Default'
     27                val = ''
     28
     29        if "ThirdParty" in buildType :
     30                STANDARD_CONFIG_LINES[key] = val
     31        else :
     32                key += "-no3rdParty"
     33                val += ' '+SKIP3RDPARTY_CONFIG_LINE
     34                SKIP3RDPARTY_CONFIG_LINES[key] = val
    1535
    1636#----------------------------------------------------------------------
    1737PROJECT_EMAIL_ADDRS['CoinUtils'] = 'ladanyi _AT_ us _DOT_ ibm _DOT_ com'
    1838ALL_TESTS_COMPLETED_SUCCESSFULLY_CMDS['CoinUtils'] = ['make test']
     39PROJECT_CONFIG_LINES['CoinUtils'] = STANDARD_CONFIG_LINES.copy()
     40#does not have references to third party packages
    1941
    2042#----------------------------------------------------------------------
     
    2345UNITTEST_CMD['DyLP'] = './unitTest -testOsiSolverInterface -netlibDir=_NETLIBDIR_ -cerr2cout'
    2446ALL_TESTS_COMPLETED_SUCCESSFULLY_CMDS['DyLP'] = ['make test']
     47PROJECT_CONFIG_LINES['DyLP'] = STANDARD_CONFIG_LINES.copy()
     48#does not have references to third party packages
    2549
    2650#----------------------------------------------------------------------
     
    2953UNITTEST_CMD['Clp'] = './clp -unitTest dirNetlib=_NETLIBDIR_ -netlib'
    3054ALL_TESTS_COMPLETED_SUCCESSFULLY_CMDS['Clp'] = ['make test',UNITTEST_CMD['Clp']]
     55PROJECT_CONFIG_LINES['Clp'] = STANDARD_CONFIG_LINES.copy()
     56PROJECT_CONFIG_LINES['Clp'].update(SKIP3RDPARTY_CONFIG_LINES)
    3157
    3258#----------------------------------------------------------------------
    3359PROJECT_EMAIL_ADDRS['SYMPHONY'] = 'tkr2 _AT_ lehigh _DOT_ edu'
    3460ALL_TESTS_COMPLETED_SUCCESSFULLY_CMDS['SYMPHONY'] = ['make test']
     61PROJECT_CONFIG_LINES['SYMPHONY'] = STANDARD_CONFIG_LINES.copy()
     62#does not have references to third party packages
    3563
    3664#----------------------------------------------------------------------
    3765PROJECT_EMAIL_ADDRS['Vol'] = 'barahon _AT_ us _DOT_ ibm _DOT_ com'
     66PROJECT_CONFIG_LINES['Vol'] = STANDARD_CONFIG_LINES.copy()
     67#does not have references to third party packages
    3868
    3969#----------------------------------------------------------------------
     
    4272UNITTEST_CMD['Osi'] = './unitTest -testOsiSolverInterface -netlibDir=_NETLIBDIR_ -cerr2cout'
    4373ALL_TESTS_COMPLETED_SUCCESSFULLY_CMDS['Osi'] = ['make test',UNITTEST_CMD['Osi']]
     74PROJECT_CONFIG_LINES['Osi'] = STANDARD_CONFIG_LINES.copy()
     75PROJECT_CONFIG_LINES['Osi'].update(SKIP3RDPARTY_CONFIG_LINES)
    4476
    4577#----------------------------------------------------------------------
    4678PROJECT_EMAIL_ADDRS['Cgl'] = 'robinlh _AT_ us _DOT_ ibm _DOT_ com'
    4779ALL_TESTS_COMPLETED_SUCCESSFULLY_CMDS['Cgl'] = ['make test']
     80PROJECT_CONFIG_LINES['Cgl'] = STANDARD_CONFIG_LINES.copy()
     81#does not have references to third party packages
    4882
    4983#----------------------------------------------------------------------
     
    5185UNITTEST_DIR['Cbc'] = os.path.join('Cbc','src')
    5286UNITTEST_CMD['Cbc'] = './cbc -unitTest -dirMiplib=_MIPLIB3DIR_ -miplib'
     87PROJECT_CONFIG_LINES['Cbc'] = STANDARD_CONFIG_LINES.copy()
     88PROJECT_CONFIG_LINES['Cbc'].update(SKIP3RDPARTY_CONFIG_LINES)
     89PROJECT_CONFIG_LINES['Cbc']['Parallel']='--enable-cbc-parallel'
    5390
    5491#----------------------------------------------------------------------
    5592PROJECT_EMAIL_ADDRS['FlopC++'] = 'Tim _DOT_ Hultberg _AT_ eumetsat _DOT_ int'
    5693ALL_TESTS_COMPLETED_SUCCESSFULLY_CMDS['FlopC++'] = ['make test']
    57 
     94PROJECT_CONFIG_LINES['FlopC++'] = STANDARD_CONFIG_LINES
     95#does not have references to third party packages
    5896
    5997#----------------------------------------------------------------------
    6098PROJECT_EMAIL_ADDRS['Ipopt'] = 'andreasw _AT_ us _DOT_ ibm _DOT_ com'
     99PROJECT_CONFIG_LINES['Ipopt'] = STANDARD_CONFIG_LINES
     100#third party packages are not optional here
    61101
    62102#----------------------------------------------------------------------
    63103PROJECT_EMAIL_ADDRS['OS'] = 'kipp _DOT_ martin _AT_ chicagogsb _DOT_ edu'
    64104ALL_TESTS_COMPLETED_SUCCESSFULLY_CMDS['OS'] = ['make test']
     105PROJECT_CONFIG_LINES['OS'] = STANDARD_CONFIG_LINES
     106#third party packages are not optional here (because it uses Ipopt)
    65107
    66108#----------------------------------------------------------------------
    67109PROJECT_EMAIL_ADDRS['CppAD'] = 'bradbell _AT_ washington _DOT_ edu'
     110PROJECT_CONFIG_LINES['CppAD'] = STANDARD_CONFIG_LINES
     111#does not have references to third party packages
  • branches/testScripts/nightlyBuild.py

    r649 r650  
    105105    # vpath and options to configure must be set for the buildType
    106106    #---------------------------------------------------------------------
    107     for buildType in NBuserConfig.BUILD_TYPES :   
     107    buildtypes=NBprojectConfig.PROJECT_CONFIG_LINES[p]
     108    for buildType, configLine in buildtypes.iteritems() :
    108109   
    109110      #---------------------------------------------------------------------
     
    111112      # command options
    112113      #---------------------------------------------------------------------
    113       vpathDir=projectVersion[0]
    114       configOptions='-C'
    115 
    116       if "Debug" in buildType :
    117         vpathDir += "Debug"
    118         configOptions += " --enable-debug"
    119       else :
    120         vpathDir += "Default"
    121 
    122       if "ThirdParty" in buildType :
    123         vpathDir += "ThirdParty"
    124       else :
    125         vpathDir += "NoThirdParty"
    126         thirdPartyBaseDir=os.path.join(projectCheckOutDir,'ThirdParty')
    127         if os.path.isdir(thirdPartyBaseDir) :
    128           thirdPartyDirs = os.listdir(thirdPartyBaseDir)
    129           skipOptions=''
    130           for d in thirdPartyDirs :
    131             skipOptions+=' ThirdParty/'+d
    132           configOptions+=' COIN_SKIP_PROJECTS="'+skipOptions+'"'
     114      vpathDir=projectVersion[0]+'-'+buildType
     115      configOptions='-C '+configLine
     116
     117#      if "ThirdParty" in buildType :
     118#        vpathDir += "ThirdParty"
     119#      else :
     120#        vpathDir += "NoThirdParty"
     121#        thirdPartyBaseDir=os.path.join(projectCheckOutDir,'ThirdParty')
     122#        if os.path.isdir(thirdPartyBaseDir) :
     123#          thirdPartyDirs = os.listdir(thirdPartyBaseDir)
     124#          skipOptions=''
     125#          for d in thirdPartyDirs :
     126#            skipOptions+=' ThirdParty/'+d
     127#          configOptions+=' COIN_SKIP_PROJECTS="'+skipOptions+'"'
    133128     
    134129      fullVpathDir = os.path.join(projectBaseDir,vpathDir)
    135130      #TODO: if (MAKE_CLEAN) : distutils.dir_util.remove_tree(fullVpathDir)
    136131      if not os.path.isdir(fullVpathDir) : os.mkdir(fullVpathDir)
     132      NBlogMessages.writeMessage("  build "+buildType+" in "+fullVpathDir)
    137133
    138134      #---------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.