wx build fix for Windows. Don't use WebCore/move-js-headers.sh as it indiscriminately...

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b039efe020d5973f1b8ef054574f3f614a0f6880..44aa83d5cfb7f6debcbcf9d1c8ca8456fa80ed53 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2007-11-20  Kevin Ollivier  <kevino@theolliviers.com>
+
+        wx build fix for Windows. Don't use WebCore/move-js-headers.sh as
+        it indiscriminately copies any headers inside JavaScriptCore,
+        which includes Tiger ICU headers. 
+
+        * webcore-base.bkl:
+        Remove references to the WebCore/include dir generated by
+        move-js-headers.sh, and also get headers from JavaScriptCore
+        directly rather than from WebCore/ForwardingHeaders. 
+
 2007-11-20  Alp Toker  <alp@atoker.com>
 
         Reviewed by Mark Rowe.

diff --git a/WebCore/webcore-base.bkl b/WebCore/webcore-base.bkl
index cc79b0b796b0bef7ea40aa4aac347a7aa1a5c3d9..dd2dc30d3b6901c7eb52209e300ebd466a15aa83 100644 (file)
--- a/WebCore/webcore-base.bkl
+++ b/WebCore/webcore-base.bkl
@@ -67,14 +67,8 @@ wxWebCore port Bakefile project file.
         <include>$(SRCDIR)/DerivedSources/WebCore</include>
         <include>$(SRCDIR)/dom</include>
         <include>$(SRCDIR)/editing</include>
-        <include>$(SRCDIR)/ForwardingHeaders/kjs</include>
         <include>$(SRCDIR)/history</include>
         <include>$(SRCDIR)/html</include>
-        <include>$(SRCDIR)/ForwardingHeaders/wtf</include>
-        <include>$(SRCDIR)/ForwardingHeaders/kjs</include>
-        <include>$(SRCDIR)/ForwardingHeaders/bindings</include>
-        <include>$(SRCDIR)/ForwardingHeaders/pcre</include>
-        <include>$(SRCDIR)/include</include>
         <include>$(SRCDIR)/loader</include>
         <include>$(SRCDIR)/loader/gdk</include>
         <include>$(SRCDIR)/loader/icon</include>

diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog
index e2437fa75cfdd85607570acd4fa552075d0f1327..cbe707ca0429fa09bcbf3adb0b31e7dd36993114 100644 (file)
--- a/WebKit/wx/ChangeLog
+++ b/WebKit/wx/ChangeLog
@@ -1,3 +1,13 @@
+2007-11-20  Kevin Ollivier  <kevino@theolliviers.com>
+
+        wx build fix for Windows. Don't use WebCore/move-js-headers.sh as
+        it indiscriminately copies any headers inside JavaScriptCore,
+        which includes Tiger ICU headers. 
+
+        * presets/wxwebkit.bkl:
+        Remove WebCore/include reference and add JSCore header dirs needed
+        instead.
+
 2007-11-19  Kevin Ollivier  <kevino@theolliviers.com>
 
         Add pcre directory to JSCore includes, and update the wx port

diff --git a/WebKit/wx/presets/wxwebkit.bkl b/WebKit/wx/presets/wxwebkit.bkl
index 737fdd15b833c253162bd121a2fa47f491d77088..6e3662bb6325157c5c70a85046cfc304313d7d33 100644 (file)
--- a/WebKit/wx/presets/wxwebkit.bkl
+++ b/WebKit/wx/presets/wxwebkit.bkl
@@ -74,6 +74,8 @@ and WebCore. Include this file to use these settings.
     <template id="jscore">
         <include>$(WK_ROOT)</include>
         <include>$(WK_ROOT)/JavaScriptCore</include>
+        <include>$(WK_ROOT)/JavaScriptCore/bindings</include>
+        <include>$(WK_ROOT)/JavaScriptCore/ForwardingHeaders</include>
         <include>$(WK_ROOT)/JavaScriptCore/kjs</include>
         <include>$(WK_ROOT)/JavaScriptCore/pcre</include>
         <include>$(WK_ROOT)/JavaScriptCore/wtf</include>
@@ -97,8 +99,7 @@ and WebCore. Include this file to use these settings.
             <define>HAVE_FUNC__FINITE=1</define>
         </if>
     
-        <include>$(WK_ROOT)/WebCore/.</include>
-        <include>$(WK_ROOT)/WebCore/include</include>
+        <include>$(WK_ROOT)/WebCore</include>
         <include>$(WK_ROOT)/WebCore/DerivedSources/WebCore</include>
         <include>$(WK_ROOT)/WebCore/bindings/js</include>
         <include>$(WK_ROOT)/WebCore/bridge</include>

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 0ba8f1e6bfcecc1632fc7a5ecf46e4a84fca6346..82787c552b291c0df9880ef41a8b59193c3c055c 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2007-11-20  Kevin Ollivier  <kevino@theolliviers.com>
+
+        wx build fix for Windows. Don't use WebCore/move-js-headers.sh as
+        it indiscriminately copies any headers inside JavaScriptCore,
+        which includes Tiger ICU headers. 
+
+        * wx/build-wxwebkit:
+        Don't run WebCore/move-js-headers.sh any longer.
+
 2007-11-20  Adam Treat  <treat@kde.org>
 
         Reviewed by David Kilzer.

diff --git a/WebKitTools/wx/build-wxwebkit b/WebKitTools/wx/build-wxwebkit
index 57a740c720ed993ce27b428fa6db8c90811dbd53..38f7a96348e6b011abd240098ee5af7f06011692 100755 (executable)
--- a/WebKitTools/wx/build-wxwebkit
+++ b/WebKitTools/wx/build-wxwebkit
@@ -198,10 +198,6 @@ else
         fi
     
         cd $WK_ROOT/WebCore
-        ./move-js-headers.sh
-        if [ $? != 0 ]; then
-            exit $? 
-        fi
         ./make-generated-sources.sh platform/wx/wx-encodings.txt
         if [ $? != 0 ]; then
             exit $?