Fix the wx buildbot after removal of move-js-headers.sh..

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

diff --git a/JavaScriptCore/jscore.bkl b/JavaScriptCore/jscore.bkl
index 5705108895836b37c99a16cbe1ebea9bc6c91cd4..cd53e3da0c9983d9b704b285ec91c55828d8ff08 100644 (file)
--- a/JavaScriptCore/jscore.bkl
+++ b/JavaScriptCore/jscore.bkl
@@ -34,12 +34,6 @@ JavaScriptCore Bakefile project file.
 
     <include file="../WebKit/wx/wxwk-settings.bkl"/>
     <include file="JavaScriptCoreSources.bkl"/>
-
-    <!-- the WX_PYTHON option was added to presets/wx.bkl in 2.8.5, so define 
-         it in case the presets/wx.bkl doesn't define it for us. -->
-    <if cond="not isdefined('WX_PYTHON')">
-        <set var="WX_PYTHON">0</set>
-    </if>
     
     <set var="BUILDDIR">obj-$(FORMAT)</set>
 
@@ -90,15 +84,21 @@ JavaScriptCore Bakefile project file.
         <debug-info>on</debug-info>
         <depends>jscore</depends>
         <include>$(SRCDIR)</include>
+        <include>$(WK_ROOT)/JavaScriptCore</include>
+        <include>$(WK_ROOT)/JavaScriptCore/kjs</include>
+        <include>$(WK_ROOT)/JavaScriptCore/pcre</include>
+        <include>$(WK_ROOT)/JavaScriptCore/wtf</include>
         <dirname>$(WKOUTPUTDIR)</dirname>
         <sources>$(SRCDIR)/kjs/testkjs.cpp</sources>
         <if cond="FORMAT=='gnu'">
             <ldflags>$(WKOUTPUTDIR)/libjscore.a</ldflags>
         </if>
         <if cond="FORMAT in ['msvc','msvs2005prj']">
+            <include>$(WK_ROOT)/WebKitLibraries/win/include</include>
             <sys-lib>jscore</sys-lib>
             <sys-lib>winmm</sys-lib> <!-- for timeGetTime -->
             <lib-path>$(WKOUTPUTDIR)</lib-path>
+            <lib-path>$(WK_ROOT)/WebKitLibraries/win/lib</lib-path>
         </if>
         
     </exe>

diff --git a/WebCore/webcore-base.bkl b/WebCore/webcore-base.bkl
index dd2dc30d3b6901c7eb52209e300ebd466a15aa83..c66bd84eef50b3c66659db68a31577be6a2a8951 100644 (file)
--- a/WebCore/webcore-base.bkl
+++ b/WebCore/webcore-base.bkl
@@ -90,6 +90,12 @@ wxWebCore port Bakefile project file.
         <include>$(SRCDIR)/rendering</include>
         <include>$(SRCDIR)/storage</include>
         <include>$(SRCDIR)/xml</include>
+        <include>$(WK_ROOT)</include>
+        <include>$(WK_ROOT)/JavaScriptCore</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>
 
         <sources>$(WEBCORE_BASE_SOURCES)</sources>
 

diff --git a/WebCore/webcore-wx.bkl b/WebCore/webcore-wx.bkl
index c542ca8cea459dcfa3b9677d44994b0331cae924..b9181bbf2267e3ab457fead19805eb0ecd42952f 100644 (file)
--- a/WebCore/webcore-wx.bkl
+++ b/WebCore/webcore-wx.bkl
@@ -32,31 +32,12 @@ wxWebCore port Bakefile project file.
 
 
 <makefile>
-    <!-- eventually we should make these options -->
-    <set var="WX_UNICODE">1</set>
-    <set var="WX_SHARED">1</set>
-
     <include file="webcore-base.bkl"/>
