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

[brad at geodynamics.org]

Author: brad
Date: 2011-06-08 10:10:13 -0700 (Wed, 08 Jun 2011)
New Revision: 18549

Modified:
   cs/buildbot/trunk/buildbot/scripts/packager.py
Log:
Adjust rebase address. Add cygcheck (dependency check utility) and cygz.dll to cygwin file list.

Modified: cs/buildbot/trunk/buildbot/scripts/packager.py
===================================================================
--- cs/buildbot/trunk/buildbot/scripts/packager.py	2011-06-07 14:50:31 UTC (rev 18548)
+++ cs/buildbot/trunk/buildbot/scripts/packager.py	2011-06-08 17:10:13 UTC (rev 18549)
@@ -284,6 +284,7 @@
         "cygintl-8.dll",
         "cygncurses-9.dll",
         "cygpath.exe",
+        "cygcheck.exe",
         "cygreadline7.dll",
         "cyggfortran-3.dll",
         "cyggcc_s-1.dll",
@@ -291,7 +292,7 @@
         "cygncursesw-10.dll",
         # This is given special treatment.
         "cygwin1.dll",
-        #"cygz.dll", # for HDF5 (used by Cigma)
+        "cygz.dll", # for HDF5 (used by Cigma)
         "echo.exe",
         "gunzip",
         "gzip.exe",
@@ -377,7 +378,7 @@
         sys.exit("no DLLs found!")
     dlls = ' '.join(dlls)
 
-    status = os.system("""rebase -b 0x50000000 -o 0x100000 %s""" % dlls)
+    status = os.system("""rebase -b 0x40000000 -o 0x100000 %s""" % dlls)
     if status != 0:
         sys.exit("rebase: exit %d" % status)
     return