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

[brad at geodynamics.org]

Author: brad
Date: 2011-03-07 11:34:24 -0800 (Mon, 07 Mar 2011)
New Revision: 18043

Modified:
   cs/buildbot/trunk/buildbot/scripts/packager.py
Log:
Switch to using proplist for items in packing list.

Modified: cs/buildbot/trunk/buildbot/scripts/packager.py
===================================================================
--- cs/buildbot/trunk/buildbot/scripts/packager.py	2011-03-07 18:47:37 UTC (rev 18042)
+++ cs/buildbot/trunk/buildbot/scripts/packager.py	2011-03-07 19:34:24 UTC (rev 18043)
@@ -20,14 +20,15 @@
 class PackingList(object):
     def __init__(self, config, opSys, python):
         
-        binDirs = ["bin"]
-        libDirs = ["lib"]
-        miscDirs = ["etc", "include", "share"]
+        binDirs = config.packaging.bin_dirs
+        libDirs = config.packaging.lib_dirs
+        miscDirs = config.packaging.misc_dirs
         if platform.machine() == "x86 64":
             libDirs.append("lib64")
-
         self.directories = binDirs + libDirs + miscDirs
 
+        self.extraFiles = config.packaging.files
+
         self.programs = []
         for d in binDirs:
             self.programs.extend(walkDirTree(d))
@@ -49,9 +50,9 @@
             s = "bin/" + s
             self.scripts.append(s)
 
-        self.stripList = []
+        # Suffix for libraries that will be stripped of symbols.
         if opSys == "linux":
-            libSuffix = ".so*"
+            libSuffix = ".so"
         elif opSys == "darwin":
             libSuffix = ".dylib"
         elif opSys == "win":
@@ -59,9 +60,9 @@
         else:
             sys.exit("Unknown OS: " + opSys)
 
-        #for l in self.libraries:
-        #    if l.endswith(libSuffix):
-        #        self.stripList.append(l)
+        self.stripList = []
+        for f in config.packaging.strip_list:
+            self.stripList.append(f+libSuffix)
 
         cig = [("CIG", "cig", "http://www.geodynamics.org/")]
         self.urls = cig + tupleUp(config.packaging.urls, 3)
@@ -83,6 +84,8 @@
             yield f
         for f in self.misc:
             yield f
+        for f in self.extraFiles:
+            yield f
         return
 
 
@@ -664,6 +667,7 @@
 
         # Can't list all files (length exceeds limits), so use directories
         packingList = [distdir_arch + "/" + m for m in pl.directories]
+        packingList.extend([distdir_arch + "/" + m for m in pl.extraFiles])
 
         archive = distdir_arch + ".tar.gz"
         taggedArchive = tag + "-" + archive