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

[leif at geodynamics.org]

Author: leif
Date: 2008-03-31 13:07:56 -0700 (Mon, 31 Mar 2008)
New Revision: 11674

Modified:
   cs/buildbot/trunk/buildbot/scripts/packager.py
Log:
At Brad's request, include a 'setup.sh' on Linux (in addition to Mac
OS X).  I assume users have been forced to set LD_LIBRARY_PATH... I
still haven't figured out why RPATH fails on some distros.

Also, check result of "make dist".


Modified: cs/buildbot/trunk/buildbot/scripts/packager.py
===================================================================
--- cs/buildbot/trunk/buildbot/scripts/packager.py	2008-03-31 19:38:40 UTC (rev 11673)
+++ cs/buildbot/trunk/buildbot/scripts/packager.py	2008-03-31 20:07:56 UTC (rev 11674)
@@ -80,6 +80,9 @@
             # I couldn't get @executable_path working for Python
             # extension modules; hence, this hack.
             self.misc.append("setup.sh")
+        elif opSys == "linux":
+            # Brad wants this.  Plus, RPATH doesn't seem to work on some systems.
+            self.misc.append("setup.sh")
         
         self.python = []
         
@@ -618,7 +621,9 @@
         # We only need one of these; do it on Linux only.
         archive = distdir + ".tar.gz"
         taggedArchive = tag + "-" + archive
-        os.system("make dist")
+        status = os.system("make dist")
+        if status != 0:
+            sys.exit("make: exit %d" % status)
         os.system("mv " + archive + " " + taggedArchive)
 
     workdir = os.getcwd()