Changeset 779

Timestamp:

Nov 16, 2007 11:12:18 PM (12 years ago)

Author:

jpfasano

Message:

Fixed up FlopC++ project configuration

Location:

branches/testScripts

Files:

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

branches/testScripts/NBbuildConfig.py

@@ -349 +349 @@
     # Source is now available, so now it is time to run vcbuild
     #---------------------------------------------------------------------
-   
-    slnFileDir = os.path.join(projectCheckOutDir,\
+
+    if configuration.has_key('slnDir') :
+      slnFileDir = os.path.join(projectCheckOutDir,configuration['slnDir'])
+    else :
+      slnFileDir = os.path.join(projectCheckOutDir,\
                           configuration['project'],\
                           'MSVisualStudio',\

branches/testScripts/NBprojectConfig.py

@@ -19 +19 @@
 CFG_BLD_TEST = {}
 SLN_FILE = {}
+SLN_DIR = {}
 
 
@@ -157 +158 @@
                   {'dir':'',
                    'cmd':'make test',
-                   'check':[ NBcheckResult.rc0
-                             #,NBcheckResult.standardSuccessMessage
-                  ] } ]
+                   'check':[ NBcheckResult.rc0 ] } ]
 #third party packages are not optional here
 
@@ -180 +179 @@
                              NBcheckResult.standardSuccessMessage ] } ]
 SLN_FILE['FlopC++']=r'FlopCpp.sln'
+SLN_DIR['FlopC++']=r'FlopCpp\MSVisualStudio\v8'
 SLN_BLD_TEST['FlopC++']=[
                   {'dir':r'FlopCpp\MSVisualStudio\v8\Release',

branches/testScripts/nightlyBuild.py

@@ -28 +28 @@
 # TODO:
 #   -Reduce size of email messages.
-#   -Get working on windows
+#   -Get config style build working on Windows
 
 
@@ -226 +226 @@
       else :
         configuration.pop('slnFile')
+      configuration['slnDir']=''
+      if NBprojectConfig.SLN_DIR.has_key(p) :
+        configuration['slnDir']=NBprojectConfig.SLN_DIR[p]          
+      else :
+        configuration.pop('slnDir')
+        
 
       #--------------------------------------------------------------------