Ignore:
Timestamp:
Oct 25, 2007 6:57:56 PM (14 years ago)
Author:
kmartin
Message:

update files so NBuserConfig not needed

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/testScripts/nightlyBuild.py

    r689 r692  
    33import os
    44import sys
    5 
    6 import NBuserConfig
     5#import NBuserConfig
    76import NBprojectConfig
    87import NBlogMessages
     
    1211import NBcheckResult
    1312import NBbuildConfig
     13
     14
     15execfile('NBuserParametersDefault.py')
     16execfile('NBuserParameters.py')
     17
     18
     19
     20
     21
    1422
    1523# TODO:
     
    2937#  If needed create the top level directory
    3038#------------------------------------------------------------------------
    31 if not os.path.isdir(NBuserConfig.NIGHTLY_BUILD_ROOT_DIR) :
    32   os.makedirs(NBuserConfig.NIGHTLY_BUILD_ROOT_DIR)
    33 os.chdir(NBuserConfig.NIGHTLY_BUILD_ROOT_DIR)
     39if not os.path.isdir( NIGHTLY_BUILD_ROOT_DIR) :
     40  os.makedirs(NIGHTLY_BUILD_ROOT_DIR)
     41os.chdir( NIGHTLY_BUILD_ROOT_DIR)
    3442
    3543#------------------------------------------------------------------------
    3644#  Get the data directories if they don't already exist
    3745#------------------------------------------------------------------------
    38 dataBaseDir=os.path.join(NBuserConfig.NIGHTLY_BUILD_ROOT_DIR,'Data')
     46dataBaseDir=os.path.join(NIGHTLY_BUILD_ROOT_DIR,'Data')
    3947if not os.path.isdir(dataBaseDir) :
    4048  os.makedirs(dataBaseDir)
     
    4351  dataDir=os.path.join(dataBaseDir,d)
    4452  if not os.path.isdir(dataDir) :
    45     svnCmd=os.path.join(NBuserConfig.SVNPATH_PREFIX,'svn') + ' checkout https://projects.coin-or.org/svn/Data/releases/1.0.0/'+d+' '+d
     53    svnCmd=os.path.join( SVNPATH_PREFIX,'svn') + ' checkout https://projects.coin-or.org/svn/Data/releases/1.0.0/'+d+' '+d
    4654    if NBsvnCommand.run(svnCmd,dataBaseDir,'Data')!='OK' :
    4755      sys.exit(1)
     
    5462#------------------------------------------------------------------------
    5563configuration={}
    56 configuration['rootDir']=NBuserConfig.NIGHTLY_BUILD_ROOT_DIR
     64configuration['rootDir']=NIGHTLY_BUILD_ROOT_DIR
    5765#for p,buildConfigs in NBprojectConfig.BUILDS.iteritems():
    58 for p in NBuserConfig.PROJECTS :
     66for p in PROJECTS :
    5967
    6068  configuration['project']=p
     
    6371  # Loop once for each build configuration of p
    6472  #------------------------------------------------------------------------
    65   buildConfigs = NBprojectConfig.BUILDS[p]
     73  buildConfigs = BUILDS[p]
    6674  for bc in buildConfigs:
    6775
     
    7179    #--------------------------------------------------------------------
    7280    if 'Reference' in bc :
    73       referencedConfigs = NBprojectConfig.BUILDS[ bc['Reference'] ]
     81      referencedConfigs = BUILDS[ bc['Reference'] ]
    7482      for c in referencedConfigs :
    7583        buildConfigs.append(c)
     
    115123      configuration['configOptions']['unique']+=" "+bc['AdditionalConfigOptions']
    116124
    117     configuration['configOptions']['invariant']+=" "+NBuserConfig.CONFIGURE_FLAGS
     125    configuration['configOptions']['invariant']+=" "+ CONFIGURE_FLAGS
    118126
    119127    #--------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.