Rubber stamped by Darin.
authorkevino@webkit.org <kevino@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 17 Mar 2008 01:29:36 +0000 (01:29 +0000)
committerkevino@webkit.org <kevino@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 17 Mar 2008 01:29:36 +0000 (01:29 +0000)
Add set-webkit-configuration support for wx port, and centralize build dir location setting.

http://bugs.webkit.org/show_bug.cgi?id=17790

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

12 files changed:
JavaScriptCore/ChangeLog
JavaScriptCore/jscore.bkl
WebCore/ChangeLog
WebCore/webcore-base.bkl
WebKit/wx/ChangeLog
WebKit/wx/bindings/python/wxwebkit-py.bkl
WebKit/wx/presets/wxwebkit.bkl
WebKit/wx/wxwebkit.bkl
WebKit/wx/wxwk-settings.bkl
WebKitTools/ChangeLog
WebKitTools/wx/browser/browser.bkl
WebKitTools/wx/build-wxwebkit

index 63d63fb..7122252 100644 (file)
@@ -1,3 +1,14 @@
+2008-03-16  Kevin Ollivier  <kevino@theolliviers.com>
+
+        Rubber stamped by Darin.
+
+        Add set-webkit-configuration support for wx port, and centralize
+        build dir location setting.
+
+        http://bugs.webkit.org/show_bug.cgi?id=17790
+
+        * jscore.bkl:
+
 2008-03-14  Steve Falkenburg  <sfalken@apple.com>
 
         PGO build fixes.
index b17ff16..c191744 100644 (file)
@@ -34,8 +34,6 @@ JavaScriptCore Bakefile project file.
 
     <include file="../WebKit/wx/wxwk-settings.bkl"/>
     <include file="JavaScriptCoreSources.bkl"/>
-    
-    <set var="BUILDDIR">obj-$(FORMAT)</set>
 
     <template id="jscore_base" template="icu,pthreads,wxwk_build_settings">
         <sources>
index 28e8af1..4e07a21 100644 (file)
@@ -1,3 +1,14 @@
+2008-03-16  Kevin Ollivier  <kevino@theolliviers.com>
+
+        Rubber stamped by Darin.
+
+        Add set-webkit-configuration support for wx port, and centralize
+        build dir location setting.
+
+        http://bugs.webkit.org/show_bug.cgi?id=17790
+
+        * webcore-base.bkl:
+
 2008-03-16  Darin Adler  <darin@apple.com>
 
         Reviewed by Mark Rowe.
index efdb484..bf0a08e 100644 (file)
@@ -59,8 +59,6 @@ wxWebCore port Bakefile project file.
         $(WEBCORE_SOURCES_JPEG)
     </set>
 
-    <set var="BUILDDIR">obj-$(FORMAT)</set>
-
     <template id="webcore_base" template="xml2,iconv,xslt,icu,jscore,curl,sqlite3">
         <include>$(SRCDIR)</include>
         <include>$(SRCDIR)/bindings/js</include>
index 14af71c..9730815 100644 (file)
@@ -1,3 +1,17 @@
+2008-03-16  Kevin Ollivier  <kevino@theolliviers.com>
+
+        Rubber stamped by Darin.
+
+        Add set-webkit-configuration support for wx port, and centralize
+        build dir location setting.
+
+        http://bugs.webkit.org/show_bug.cgi?id=17790
+
+        * bindings/python/wxwebkit-py.bkl:
+        * presets/wxwebkit.bkl:
+        * wxwebkit.bkl:
+        * wxwk-settings.bkl:
+
 2008-03-12  David Hyatt  <hyatt@apple.com>
 
         Make the zoom factor a float and not a percent.
index 163d95d..f120ec0 100644 (file)
@@ -72,8 +72,6 @@ Bakefile for wxWebKit Python bindings.
         <runtime-libs>dynamic</runtime-libs>
         <dllname>_webview</dllname>
         
-        <set var="BUILDDIR">obj-$(FORMAT)</set>
-        
         <include>$(WK_ROOT)/WebCore/platform/wx</include>
         <include>$(WK_ROOT)/WebCore/bridge/wx</include>
         <include>$(WK_ROOT)/WebCore/page/wx</include>
index 7fc59d2..7347dd8 100644 (file)
@@ -71,6 +71,16 @@ and WebCore. Include this file to use these settings.
         </option>
     </if>
     
+    <if cond="not isdefined('DEBUG')">
+        <option name="DEBUG">
+            <values>0,1</values>
+            <default-value>0</default-value>
+            <description>
+                Whether or not to build debug
+            </description>
+        </option>
+    </if>
+    
     <template id="jscore">
         <if cond="FORMAT in ['msvc', 'msvs2005prj']">
             <!-- MSVC chokes on #import, so don't use ForwardingHeaders... -->
index dfe3d1b..ddea831 100644 (file)
@@ -34,8 +34,6 @@ This file builds the wxWebKit library.
 <makefile>
     <include file="wxwk-settings.bkl"/>
     
