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

[walter at geodynamics.org]

Author: walter
Date: 2010-06-22 11:25:34 -0700 (Tue, 22 Jun 2010)
New Revision: 17017

Modified:
   cs/buildbot/trunk/buildbot/scripts/packager.py
   cs/buildbot/trunk/buildbot/scripts/windows.py
Log:
Fixes for windows

Modified: cs/buildbot/trunk/buildbot/scripts/packager.py
===================================================================
--- cs/buildbot/trunk/buildbot/scripts/packager.py	2010-06-22 13:32:42 UTC (rev 17016)
+++ cs/buildbot/trunk/buildbot/scripts/packager.py	2010-06-22 18:25:34 UTC (rev 17017)
@@ -54,7 +54,10 @@
             elif l == "petsc" or l == "petsc-dev":
                 petsc = l
                 continue
-            l = libglob % l
+            if opSys == "win" and l == "*mpich":
+                l = "lib/*mpich*.dll"
+            else:
+                l = libglob % l
             libs = glob(l)
             stripList.extend(libs)
             self.libraries.extend(libs)
@@ -276,7 +279,7 @@
     s.write(
 r"""
 
-export PATH=/usr/bin:/bin:$PATH
+export PATH=/usr/bin:/bin:/lib:$PATH
 
 echo %(line)s
 echo %(AppVerName)s
@@ -296,36 +299,39 @@
         "bash.exe",
         "cat.exe",
         "cp.exe",
-        "cygg2c.dll", # I cooked this one myself.
+        "cygattr-1.dll",
         "cygiconv-2.dll",
-        "cygintl-3.dll",
         "cygintl-8.dll",
-        "cygncurses-8.dll",
+        "cygncurses-9.dll",
         "cygpath.exe",
-        "cygreadline6.dll",
+        "cygreadline7.dll",
+        "cyggfortran-3.dll",
+        "cyggcc_s-1.dll",
+        "cygstdc++-6.dll",
         # This is given special treatment.
-        #"cygwin1.dll",
-        "cygz.dll", # for HDF5 (used by Cigma)
+        "cygwin1.dll",
+        #"cygz.dll", # for HDF5 (used by Cigma)
         "echo.exe",
         "gunzip",
+        "gzip.exe",
         "lib" + python + ".dll",
         "ln.exe",
         "ls.exe",
         "pwd.exe",
-        "python.exe",
+        "python",
         python + ".exe",
         "rm.exe",
         "sed.exe",
         "sh.exe",
         "tar.exe",
         "vi",
-        "vim.exe",
+        "vim-nox.exe",
         "which.exe",
         ]
     l = ["/bin/" + b for b in l]
     l.extend([
-        ("/lib/lapack/cygblas.dll", "bin"),
-        ("/lib/lapack/cyglapack.dll", "bin"),
+        ("/lib/lapack/cygblas-0.dll", "bin"),
+        ("/lib/lapack/cyglapack-0.dll", "bin"),
         ])
     # Additional Python stuff.
     l.extend([

Modified: cs/buildbot/trunk/buildbot/scripts/windows.py
===================================================================
--- cs/buildbot/trunk/buildbot/scripts/windows.py	2010-06-22 13:32:42 UTC (rev 17016)
+++ cs/buildbot/trunk/buildbot/scripts/windows.py	2010-06-22 18:25:34 UTC (rev 17017)
@@ -45,6 +45,7 @@
     petsc_bin = petsc_dir + "/" + petsc_arch + "/bin"
 
     chaco = "chaco"
+    ml = "ml"
 
     if os.path.isdir(petsc_lib):
         os.chdir(petsc_lib)
@@ -70,10 +71,12 @@
     #     -lcygwin -luser32 -ladvapi32 -lshell32 -lmpichcxx -lstdc++ -lgdi32 -luser32 -ladvapi32 -lkernel32 -ldl
 
     # libs, in order
-    libs = ["petscts", "petscsnes", "petscksp", "petscdm", "petscmat", "petscvec", "petsc"]
+    libs = ["petsc"]
     if chaco:
         libs.append(chaco)
-    deps = ["-llapack", "-lblas", "-lgdi32", "-lg2c"]
+    if ml:
+        libs.append(ml)
+    deps = ["-llapack", "-lblas", "-lgdi32", "-lgfortran"]
 
     while libs:
         directory = ""