-    
-    <!-- the WX_PYTHON option was added to presets/wx.bkl in 2.8.5, so define 
-         it in case the presets/wx.bkl doesn't define it for us. -->
-    <if cond="not isdefined('WX_PYTHON')">
-        <set var="WX_PYTHON">0</set>
-    </if>
-    
-    <action id="DerivedSources">
-        <is-phony/>
-        <command>cd $(SRCDIR);bash move-js-headers.sh; bash make-generated-sources.sh platform/wx/wx-encodings.txt;cd Projects/wx</command>
-    </action>
-      
-    <template id="webcore-wx" template="webcore_base,wxwk_build_settings,curl,gtk,pthreads">
+
+    <template id="webcore-wx" template="wxwk_build_settings,webcore_base,curl,gtk,pthreads">
         <pic>on</pic>
         <threading>multi</threading>
-
-        <define>WTF_USE_ICU_UNICODE=1</define>
-        <define>UNICODE=1</define>
         
-        <dirname>.</dirname>
         <include>$(SRCDIR)/platform/wx</include>
         <include>$(SRCDIR)/platform/wx/wxcode</include>
         <include>$(SRCDIR)/bridge/wx</include>

diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog
index cbe707ca0429fa09bcbf3adb0b31e7dd36993114..64262e19ee632574f682c9199d5c08e4e60848e5 100644 (file)
--- a/WebKit/wx/ChangeLog
+++ b/WebKit/wx/ChangeLog
@@ -1,3 +1,19 @@
+2007-11-23  Kevin Ollivier  <kevino@theolliviers.com>
+
+        wx build fix. Include config.h in WebFrame/WebView to ensure
+        WebCore headers are properly configured, fix unicode/utf8.h and
+        config.h include ordering issues, centralize wx project options to 
+        ensure proper configuration, and fix wxwebkit-python target so that
+        it links against wx libs.
+
+        * WebFrame.cpp:
+        * WebView.cpp:
+        * bindings/python/wxwebkit-py.bkl:
+        * dependencies.bkl:
+        * presets/wxwebkit.bkl:
+        * wxwebkit.bkl:
+        * wxwk-settings.bkl:
+
 2007-11-20  Kevin Ollivier  <kevino@theolliviers.com>
 
         wx build fix for Windows. Don't use WebCore/move-js-headers.sh as

diff --git a/WebKit/wx/WebFrame.cpp b/WebKit/wx/WebFrame.cpp
index 8a73ce33c63db7849ddd0e72b275a59b29d06e8d..83af1ac70791791873c62cb595cb21388184aeb5 100644 (file)
--- a/WebKit/wx/WebFrame.cpp
+++ b/WebKit/wx/WebFrame.cpp
@@ -26,17 +26,19 @@
  * who don't want/need to roll their own browser frame UI.
  */
  
+#include "config.h"
+
 #include "wx/wxprec.h"
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
 
+#include "wx/artprov.h"
+
 #include "WebView.h"
 #include "WebFrame.h"
 #include "WebViewPrivate.h"
 
