Modified: trunk/Tools/ChangeLog (90492 => 90493)
--- trunk/Tools/ChangeLog 2011-07-06 20:56:28 UTC (rev 90492)
+++ trunk/Tools/ChangeLog 2011-07-06 20:58:17 UTC (rev 90493)
@@ -1,3 +1,9 @@
+2011-07-06 Kevin Ollivier <[email protected]>
+
+ [wx] Unreviewed build fix. Generate the proper install_name for dylibs on Mac.
+
+ * wx/packaging/build-mac-installer.py:
+
2011-07-06 Xan Lopez <[email protected]>
[GTK] Only set env. variables in start when strictly needed
Modified: trunk/Tools/wx/packaging/build-mac-installer.py (90492 => 90493)
--- trunk/Tools/wx/packaging/build-mac-installer.py 2011-07-06 20:56:28 UTC (rev 90492)
+++ trunk/Tools/wx/packaging/build-mac-installer.py 2011-07-06 20:58:17 UTC (rev 90493)
@@ -88,6 +88,7 @@
global wx_root
system_prefixes = ["/usr/lib", "/System/Library", wx_root]
+
output = commands.getoutput("otool -L %s" % dylib).strip()
for line in output.split("\n"):
copy = should_copy
@@ -105,10 +106,14 @@
copyname = os.path.join(copydir, basename)
if not os.path.exists(copyname):
shutil.copy(filename, copydir)
- os.system("install_name_tool -id %s %s" % (dest_filename, copyname))
-
+ result = os.system("install_name_tool -id %s %s" % (dest_filename, copyname))
+ if result != 0:
+ print "Changing ID failed. Stopping release."
+ sys.exit(result)
print "changing %s to %s" % (filename, dest_filename)
- os.system("install_name_tool -change %s %s %s" % (filename, dest_filename, dylib))
+ result = os.system("install_name_tool -change %s %s %s" % (filename, dest_filename, dylib))
+ if result != 0:
+ sys.exit(result)
def exitIfError(cmd):
print cmd
@@ -143,6 +148,7 @@
dylib_path = os.path.join(wxroot, "libwxwebkit.dylib")
os.system("install_name_tool -id %s %s" % (os.path.join(prefix, "libwxwebkit.dylib"), dylib_path))
mac_update_dependencies(dylib_path, prefix)
+ os.system("install_name_tool -id %s %s" % (os.path.join(wxpythonroot, "_webview.so"), prefix))
mac_update_dependencies(os.path.join(wxpythonroot, "_webview.so"), prefix, should_copy=False)
demodir = installroot + "/Applications/wxWebKit/Demos"
