diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Tools/wx | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Tools/wx')
| -rw-r--r-- | Tools/wx/packaging/build-mac-installer.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Tools/wx/packaging/build-mac-installer.py b/Tools/wx/packaging/build-mac-installer.py index 5b76b0b..d0ef945 100644 --- a/Tools/wx/packaging/build-mac-installer.py +++ b/Tools/wx/packaging/build-mac-installer.py @@ -70,7 +70,7 @@ if sys.platform.startswith("darwin"): wx_root = "/usr/local/lib/wxPython-unicode-%s" % wx.__version__ sp_root = "%s/lib/python%s/site-packages" % (wx_root, py_version) sitepackages = "%s/wx-%s-mac-unicode/wx" % (sp_root, wx_version[:3]) -prefix = sitepackages +prefix = wxroot + "/lib" def mac_update_dependencies(dylib, prefix): """ @@ -120,11 +120,16 @@ try: if not os.path.exists(wxpythonroot): os.makedirs(wxpythonroot) - for wildcard in ["*.py", "*.so", "*.dylib"]: + for wildcard in ["*.py", "*.so"]: files = glob.glob(os.path.join(wxwebkit_dir, wildcard)) for afile in files: shutil.copy(afile, wxpythonroot) + for wildcard in ["*.dylib"]: + files = glob.glob(os.path.join(wxwebkit_dir, wildcard)) + for afile in files: + shutil.copy(afile, wxroot) + if sys.platform.startswith("darwin"): dylib_path = os.path.join(wxpythonroot, "libwxwebkit.dylib") os.system("install_name_tool -id %s %s" % (os.path.join(prefix, "libwxwebkit.dylib"), dylib_path)) |