Changeset 773 for branches

Timestamp:

Nov 14, 2007 11:14:44 AM (13 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:

• NBbuildConfig.py (modified) (3 diffs)
• NBsvnCommand.py (modified) (1 diff)
• NBuserParametersDefault.py (modified) (1 diff)
• nightlyBuild.py (modified) (2 diffs)

branches/testScripts/NBbuildConfig.py

@@ -9 +9 @@
 import sys
 import re
+import shutil
 
 import NBlogMessages
@@ -162 +163 @@
       if not msg:
         # Previous run ran fine, and nothing has changed.
-        NBlogMessages.writeMessage('  No changes since previous successfull run')
+        NBlogMessages.writeMessage('  No changes since previous successful run')
         return
       NBlogMessages.writeMessage('  '+msg)
@@ -253 +254 @@
 
   #---------------------------------------------------------------------
+  # Completely remove a previous build if the user indicates this
+  #---------------------------------------------------------------------
+  if configuration['clear previous build'] and os.path.isdir(fullBuildDir) :
+    NBlogMessages.writeMessage('  Remove previous build in directory '+fullBuildDir)
+    try:
+      shutil.rmtree(fullBuildDir)
+    except shutils.Error :
+      NBlogMessages.writeMessage('  Warning: removal of directory '+fullBuildDir+' failed.')
+    
+  #---------------------------------------------------------------------
   # Create the build directory if it doesn't exist
-  # and remove file that indicates prior run tested ok.
   #---------------------------------------------------------------------
   if not os.path.isdir(fullBuildDir) : 

branches/testScripts/NBsvnCommand.py

@@ -79 +79 @@
 def svnRevision(url) :
   retVal=-1
-  result = NBosCommand.run('svn info '+url)
+  result = NBosCommand.run('svn info --xml '+url)
   if result['returnCode']==0 :
-    #reg=r'Revision: (\d+)'
-    reg=r'Last Changed Rev: (\d+)'
+#    reg=r'Last Changed Rev: (\d+)'
+    reg=r'<commit\s*revision=\"(\d+)\"'
     found=re.findall(reg,result['stdout'])
     if len(found)!=0 :

branches/testScripts/NBuserParametersDefault.py

@@ -160 +160 @@
 CONFIGURE_FLAGS = ''
 
+#----------------------------------------------------------------------
+#Normally, nightlyBuild does not remove old builds before rebuilding
+#a configuration, instead configure might be called and make needs to
+#recompile files that changed.
+#Setting this flag to 1 makes nightlyBuild remove a build directory
+#completely before starting a configure/make/tests run.
+#Note, that this can slow down the an anew build significantly. Thus,
+#you might consider to use a tool like ccache (http://ccache.samba.org).
+#After installing ccache and making it available in the $PATH, putting
+#CONFIGURE_FLAGS = 'CC="ccache gcc" CXX="ccache g++" F77="ccache g77"'
+#should make nightly build use ccache.
+#----------------------------------------------------------------------
+
+CLEAR_PREVIOUS_BUILD = 0
 
 #----------------------------------------------------------------------

branches/testScripts/nightlyBuild.py

@@ -26 +26 @@
 
 # TODO:
-#   -In userConfig allow one to optionally do a clean checkout and/or config
 #   -Reduce size of email messages.
 #   -Get working on windows
@@ -91 +90 @@
 
   configuration['project']=p
+  configuration['clear previous build']=CLEAR_PREVIOUS_BUILD
 
   #------------------------------------------------------------------------