-    <set var="BUILDDIR">obj-$(FORMAT)</set>
-    
     <dll id="wxwebkit-dynamic" template="wxwk,jscore,webcore,xml2,iconv,xslt,icu,curl,sqlite3,gtk,pthreads">
         <!-- make sure we relink wxwebkit if either webcore or jscore change -->
         <if cond="FORMAT=='gnu'">
@@ -49,8 +47,6 @@ This file builds the wxWebKit library.
         <runtime-libs>dynamic</runtime-libs>
         <dllname>wxwebkit</dllname>
         <libname>wxwebkit</libname>
-
-        <set var="BUILDDIR">obj-$(FORMAT)</set>
         
         <include>$(WK_ROOT)/WebCore/platform/graphics/wx</include>
         <include>$(WK_ROOT)/WebCore/platform/wx</include>
index e312c05..e73fbfa 100644 (file)
@@ -37,6 +37,7 @@ JavaScriptCore Bakefile project file.
     <include file="presets/wxwebkit.bkl"/>
     <include file="dependencies.bkl"/>
 
+    <set var="BUILDDIR">obj-$(FORMAT)</set>
     <!-- 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. -->
     
@@ -50,7 +51,16 @@ JavaScriptCore Bakefile project file.
         <cxx-rtti>on</cxx-rtti>
         <cxx-exceptions>on</cxx-exceptions>
         <define>BUILDING_WX__=1</define>
-        <debug-info>on</debug-info>
+        <define>
+            $(substituteFromDict(DEBUG,{'1':'','0':'NDEBUG'}))
+        </define>
+        <define>USE_SYSTEM_MALLOC</define>
+        <optimize>
+            $(substituteFromDict(DEBUG,{'1':'off','0':'speed'}))
+        </optimize>
+        <debug-info>
+            $(substituteFromDict(DEBUG,{'1':'on','0':'off'}))
+        </debug-info>
         <if cond="FORMAT in ['msvc', 'msvs2005prj']">
             <set var="DEBUG_RUNTIME">
                 <if cond="WX_PYTHON=='1' and WX_DEBUG=='0'">off</if>
index 30161fd..8742d68 100644 (file)
@@ -1,3 +1,15 @@
+2008-03-16  Kevin Ollivier  <kevino@theolliviers.com>
+
+        Rubber stamped by Darin.
+
+        Add set-webkit-configuration support for wx port, and centralize
+        build dir location setting.
+
+        http://bugs.webkit.org/show_bug.cgi?id=17790
+
+        * wx/browser/browser.bkl:
+        * wx/build-wxwebkit:
+
 2008-03-15  Darin Adler  <darin@apple.com>
 
         * Scripts/commit-log-editor: Include the name line of the change log entry.
index 505d740..0a60fd9 100644 (file)
@@ -47,7 +47,6 @@ wxWebKit sample application build file
     <exe id="wxBrowser" template="wxwk,xml2,iconv,xslt,icu,jscore,webcore,wxwebkit,curl,pthreads">
         <app-type>gui</app-type>
         <runtime-libs>dynamic</runtime-libs>
-        <set var="BUILDDIR">$(WKOUTPUTDIR)/build/wxbrowser-$(FORMAT)</set>
         
         <include>$(WK_ROOT)/WebCore/platform/wx</include>
         <include>$(WK_ROOT)/WebCore/bridge/wx</include>
index 59907c7..9b47b3d 100755 (executable)
@@ -33,7 +33,7 @@ set -o errexit
 
 scriptDir="$(cd $(dirname $0);pwd)"
 WK_ROOT=$scriptDir/../..
-WK_ROOTDIR=$WK_ROOT
+WK_ROOTDIR="$WK_ROOT"
 
 cd $scriptDir
 
@@ -112,6 +112,7 @@ fi
 
 #----------------------------------------------------------------------
 # process command line args
+build_type_set=0
 
 do_bake=0
 do_prep=0
@@ -120,6 +121,7 @@ do_build=0
 do_clean=0
 do_install=0
 use_wxgc=0
+debug=1
 wxdebug=0
 wxpython=0
 make_args=''
@@ -148,6 +150,19 @@ if [ $do_bake == 0 -a $do_prep == 0 -a $do_build == 0 -a $do_clean == 0 ]; then
     do_bake=1; do_prep=1; do_build=1
 fi
 
