[cig-commits] r7541 - in cs/buildbot/trunk: . buildbot/scripts

[leif at geodynamics.org]

Author: leif
Date: 2007-06-27 18:23:54 -0700 (Wed, 27 Jun 2007)
New Revision: 7541

Modified:
   cs/buildbot/trunk/buildbot/scripts/packager.py
   cs/buildbot/trunk/setup.py
Log:
Always use 'cygpath' to convert from POSIX to Windows pathnames, so
that symlinks are resolved to real paths.


Modified: cs/buildbot/trunk/buildbot/scripts/packager.py
===================================================================
--- cs/buildbot/trunk/buildbot/scripts/packager.py	2007-06-28 00:53:31 UTC (rev 7540)
+++ cs/buildbot/trunk/buildbot/scripts/packager.py	2007-06-28 01:23:54 UTC (rev 7541)
@@ -201,16 +201,11 @@
     for src in l:
         if isinstance(src, tuple):
             src, dest = src
-            if isabs(src):
-                src = cygpath("-w", src)
-            else:
-                src = src.replace("/", "\\")
         elif isabs(src):
             dest = src[1:]
-            src = cygpath("-w", src)
         else:
             dest = src
-            src = src.replace("/", "\\")
+        src = cygpath("-w", src)
         dest = "{app}\\" + dest.replace("/", "\\")
         yield src, dest
     return
@@ -220,16 +215,11 @@
     for src in l:
         if isinstance(src, tuple):
             src, dest = src
-            if isabs(src):
-                src = cygpath("-w", src)
-            else:
-                src = src.replace("/", "\\")
         elif isabs(src):
             dest = dirname(src)[1:]
-            src = cygpath("-w", src)
         else:
             dest = dirname(src)
-            src = src.replace("/", "\\")
+        src = cygpath("-w", src)
         dest = "{app}\\" + dest.replace("/", "\\")
         yield src, dest
     return

Modified: cs/buildbot/trunk/setup.py
===================================================================
--- cs/buildbot/trunk/setup.py	2007-06-28 00:53:31 UTC (rev 7540)
+++ cs/buildbot/trunk/setup.py	2007-06-28 01:23:54 UTC (rev 7541)
@@ -32,7 +32,7 @@
 improve.
 """
 
-scripts = ["bin/buildbot", "bin/mkpkg", "bin/ship"]
+scripts = ["bin/buildbot", "bin/mkpkg", "bin/ship", "bin/mkpetscdlls"]
 if sys.platform == "win32":
     scripts.append("contrib/windows/buildbot.bat")
     scripts.append("contrib/windows/buildbot_service.py")