Changeset 663

Timestamp:

Oct 22, 2007 3:03:58 PM (12 years ago)

Author:

stefan

Message:

use stat to check file dates instead of ls --fulltime and regex

Location:

branches/testScripts

Files:

• NBosCommand.py (modified) (1 diff)
• nightlyBuild.py (modified) (3 diffs)

branches/testScripts/NBosCommand.py

@@ -23 +23 @@
       # running on posix so should be able to use ls command
       if not os.path.isfile(target) : return True
-      lsSource=run("ls --full-time "+source)
-      lsTarget=run("ls --full-time "+target)
+      statsource = os.stat(source)
+      stattarget = os.stat(target)
+      return statsource.st_mtime > stattarget.st_mtime
+#      lsSource=run("ls --full-time "+source)
+#      lsTarget=run("ls --full-time "+target)
       #-rwxrwxrwx 1 jpf4 None 12309 2007-10-21 16:13:47.395793600 -0400 nightlyBuild.py
-      rexBase=r"(-|r|w|x){10} . (.+) (.+) (.+) (\d\d\d\d-\d\d-\d\d .+) "
-      rexSource=rexBase+source
-      rexTarget=rexBase+target
-      timeSource=(re.findall(rexSource,lsSource['stdout']))[0][4]
-      timeTarget=(re.findall(rexTarget,lsTarget['stdout']))[0][4]
-      return timeSource > timeTarget
+#      rexBase=r"(-|r|w|x){10} . (.+) (.+) (.+) (\d\d\d\d-\d\d-\d\d .+) "
+#      rexSource=rexBase+source
+#      rexTarget=rexBase+target
+#      timeSource=(re.findall(rexSource,lsSource['stdout']))[0][4]
+#      timeTarget=(re.findall(rexTarget,lsTarget['stdout']))[0][4]
+#      return timeSource > timeTarget
       
   else :

branches/testScripts/nightlyBuild.py

@@ -100 +100 @@
           # If the install command has been updated since the last
           # install, then do a new install
-          if NBosCommand.newer(install3rdPartyCmd,'NBinstalldone') :
-            if os.path.isfile('NBinstalldone') :
+          if os.path.isfile('NBinstalldone') :
+            if NBosCommand.newer(install3rdPartyCmd,'NBinstalldone') :
               os.remove('NBinstalldone')
           if not os.path.isfile('NBinstalldone') :
@@ -130 +130 @@
       configOptions='-C '+NBuserConfig.CONFIGURE_FLAGS+' '+configLine
 
-      print 'HERE ARE THE CONFIG OPTIONS SO FAR'
-      print configOptions
+#      print 'HERE ARE THE CONFIG OPTIONS SO FAR'
+#      print configOptions
 
 
@@ -147 +147 @@
 
 # Added by Kipp -- Sunday, Oct 21
-      print buildType
-      print configLine
+#      print buildType
+#      print configLine
       if "NoThirdParty" in buildType :
         skipOptions=''