+2011-03-02 Kevin Ollivier <kevino@theolliviers.com>
+
+ [wx] Build fix, don't use LocalizedNumberICU.cpp yet, headers that it needs are not
+ included in the ICU headers used by WebKit.
+
+ * wscript:
+
2011-03-02 Daniel Cheng <dcheng@chromium.org>
Reviewed by David Levin.
* Source/cmakeconfig.h.cmake:
* configure.ac:
+>>>>>>> .r80188
2011-03-02 Andras Becsi <abecsi@webkit.org>
Reviewed by Laszlo Gombos.
+2011-03-02 Kevin Ollivier <kevino@theolliviers.com>
+
+ [wx] Build fix, make sure we put the wxWebKit dylib in the right directory and
+ update symlinks accordingly.
+
+ * wx/packaging/build-mac-installer.py:
+
2011-03-02 Sheriff Bot <webkit.review.bot@gmail.com>
Unreviewed, rolling out r80139.
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):
"""
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))
excludes.append('WebDOMScriptProfileNode.cpp')
excludes.append('WebNativeEventListener.cpp')
+ # This file appears not to build with older versions of ICU
+ excludes.append('LocalizedNumberICU.cpp')
+
if building_on_win32:
excludes.append('SharedTimerWx.cpp')
excludes.append('RenderThemeWin.cpp')