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

[brad at geodynamics.org]

Author: brad
Date: 2011-05-12 19:31:40 -0700 (Thu, 12 May 2011)
New Revision: 18357

Modified:
   cs/buildbot/trunk/buildbot/scripts/packager.py
Log:
Fixed stripping for cygwin and maybe staging.

Modified: cs/buildbot/trunk/buildbot/scripts/packager.py
===================================================================
--- cs/buildbot/trunk/buildbot/scripts/packager.py	2011-05-12 23:03:32 UTC (rev 18356)
+++ cs/buildbot/trunk/buildbot/scripts/packager.py	2011-05-13 02:31:40 UTC (rev 18357)
@@ -61,8 +61,16 @@
             sys.exit("Unknown OS: " + opSys)
 
         self.stripList = []
-        for f in config.packaging.strip_list:
-            self.stripList.append(f+libSuffix)
+        if opSys == "win":
+            for f in config.packaging.strip_list_cygwin:
+                fdll = f.replace("lib/lib", "bin/cyg")+"-0"+libSuffix
+                if fdll in self.libraries:
+                    self.stripList.append(fdll)
+        else:
+            for f in config.packaging.strip_list:
+                flib = f+libSuffix
+                if flib in self.libraries:
+                    self.stripList.append(flib)
 
         cig = [("CIG", "cig", "http://www.geodynamics.org/")]
         self.urls = cig + tupleUp(config.packaging.urls, 3)
@@ -359,7 +367,7 @@
     os.mkdir(stage)
     os.chdir(stage)
 
-    copyAll(pl.all(), prefix)
+    copyAll(pl.files(), prefix)
     
     installMinimalCygwin(python, prefix)