Changeset 747 for branches


Ignore:
Timestamp:
Nov 10, 2007 10:00:18 AM (12 years ago)
Author:
jpfasano
Message:

Fixed logic error on when an 'svn checkout' needs to be done on windows

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/testScripts/NBbuildConfig.py

    r743 r747  
    150150
    151151  #---------------------------------------------------------------------
    152   # Create the build directory if it doesn't exist
    153   # and remove file that indicates prior run tested ok.
    154   #---------------------------------------------------------------------
    155   if not os.path.isdir(fullBuildDir) :
    156     os.makedirs(fullBuildDir)
    157 
    158   #---------------------------------------------------------------------
    159152  # If nothing has changed and the prior run tested OK, then there
    160153  # is no need to do anything.
    161154  #---------------------------------------------------------------------
    162 
    163   os.chdir(fullBuildDir)
    164   if os.path.isfile('NBallTestsPassed') :
    165     msg=NBsvnCommand.newer(svnCheckOutUrl,projectCheckOutDir)
    166     if not msg:
    167       # Previous run ran fine, and nothing has changed.
    168       NBlogMessages.writeMessage('  No changes since previous successfull run')
    169       return
    170     NBlogMessages.writeMessage('  '+msg)
    171    
    172     # Must remove file NBallTestsPassed from all build directories that
    173     # use projectCheckoutDir for their source code. This is to ensure
    174     # that make will be run in all the build dirs after "svn update"
    175     dirs = os.listdir("..")
    176     for d in dirs :
    177       if d.startswith(configuration['svnVersion']) :
    178         fileToBeRemoved=os.path.join("..",d,'NBallTestsPassed')
    179         if os.path.isfile(fileToBeRemoved) :
    180           os.remove(fileToBeRemoved)
     155  if os.path.isdir(fullBuildDir) :
     156    os.chdir(fullBuildDir)
     157    if os.path.isfile('NBallTestsPassed') :
     158      msg=NBsvnCommand.newer(svnCheckOutUrl,projectCheckOutDir)
     159      if not msg:
     160        # Previous run ran fine, and nothing has changed.
     161        NBlogMessages.writeMessage('  No changes since previous successfull run')
     162        return
     163      NBlogMessages.writeMessage('  '+msg)
     164     
     165      # Must remove file NBallTestsPassed from all build directories that
     166      # use projectCheckoutDir for their source code. This is to ensure
     167      # that make will be run in all the build dirs after "svn update"
     168      dirs = os.listdir("..")
     169      for d in dirs :
     170        if d.startswith(configuration['svnVersion']) :
     171          fileToBeRemoved=os.path.join("..",d,'NBallTestsPassed')
     172          if os.path.isfile(fileToBeRemoved) :
     173            os.remove(fileToBeRemoved)
     174    else :
     175      NBlogMessages.writeMessage('  No record of all tests having passed')
    181176  else :
    182     NBlogMessages.writeMessage('  No record of all tests having passed')
     177    NBlogMessages.writeMessage('  Targets have not yet been built')
     178
    183179
    184180  #---------------------------------------------------------------------
     
    239235
    240236  #---------------------------------------------------------------------
     237  # Create the build directory if it doesn't exist
     238  # and remove file that indicates prior run tested ok.
     239  #---------------------------------------------------------------------
     240  if not os.path.isdir(fullBuildDir) :
     241    os.makedirs(fullBuildDir)
     242
     243  #---------------------------------------------------------------------
    241244  # Source is now available, so now it is time to run config
    242245  #---------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.