[wx] Unreviewed build fix, more fixes for install name issues.
authorkevino@webkit.org <kevino@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 8 Jul 2011 04:53:29 +0000 (04:53 +0000)
committerkevino@webkit.org <kevino@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 8 Jul 2011 04:53:29 +0000 (04:53 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@90610 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/wx/packaging/build-mac-installer.py

index fb91e8a..e10ce6e 100644 (file)
@@ -1,3 +1,9 @@
+2011-07-07  Kevin Ollivier  <kevino@theolliviers.com>
+
+        [wx] Unreviewed build fix, more fixes for install name issues.
+
+        * wx/packaging/build-mac-installer.py:
+
 2011-07-07  Dirk Pranke  <dpranke@chromium.org>
 
         test-webkitpy fails on chromium win
index e7d0090..9cfd90c 100644 (file)
@@ -92,17 +92,18 @@ def mac_update_dependencies(dylib, prefix, should_copy=True):
     output = commands.getoutput("otool -L %s" % dylib).strip()
     for line in output.split("\n"):
         copy = should_copy
+        change = True
         filename = line.split("(")[0].strip()
+        filedir, basename = os.path.split(filename)
+        dest_filename = os.path.join(prefix, basename)
         if os.path.exists(filename):
             for sys_prefix in system_prefixes:
                 if filename.startswith(sys_prefix):
                     copy = False
+                    change = False
             
             if copy:
                 copydir = os.path.dirname(dylib)
-                
-                filedir, basename = os.path.split(filename)
-                dest_filename = os.path.join(prefix, basename)
                 copyname = os.path.join(copydir, basename)
                 if not os.path.exists(copyname):
                     shutil.copy(filename, copydir)
@@ -110,6 +111,7 @@ def mac_update_dependencies(dylib, prefix, should_copy=True):
                     if result != 0:
                         print "Changing ID failed. Stopping release."
                         sys.exit(result)
+            if change:
                 print "changing %s to %s" % (filename, dest_filename)
                 result = os.system("install_name_tool -change %s %s %s" % (filename, dest_filename, dylib))
                 if result != 0: