[cig-commits] r12778 - cs/buildbot/trunk/buildbot/scripts

[leif at geodynamics.org]

Author: leif
Date: 2008-09-02 15:05:27 -0700 (Tue, 02 Sep 2008)
New Revision: 12778

Modified:
   cs/buildbot/trunk/buildbot/scripts/windows.py
Log:
Check for existence of Chaco before creating PETSc DLLs on
Windows... our v2.3.2 build doesn't include Chaco.


Modified: cs/buildbot/trunk/buildbot/scripts/windows.py
===================================================================
--- cs/buildbot/trunk/buildbot/scripts/windows.py	2008-09-02 21:03:07 UTC (rev 12777)
+++ cs/buildbot/trunk/buildbot/scripts/windows.py	2008-09-02 22:05:27 UTC (rev 12778)
@@ -54,6 +54,9 @@
         petsc_lib = petsc_dir + "/lib/" + petsc_arch
         os.chdir(petsc_lib)
         chaco = ("../../externalpackages/Chaco-2.2/" + petsc_arch + "/lib/", chaco)
+        if not os.path.isdir(chaco[0]):
+            # Configured w/o Chaco.
+            chaco = None
         
         # This doesn't exist -- I'm making it up, for consistency.
         petsc_bin = petsc_dir + "/bin/" + petsc_arch
@@ -67,7 +70,9 @@
     #     -lcygwin -luser32 -ladvapi32 -lshell32 -lmpichcxx -lstdc++ -lgdi32 -luser32 -ladvapi32 -lkernel32 -ldl
 
     # libs, in order
-    libs = ["petscts", "petscsnes", "petscksp", "petscdm", "petscmat", "petscvec", "petsc", chaco]
+    libs = ["petscts", "petscsnes", "petscksp", "petscdm", "petscmat", "petscvec", "petsc"]
+    if chaco:
+        libs.append(chaco)
     deps = ["-llapack", "-lblas", "-lgdi32", "-lg2c"]
 
     while libs: