Changeset 787


Ignore:
Timestamp:
Nov 24, 2007 2:19:07 AM (12 years ago)
Author:
kmartin
Message:

icorporate a mingw build

Location:
branches/testScripts
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/testScripts/NBbuildConfig.py

    r786 r787  
    292292  # Source is now available, so now it is time to run config
    293293  #---------------------------------------------------------------------
    294   if configuration['buildMethod']=='unixConfig' :
     294  if configuration['buildMethod']=='unixConfig' or configuration['buildMethod']=='mingw':
    295295    skipOptions=''
    296296
     
    322322    configOptions+=configuration['configOptions']['invariant']
    323323    configOptions+=skipOptions
    324     configCmd = os.path.join(projectCheckOutDir,"configure "+configOptions)
     324   
     325
     326    #start kipp change
     327    #
     328    if configuration['buildMethod']=='mingw' :
     329      configCmd = os.path.join(projectCheckOutDir,"configure ")
     330      #what a pain replace("\\", "/") does not work
     331      # we must split and then join, ugh
     332      pathParts = configCmd.split("\\")
     333      sep = '/'
     334      configCmd = sep.join(pathParts)
     335      configCmd = "sh -c " + "'" + configCmd + configOptions +  "'"
     336    else:
     337      configCmd = os.path.join(projectCheckOutDir,"configure "+configOptions)
     338    #
     339    #end kipp change
    325340
    326341    # If config was previously run, then no need to run again.
     
    355370    NBlogMessages.writeMessage( '  make' )
    356371    commandHistory+=[ 'make' ]
    357     result=NBosCommand.run('make')
     372   
     373    #
     374    # start kipp
     375    if configuration['buildMethod']=='mingw' :
     376      result=NBosCommand.run('sh -c make')
     377    else:
     378      result=NBosCommand.run('make')
     379     
     380    # end kipp
     381    #
    358382    writeResults(result,'make')
    359383
  • branches/testScripts/nightlyBuild.py

    r786 r787  
    8181#------------------------------------------------------------------------
    8282if sys.platform=='win32' :
    83   configuration['buildMethod']='msSln'
     83  # see if we are running Mingw
     84  # assume Bourne shell in path
     85  result=NBosCommand.run( "sh -c ls" )
     86  if result['returnCode'] == 0 :
     87    configuration['buildMethod']='mingw'
     88  else:
     89    configuration['buildMethod']='msSln'
    8490else :
    8591  configuration['buildMethod']='unixConfig'
     
    156162    # Process Parameters that are used by unix configure style build
    157163    #--------------------------------------------------------------------
    158     if configuration['buildMethod']=='unixConfig' :
     164    if configuration['buildMethod']=='unixConfig' or configuration['buildMethod']=='mingw':
    159165      #--------------------------------------------------------------------
    160166      # Doing a unix config type build.  Grab unix config parms
Note: See TracChangeset for help on using the changeset viewer.