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

[brad at geodynamics.org]

Author: brad
Date: 2011-05-12 12:58:34 -0700 (Thu, 12 May 2011)
New Revision: 18352

Modified:
   cs/buildbot/trunk/buildbot/scripts/windows.py
Log:
Update construction of PETSc dlls. Added blas/lapack and more comments.

Modified: cs/buildbot/trunk/buildbot/scripts/windows.py
===================================================================
--- cs/buildbot/trunk/buildbot/scripts/windows.py	2011-05-12 18:17:28 UTC (rev 18351)
+++ cs/buildbot/trunk/buildbot/scripts/windows.py	2011-05-12 19:58:34 UTC (rev 18352)
@@ -72,17 +72,16 @@
     #     -lmpich -lfrtbegin -lg2c
     #     -lcygwin -luser32 -ladvapi32 -lshell32 -lmpichcxx -lstdc++ -lgdi32 -luser32 -ladvapi32 -lkernel32 -ldl
 
-    # libs, in order
+    # libs, in order (top down order for dependencies)
     libs = ["petsc"]
     if chaco:
         libs.append(chaco)
+    if ml:
+        libs.append(ml)
+    if lapack:
+        libs.append(lapack)
     if blas:
 	libs.append(blas)
-    if lapack:
-        libs.append(lapack)
-    if ml:
-        libs.append(ml)
-    #deps = ["-lflapack", "-lfblas", "-lgdi32", "-lgfortran"]
     deps = ["-lgdi32", "-lgfortran"]
 
     while libs:
@@ -103,6 +102,7 @@
 
         spawn("rm", *objs)
 
+        # Add current lib to list of dependencies
         deps.insert(0, "-l" + l)
         
     return