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

[leif at geodynamics.org]

Author: leif
Date: 2007-06-23 19:44:55 -0700 (Sat, 23 Jun 2007)
New Revision: 7434

Modified:
   cs/buildbot/trunk/buildbot/scripts/packager.py
Log:
Got Linux packaging working using bubble gum and duct tape.

Modified: cs/buildbot/trunk/buildbot/scripts/packager.py
===================================================================
--- cs/buildbot/trunk/buildbot/scripts/packager.py	2007-06-23 23:06:34 UTC (rev 7433)
+++ cs/buildbot/trunk/buildbot/scripts/packager.py	2007-06-24 02:44:55 UTC (rev 7434)
@@ -44,29 +44,59 @@
             self.scripts.append(s)
 
         self.libraries = []
+        petsc = None
         for l in config.packaging.libraries:
             if l == "mpi":
-                l = "mpich"
+                l = "*mpich"
+                for p in ["mpirun", "mpiexec"]: # mpirun is evil symlink
+                    p = "bin/" + p + exe
+                    packingList.append(p)
+                    self.programs.append(p)
+            elif l == "petsc" or l == "petsc-dev":
+                petsc = l
+                continue
             l = libglob % l
             libs = glob(l)
             packingList.extend(libs)
             stripList.extend(libs)
             self.libraries.extend(libs)
+        if petsc:
+            petsc_arch = os.environ['PETSC_ARCH']
+            petsc_libglob = "opt/" + petsc + "/" + petsc_arch + "/" + libglob
+            l = petsc_libglob % ""
+            libs = glob(l)
+            packingList.extend(libs)
+            stripList.extend(libs)
+            self.libraries.extend(libs)
 
         self.python = []
         self.misc = []
-        for p in config.packaging.python:
-            p = "lib/" + python + "/site-packages/" + p
-            # Here we use glob expansion b/c eggs make the actual
-            # directory names hard to determine.
-            entries = glob(p)
-            packingList.extend(entries)
-            for e in entries:
-                if isfile(e):
-                    self.misc.append(e)
-                else:
-                    self.directories.append(e)
+        
+        if config.packaging.python:
+            # Unfortunately, this will include all site-packages... oh well.
+            # Note that Windows has its own logic for including Python.
+            d = "lib/" + python
+            packingList.append(d)
+            self.directories.append(d)
+            l = libglob % "python"
+            libs = glob(l)
+            packingList.extend(libs)
+            self.libraries.extend(libs)
 
+        else:
+            # A better way to do site-packages.
+            for p in config.packaging.python:
+                p = "lib/" + python + "/site-packages/" + p
+                # Here we use glob expansion b/c eggs make the actual
+                # directory names hard to determine.
+                entries = glob(p)
+                packingList.extend(entries)
+                for e in entries:
+                    if isfile(e):
+                        self.misc.append(e)
+                    else:
+                        self.directories.append(e)
+
         cig = [("CIG", "cig", "http://www.geodynamics.org/")]
         self.urls = cig + tupleUp(config.packaging.urls, 3)