Changeset 773 for branches


Ignore:
Timestamp:
Nov 14, 2007 11:14:44 AM (12 years ago)
Author:
stefan
Message:

allow removal of old build before new build (i.e., clean config+build)
make svnRevision also working with german svn

Location:
branches/testScripts
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/testScripts/NBbuildConfig.py

    r771 r773  
    99import sys
    1010import re
     11import shutil
    1112
    1213import NBlogMessages
     
    162163      if not msg:
    163164        # Previous run ran fine, and nothing has changed.
    164         NBlogMessages.writeMessage('  No changes since previous successfull run')
     165        NBlogMessages.writeMessage('  No changes since previous successful run')
    165166        return
    166167      NBlogMessages.writeMessage('  '+msg)
     
    253254
    254255  #---------------------------------------------------------------------
     256  # Completely remove a previous build if the user indicates this
     257  #---------------------------------------------------------------------
     258  if configuration['clear previous build'] and os.path.isdir(fullBuildDir) :
     259    NBlogMessages.writeMessage('  Remove previous build in directory '+fullBuildDir)
     260    try:
     261      shutil.rmtree(fullBuildDir)
     262    except shutils.Error :
     263      NBlogMessages.writeMessage('  Warning: removal of directory '+fullBuildDir+' failed.')
     264   
     265  #---------------------------------------------------------------------
    255266  # Create the build directory if it doesn't exist
    256   # and remove file that indicates prior run tested ok.
    257267  #---------------------------------------------------------------------
    258268  if not os.path.isdir(fullBuildDir) :
  • branches/testScripts/NBsvnCommand.py

    r771 r773  
    7979def svnRevision(url) :
    8080  retVal=-1
    81   result = NBosCommand.run('svn info '+url)
     81  result = NBosCommand.run('svn info --xml '+url)
    8282  if result['returnCode']==0 :
    83     #reg=r'Revision: (\d+)'
    84     reg=r'Last Changed Rev: (\d+)'
     83#    reg=r'Last Changed Rev: (\d+)'
     84    reg=r'<commit\s*revision=\"(\d+)\"'
    8585    found=re.findall(reg,result['stdout'])
    8686    if len(found)!=0 :
  • branches/testScripts/NBuserParametersDefault.py

    r765 r773  
    160160CONFIGURE_FLAGS = ''
    161161
     162#----------------------------------------------------------------------
     163#Normally, nightlyBuild does not remove old builds before rebuilding
     164#a configuration, instead configure might be called and make needs to
     165#recompile files that changed.
     166#Setting this flag to 1 makes nightlyBuild remove a build directory
     167#completely before starting a configure/make/tests run.
     168#Note, that this can slow down the an anew build significantly. Thus,
     169#you might consider to use a tool like ccache (http://ccache.samba.org).
     170#After installing ccache and making it available in the $PATH, putting
     171#CONFIGURE_FLAGS = 'CC="ccache gcc" CXX="ccache g++" F77="ccache g77"'
     172#should make nightly build use ccache.
     173#----------------------------------------------------------------------
     174
     175CLEAR_PREVIOUS_BUILD = 0
    162176
    163177#----------------------------------------------------------------------
  • branches/testScripts/nightlyBuild.py

    r771 r773  
    2626
    2727# TODO:
    28 #   -In userConfig allow one to optionally do a clean checkout and/or config
    2928#   -Reduce size of email messages.
    3029#   -Get working on windows
     
    9190
    9291  configuration['project']=p
     92  configuration['clear previous build']=CLEAR_PREVIOUS_BUILD
    9393
    9494  #------------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.