+if [ -f $WK_ROOT/WebKitBuild/Configuration ]; then
+    BUILD_TYPE=`cat $WK_ROOT/WebKitBuild/Configuration`
+    echo "Configuration is: $BUILD_TYPE"
+    
+    if [ $BUILD_TYPE == "Release" ]; then
+        debug=0
+    fi
+    if [ $BUILD_TYPE == "Debug" ]; then
+        debug=1
+    fi
+    
+fi
+
 function do_make {
     dir=$1
     cxxflags=$2
@@ -260,6 +275,7 @@ if [ $do_build == 1 -o $do_clean == 1 ]; then
         PLATFORM_OS="mac"
     else
         PLATFORM_OS="linux"
+        use_wxgc=1 # Linux requires us to use wxgc to get proper drawing.
     fi
 
     WINDEPS="$WINDEPS $WXWIN/lib/vc_dll/wxmsw28u${WX_EXT}_core_vc.dll $WXWIN/lib/vc_dll/wxbase28u${WX_EXT}_vc.dll"
@@ -268,10 +284,10 @@ if [ $do_build == 1 -o $do_clean == 1 ]; then
     # first generated, we will get errors about missing files. 
     # FIXME: Make the check more robust.
     if [ -f $WK_ROOT/JavaScriptCore/GNUmakefile ]; then
-        do_make $WK_ROOT/JavaScriptCore      "-DBUILDING_WX__=1 $WXGC_DEFINE" WX_DEBUG=$wxdebug WEBKIT_ROOT=$WK_ROOTDIR PLATFORM_OS=$PLATFORM_OS $other_args 
-        do_make $WK_ROOT/WebCore "-DBUILDING_WX__=1 $WXGC_DEFINE" WX_DEBUG=$wxdebug WEBKIT_ROOT=$WK_ROOTDIR PLATFORM_OS=$PLATFORM_OS $other_args
-        do_make $WK_ROOT/WebKit/wx "-DBUILDING_WX__=1 -DWXMAKINGDLL_WEBKIT=1 $WXGC_DEFINE" WX_DEBUG=$wxdebug WEBKIT_ROOT=$WK_ROOTDIR PLATFORM_OS=$PLATFORM_OS $other_args 
-        do_make $WK_ROOT/WebKitTools/wx/browser  "-DBUILDING_WX__=1 -DWXUSINGDLL_WEBKIT=1 $WXGC_DEFINE" WX_DEBUG=$wxdebug WEBKIT_ROOT=$WK_ROOTDIR PLATFORM_OS=$PLATFORM_OS $other_args 
+        do_make $WK_ROOT/JavaScriptCore      "-DBUILDING_WX__=1 $WXGC_DEFINE" WX_DEBUG=$wxdebug DEBUG=$debug WEBKIT_ROOT=$WK_ROOTDIR PLATFORM_OS=$PLATFORM_OS $other_args 
+        do_make $WK_ROOT/WebCore "-DBUILDING_WX__=1 $WXGC_DEFINE" WX_DEBUG=$wxdebug WEBKIT_ROOT=$WK_ROOTDIR DEBUG=$debug PLATFORM_OS=$PLATFORM_OS $other_args
+        do_make $WK_ROOT/WebKit/wx "-DBUILDING_WX__=1 -DWXMAKINGDLL_WEBKIT=1 $WXGC_DEFINE" WX_DEBUG=$wxdebug DEBUG=$debug WEBKIT_ROOT=$WK_ROOTDIR PLATFORM_OS=$PLATFORM_OS $other_args 
+        do_make $WK_ROOT/WebKitTools/wx/browser  "-DBUILDING_WX__=1 -DWXUSINGDLL_WEBKIT=1 $WXGC_DEFINE" WX_DEBUG=$wxdebug DEBUG=$debug WEBKIT_ROOT=$WK_ROOTDIR PLATFORM_OS=$PLATFORM_OS $other_args 
     fi
     
     if [ $do_build == 1 ]; then 
@@ -320,6 +336,7 @@ if [ $do_build == 1 -o $do_clean == 1 ]; then
             
             # Run SWIG
             $SWIG $SWIG_FLAGS -I$WXPY_INCLUDE $WEBKIT_INCLUDE -o webview.cpp webview.i
+            cp webview.py $WEBKITOUTPUTDIR/webview.py
                                    
             PY_INCLUDE=`python -c "import sys,distutils.sysconfig; sys.stdout.write(distutils.sysconfig.get_python_inc())"`
             PY_VERSION=`python -c "import sys;  sys.stdout.write(str(sys.version_info[0]) + str(sys.version_info[1]))"`
@@ -332,7 +349,7 @@ if [ $do_build == 1 -o $do_clean == 1 ]; then
             fi
             
             do_make $WK_ROOT/WebKit/wx/bindings/python "-DBUILDING_WX__=1 -DWXUSINGDLL=1 -DWXUSINGDLL_WEBKIT=1 -I$PY_INCLUDE -I$WX_PREFIX/wxPython/include -I$WX_PREFIX/../wxPython/include $WXGC_DEFINE" \
-                WX_DEBUG=$wxdebug WEBKIT_ROOT=$WK_ROOTDIR PLATFORM_OS=$PLATFORM_OS PYTHON_VERSION=$PY_VERSION PYTHON_LIBDIR=$PY_LIBDIR $other_args
+                WX_DEBUG=$wxdebug DEBUG=$debug WEBKIT_ROOT=$WK_ROOTDIR PLATFORM_OS=$PLATFORM_OS PYTHON_VERSION=$PY_VERSION PYTHON_LIBDIR=$PY_LIBDIR $other_args
             if [ "${OSTYPE:0:6}" == "cygwin" ]; then
                 if [ -f $WEBKITOUTPUTDIR/_webview.pyd -a -f $WEBKITOUTPUTDIR/_webview.dll ]; then
                     rm $WEBKITOUTPUTDIR/_webview.pyd