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

[leif at geodynamics.org]

Author: leif
Date: 2007-06-30 19:28:03 -0700 (Sat, 30 Jun 2007)
New Revision: 7572

Modified:
   cs/buildbot/trunk/buildbot/scripts/packager.py
Log:
Added the capability to package the release version of PETSc (v2.3.3).


Modified: cs/buildbot/trunk/buildbot/scripts/packager.py
===================================================================
--- cs/buildbot/trunk/buildbot/scripts/packager.py	2007-07-01 01:57:52 UTC (rev 7571)
+++ cs/buildbot/trunk/buildbot/scripts/packager.py	2007-07-01 02:28:03 UTC (rev 7572)
@@ -58,7 +58,13 @@
             self.libraries.extend(libs)
         if petsc:
             petsc_arch = os.environ['PETSC_ARCH']
-            petsc_libglob = "opt/" + petsc + "/" + petsc_arch + "/" + libglob
+            petsc_arch_dir = "opt/" + petsc + "/" + petsc_arch
+            if isdir(petsc_arch_dir):
+                petsc_libglob = petsc_arch_dir + "/" + libglob
+            else:
+                # PETSc v2.3.3 and earlier
+                petsc_libglob = ("opt/" + petsc + "/" +
+                                 libglob.replace("/", "/" + petsc_arch + "/"))
             l = petsc_libglob % ""
             libs = glob(l)
             stripList.extend(libs)