Changeset 774 for branches

Timestamp:

Nov 14, 2007 11:22:50 AM (12 years ago)

Author:

jpfasano

Message:

Modified so vcbuild is run from directory containing sln file.
Fixed up the removal of "NBalltestspassed" file (I hope).
Changed subject on one of the email messages.

Location:

branches/testScripts

Files:

• NBbuildConfig.py (modified) (3 diffs)
• NBprojectConfig.py (modified) (1 diff)
• nightlyBuild.py (modified) (1 diff)

branches/testScripts/NBbuildConfig.py

@@ -172 +172 @@
       dirs = os.listdir("..")
       for d in dirs :
-        if d.startswith(configuration['svnVersion']) :
+        if d.startswith(svnVersionFlattened) :
           fileToBeRemoved=os.path.join("..",d,'NBallTestsPassed')
           if os.path.isfile(fileToBeRemoved) :
@@ -350 +350 @@
     #---------------------------------------------------------------------
    
-    os.chdir(projectCheckOutDir)
-    NBlogMessages.writeMessage('  cd '+projectCheckOutDir)
-
-    if configuration.has_key('slnFile') :
-      slnFileName = os.path.join(projectCheckOutDir,configuration['slnFile'])
-    else :
-      slnFileName = os.path.join(projectCheckOutDir,\
+    slnFileDir = os.path.join(projectCheckOutDir,\
                           configuration['project'],\
                           'MSVisualStudio',\
-                          'v8',\
-                          configuration['project']) +\
-                    '.sln'
+                          'v8')
+    if not os.path.isdir(slnFileDir) :
+      NBlogMessages.writeMessage("  Solution file directory does not exist: "+slnFileDir)
+      return
+
+    os.chdir(slnFileDir)
+    NBlogMessages.writeMessage('  cd '+slnFileDir)
+
+    if configuration.has_key('slnFile') :
+      slnFileName = os.path.join(slnFileDir,configuration['slnFile'])
+    else :
+      slnFileName = os.path.join(slnFileDir,configuration['project'])+'.sln'
     if not os.path.isfile(slnFileName) :
       NBlogMessages.writeMessage("  Solution file does not exist: "+slnFileName)
@@ -368 +371 @@
     vcbuild='vcbuild /u ' + slnFileName + ' $ALL'
              
-
     NBlogMessages.writeMessage("  "+vcbuild)
     commandHistory+=[ vcbuild ]

branches/testScripts/NBprojectConfig.py

@@ -179 +179 @@
                    'check':[ NBcheckResult.rc0,
                              NBcheckResult.standardSuccessMessage ] } ]
-SLN_FILE['FlopC++']=r'FlopCpp\MSVisualStudio\v8\FlopCpp.sln'
+SLN_FILE['FlopC++']=r'FlopCpp.sln'
 SLN_BLD_TEST['FlopC++']=[
                   {'dir':r'FlopCpp\MSVisualStudio\v8\Release',

branches/testScripts/nightlyBuild.py

@@ -259 +259 @@
 # Email log messages to person running script
 toAddrs = [NBemail.unscrambleAddress(MY_EMAIL_ADDR)]
-subject = "NightlyBuild Log from "+gethostname()+" on "+sys.platform
+subject = "NightlyBuild Log on "+sys.platform+" from "+gethostname()
 NBemail.send(toAddrs,subject,NBlogMessages.getAllMessages())