-#include "wx/artprov.h"
-
 wxPageSourceViewFrame::wxPageSourceViewFrame(const wxString& source)
         : wxFrame(NULL, wxID_ANY, _("Page Source View"), wxDefaultPosition, wxSize(600, 500))
 {

diff --git a/WebKit/wx/WebView.cpp b/WebKit/wx/WebView.cpp
index ff51d81304f5abeefe39678e595a89cc6016c9da..fcc829a985b0d75705cb858005001907bf45daa1 100644 (file)
--- a/WebKit/wx/WebView.cpp
+++ b/WebKit/wx/WebView.cpp
@@ -22,11 +22,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
- 
-#include "wx/wxprec.h"
-#ifndef WX_PRECOMP
-    #include "wx/wx.h"
-#endif
 
 #include "config.h"
 #include "DeprecatedString.h"
@@ -59,6 +54,11 @@
 #include <kjs/value.h>
 #include <kjs/ustring.h>
 
+#include "wx/wxprec.h"
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+#endif
+
 #include "WebView.h"
 #include "WebViewPrivate.h"
 

diff --git a/WebKit/wx/bindings/python/wxwebkit-py.bkl b/WebKit/wx/bindings/python/wxwebkit-py.bkl
index 70e70fe0f9ee0c12cdf5276bc361c52041f23969..163d95d79b4ec349bcb7491085b9b06916b188fe 100644 (file)
--- a/WebKit/wx/bindings/python/wxwebkit-py.bkl
+++ b/WebKit/wx/bindings/python/wxwebkit-py.bkl
@@ -59,7 +59,7 @@ Bakefile for wxWebKit Python bindings.
         </option>
     </if>
     
-    <module id="wxwebkit-python" template="wx,webcore,wxwk_build_settings,xml2,iconv,xslt,icu,jscore,curl,sqlite3,gtk,pthreads">
+    <module id="wxwebkit-python" template="wxwk,webcore,xml2,iconv,xslt,icu,jscore,curl,sqlite3,gtk,pthreads">
         <!-- make sure we relink wxwebkit if either webcore or jscore change -->
         <if cond="FORMAT=='gnu'">
             <depends-on-file>$(WKOUTPUTDIR)/libjscore.a</depends-on-file>
@@ -106,7 +106,6 @@ Bakefile for wxWebKit Python bindings.
         <sys-lib>wxwebkit</sys-lib>
         <lib-path>$(WKOUTPUTDIR)</lib-path>
         
-        <define>BUILDING_WX__=1</define>
         <define>SWIG_TYPE_TABLE=_wxPython_table</define>
         <define>WXP_USE_THREAD=1</define>
         <define>SWIG_PYTHON_OUTPUT_TUPLE</define>

diff --git a/WebKit/wx/dependencies.bkl b/WebKit/wx/dependencies.bkl
index bedc94c529ff1b7549bdb6ddabf111009ecb8e06..5e02de17afae995c65691732bbc02e55430c01ac 100644 (file)
--- a/WebKit/wx/dependencies.bkl
+++ b/WebKit/wx/dependencies.bkl
@@ -134,19 +134,19 @@ and WebCore. Include this file to use these settings.
         </if>
     </template>
 
-
-    <option name="ICU_LIBS">
-        <default-value>$(DOLLAR)(shell icu-config --ldflags)</default-value>
-    </option>
-
-    <option name="ICU_CFLAGS">
-        <default-value>$(DOLLAR)(shell icu-config --cppflags)</default-value>
-    </option>
-
     <!-- IBM ICU settings -->
-    <template id="icu">
+    <template id="icu">        
         <if cond="FORMAT=='gnu'">
-            <ldflags>$(ICU_LIBS)</ldflags>
+            <!-- Mac includes ICU with the system, but doesn't include headers or
+                 icu-config, so we have to hardcode settings there. -->
+            <set var="ICU_INCLUDE"><if cond="WX_PORT=='mac'">$(WK_ROOT)/JavaScriptCore/icu</if></set>
+            <set var="ICU_LIB"><if cond="WX_PORT=='mac'">icucore</if></set>
+            <set var="ICU_LDFLAGS"><if cond="WX_PORT=='gtk2'">$(DOLLAR)(shell icu-config --ldflags)</if></set>
+            <set var="ICU_CFLAGS"><if cond="WX_PORT=='gtk2'">$(DOLLAR)(shell icu-config --cppflags)</if></set>
+            
+            <include>$(ICU_INCLUDE)</include>
+            <sys-lib>$(ICU_LIB)</sys-lib>
+            <ldflags>$(ICU_LDFLAGS)</ldflags>
             <cxxflags>$(ICU_CFLAGS)</cxxflags>
         </if>
 

diff --git a/WebKit/wx/presets/wxwebkit.bkl b/WebKit/wx/presets/wxwebkit.bkl
index 6e3662bb6325157c5c70a85046cfc304313d7d33..56e67b80ae29eef03cdc652898956a65f0e7e3c3 100644 (file)
--- a/WebKit/wx/presets/wxwebkit.bkl
+++ b/WebKit/wx/presets/wxwebkit.bkl
@@ -72,14 +72,6 @@ and WebCore. Include this file to use these settings.
     </if>
     
     <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>
-        <include>$(WK_ROOT)/WebKitLibraries/unix/include</include>
         <if cond="FORMAT in ['msvc', 'msvs2005prj']">
             <!-- MSVC chokes on #import, so don't use ForwardingHeaders... -->
             <include>$(WK_ROOT)/JavaScriptCore/os-win32</include><!-- stdint.h is here -->
@@ -126,8 +118,10 @@ and WebCore. Include this file to use these settings.
         <include>$(WK_ROOT)/WebCore/storage</include>
         <include>$(WK_ROOT)/WebCore/xml</include>
         
-        <include>$(WK_ROOT)/WebKitLibraries/unix/include</include>
-        <lib-path>$(WK_ROOT)/WebKitLibraries/unix/lib</lib-path>
+        <include>$(WK_ROOT)/JavaScriptCore</include>
+        <include>$(WK_ROOT)/JavaScriptCore/kjs</include>
+        <include>$(WK_ROOT)/JavaScriptCore/pcre</include>
+        <include>$(WK_ROOT)/JavaScriptCore/wtf</include>
     </template>
     
 </makefile>

diff --git a/WebKit/wx/wxwebkit.bkl b/WebKit/wx/wxwebkit.bkl
index cad875a87fc997a019f18fb02c43039dea6f7094..67e79ed7380558b402164cc82080a40248f3135a 100644 (file)
--- a/WebKit/wx/wxwebkit.bkl
+++ b/WebKit/wx/wxwebkit.bkl
@@ -32,16 +32,8 @@ This file builds the wxWebKit library.
 -->
 
 <makefile>
-    <set var="WX_UNICODE">1</set>
-    <set var="WX_SHARED">1</set>
     <include file="wxwk-settings.bkl"/>
     
-    <!-- the WX_PYTHON option was added to presets/wx.bkl in 2.8.5, so define 
-         it in case the presets/wx.bkl doesn't define it for us. -->
-    <if cond="not isdefined('WX_PYTHON')">
-        <set var="WX_PYTHON">0</set>
-    </if>
-    
     <set var="BUILDDIR">obj-$(FORMAT)</set>
     
     <dll id="wxwebkit-dynamic" template="wxwk,jscore,webcore,xml2,iconv,xslt,icu,curl,sqlite3,gtk,pthreads">
@@ -82,10 +74,8 @@ This file builds the wxWebKit library.
         <if cond="FORMAT in ['msvc','msvs2005prj']">
             <sys-lib>webcore-wx</sys-lib>
             <sys-lib>libpng</sys-lib>
-            <sys-lib>libjpeg</sys-lib>
+            <!-- we use wx's libjpeg so no need to link to an external one. -->
             <lib-path>$(WKOUTPUTDIR)</lib-path>
-            <lib-path>$(WK_ROOT)/libpng</lib-path>
-            <lib-path>$(WK_ROOT)/libjpeg</lib-path>
         </if>
         
         <sources>

diff --git a/WebKit/wx/wxwk-settings.bkl b/WebKit/wx/wxwk-settings.bkl
index 83badb9cd7e5a47dbe503a4aaf1d4b739ff92a4b..e312c05547a036823a92d8b7433709a6330dc38e 100644 (file)
--- a/WebKit/wx/wxwk-settings.bkl
+++ b/WebKit/wx/wxwk-settings.bkl
@@ -30,9 +30,19 @@ JavaScriptCore Bakefile project file.
 -->
 
 <makefile>
+    <set var="WX_UNICODE">1</set>
+    <set var="WX_SHARED">1</set>
+
     <include file="presets/wx.bkl"/>
     <include file="presets/wxwebkit.bkl"/>
     <include file="dependencies.bkl"/>
+
+    <!-- the WX_PYTHON option was added to presets/wx.bkl in 2.8.5, so define
+         it in case the presets/wx.bkl doesn't define it for us. -->
+    
+    <if cond="not isdefined('WX_PYTHON')">
+        <set var="WX_PYTHON">0</set>
+    </if>
     
     <template id="wxwk_build_settings">
         <dirname>$(WKOUTPUTDIR)</dirname>