Changeset 812


Ignore:
Timestamp:
Dec 6, 2007 2:23:54 AM (12 years ago)
Author:
kmartin
Message:

enhance the binary build

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/testScripts/NBbuildConfig.py

    r798 r812  
    491491  #---------------------------------------------------------------------
    492492  # Run all install executables
     493  # We assume a Unix Installation
    493494  #---------------------------------------------------------------------
    494495
     
    513514        if result['returnCode'] != 0 :
    514515            result['svn version']=configuration['svnVersion']
    515             result['install']=installResultFail
     516            # figure out what installResultFail should be
     517            #result['install']=installResultFail
    516518            result['command history']=commandHistory
    517519            NBemail.sendCmdMsgs(configuration['project'],result,installCmd)
     
    521523    #---------------------------------------------------------------------
    522524    # Build the binary distribution
     525    # We assume a Unix distribution
    523526    #---------------------------------------------------------------------
    524        
    525     # when doing this right make sure the example, include, and lib directories
    526     # are there.
    527     # if the lib  directory is there, add it
    528     directories  = " lib "
    529 
    530     # if the include directory is there, add it
    531     directories +=  " include "
    532 
    533     # if the examples directory is there, add it
    534     #directories +=  " examples "
    535 
    536     # if the bin directory is there, add it
    537     #directories +=  " bin "
    538 
    539     # don't forget to add LICENSE and AUTHORS file
    540 
    541     #configuration['project']
    542     outputDirectory = os.path.join(NBuserParameters.NIGHTLY_BUILD_BIN_DIR, configuration['project'])
    543     print outputDirectory
    544     # create the output directory
    545    
    546     # tar it up
    547 
    548     tarCmd = "tar -czvf "
    549     tarCmd += os.path.join(outputDirectory, "test.tgz")
    550     tarCmd += directories
    551 
    552     print tarCmd
    553 
    554     result=NBosCommand.run( tarCmd)
    555 
    556 
     527    if configuration['buildMethod']=='unixConfig' or configuration['buildMethod']=='mingw':
     528      directories = ""   
     529      # when doing this right make sure the example, include, and lib directories
     530      # are there.
     531     
     532      # if the lib  directory is there, add it
     533      if os.path.isdir( "lib") == True :
     534        directories  += " lib "
     535
     536      # if the include directory is there, add it
     537      if os.path.isdir( "include") == True :
     538        directories +=  " include "
     539
     540      # if the examples directory is there, add it
     541      if os.path.isdir( "examples") == True :
     542        directories +=  " examples "
     543
     544      # if the bin directory is there, add it
     545      if os.path.isdir( "bin") == True :
     546        directories +=  " bin "
     547
     548      # don't forget to add LICENSE and AUTHORS file
     549      # Andreas is going to add a directory where these reside from doing
     550      # make install
     551
     552      #if the binary directory is not there create it,
     553
     554      if not os.path.isdir( NBuserParameters.NIGHTLY_BUILD_BIN_DIR) :
     555        os.makedirs( NBuserParameters.NIGHTLY_BUILD_BIN_DIR)
     556
     557      #configuration['project']
     558      outputDirectory = os.path.join(NBuserParameters.NIGHTLY_BUILD_BIN_DIR, configuration['project'])
     559      print outputDirectory
     560
     561
     562      if not os.path.isdir( outputDirectory) :
     563        os.makedirs( outputDirectory)
     564
     565      # create the output directory
     566     
     567      # tar it up
     568
     569      tarCmd = "tar -czvf "
     570      #do something better with tar file name
     571      svnVersionFlattened = cleanUpName(configuration['svnVersion'])
     572      tarFileName =  configuration['project'] + "-" + svnVersionFlattened + "-" + sys.platform + ".tgz"
     573      tarCmd += os.path.join(outputDirectory, tarFileName)
     574      tarCmd += directories
     575
     576
     577
     578 
     579      NBlogMessages.writeMessage( '  '+ tarCmd )
     580      commandHistory+=[ tarCmd ]
     581      result=NBosCommand.run( tarCmd)
     582      writeResults(result, tarCmd)
     583      if result['returnCode'] != 0 :
     584          result['svn version']=configuration['svnVersion']
     585          # figure out what tarResultFail should be
     586          #result['tar']=tarResultFail
     587          result['command history']=commandHistory
     588          NBemail.sendCmdMsgs(configuration['project'],result,  tarCmd)
     589          return
    557590
    558591 
Note: See TracChangeset for help on using the changeset viewer.