[wx] Build fixes after recent changes.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@80191 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 8b3bdb4265a0a32f69ab107516d43ef0f175b2d8..36cd3e76f1f7205ceaec9ee551549f50259936a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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.
@@ -10,6 +17,7 @@
         * Source/cmakeconfig.h.cmake:
         * configure.ac:
 
+>>>>>>> .r80188
 2011-03-02  Andras Becsi  <abecsi@webkit.org>
 
         Reviewed by Laszlo Gombos.

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 9932d880cfda70428121e5a6aeca19739439290b..97e9e529205a110dd73711184a547925e567e206 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,10 @@
+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.

diff --git a/Tools/wx/packaging/build-mac-installer.py b/Tools/wx/packaging/build-mac-installer.py
index 5b76b0bbcfcaf806eb790c986072b87dde030033..d0ef9458f5d02559a904ba9ebed862b243208090 100644 (file)
--- 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))

diff --git a/wscript b/wscript
index 72b912121961969093a9a161d52428687e3a9fd7..aa266af186c75380b79fa78c12451724058bff14 100644 (file)
--- a/wscript
+++ b/wscript
@@ -303,6 +303,9 @@ def build(bld):
         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')