wx build fix. Switching JSCore from a static lib to a dynamic lib to match the...

wx build fix. Switching JSCore from a static lib to a dynamic lib to match the Apple build and fix symbol exports.


git-svn-id: svn://svn.chromium.org/blink/trunk@42860 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/JavaScriptCore/ChangeLog

+2009-04-24  Kevin Ollivier  <kevino@theolliviers.com>
+
+        wx build fix. Switching JSCore from a static lib to a dynamic lib
+        to match the Apple build and fix symbol exports.
+
+        * jscore.bkl:
+
 2009-04-24  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
 
         Rubber-stamped by Mark Rowe.

third_party/WebKit/JavaScriptCore/jscore.bkl

@@ -93,7 +93,7 @@ JavaScriptCore Bakefile project file.
             <!-- FIXME: we need proper configure checks -->
             <define>HAVE_FUNC_ISNAN</define>
             <!-- check for undefined symbols for debugging reasons -->
-            <ldflags>-Wl,--no-undefined</ldflags>
+            <ldflags>-Wl</ldflags>
         </if>
 
         <if cond="PLATFORM_WIN32=='1'">
@@ -126,9 +126,6 @@ JavaScriptCore Bakefile project file.
         <include>$(WK_ROOT)/JavaScriptCore/wtf</include>
         <dirname>$(WKOUTPUTDIR)</dirname>
         <sources>$(SRCDIR)/jsc.cpp</sources>
-        <if cond="FORMAT=='gnu'">
-            <ldflags>$(WKOUTPUTDIR)/libjscore.a</ldflags>
-        </if>
         <set var="READLINE_LIB">
             <if cond="WX_PORT=='mac'">edit</if>
         </set>
@@ -148,7 +145,10 @@ JavaScriptCore Bakefile project file.
         <command>bash make-generated-sources.sh</command>
     </action>
 
-    <lib id="jscore" template="jscore_base,wx-lib">
-
-    </lib>
+    <dll id="jscore" template="jscore_base,wxwk">
+        <define>BUILDING_JavaScriptCore</define>
+        <runtime-libs>dynamic</runtime-libs>
+        <dllname>jscore</dllname>
+        <libname>jscore</libname>
+    </dll>
 </makefile>

third_party/WebKit/WebKit/wx/ChangeLog

+2009-04-24  Kevin Ollivier  <kevino@theolliviers.com>
+
+        wx build fix. Switching JSCore from a static lib to a dynamic lib
+        to match the Apple build and fix symbol exports.
+
+        * bindings/python/wxwebkit-py.bkl:
+        * presets/wxwebkit.bkl:
+        * wxwebkit.bkl:
+
 2009-04-15  Robin Dunn  <robin@alldunn.com>
 
         Reviewed by Kevin Ollivier.

third_party/WebKit/WebKit/wx/bindings/python/wxwebkit-py.bkl

@@ -62,7 +62,7 @@ Bakefile for wxWebKit Python bindings.
     <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>
+            <depends-on-file>$(WKOUTPUTDIR)/libjscore.dylib</depends-on-file>
             <depends-on-file>$(WKOUTPUTDIR)/libwebcore-wx.a</depends-on-file>
         </if>
         <if cond="FORMAT=='msvc'">

third_party/WebKit/WebKit/wx/presets/wxwebkit.bkl

@@ -98,6 +98,8 @@ and WebCore. Include this file to use these settings.
             <include>$(WK_ROOT)/JavaScriptCore/os-win32</include><!-- stdint.h is here -->
             <include>$(WKOUTPUTDIR)</include>
         </if>
+        <lib-path>$(WKOUTPUTDIR)</lib-path>
+        <sys-lib>jscore</sys-lib>
     </template>
 
     <template id="webcore">

third_party/WebKit/WebKit/wx/wxwebkit.bkl

@@ -37,7 +37,7 @@ This file builds the wxWebKit library.
     <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'">
-            <depends-on-file>$(WKOUTPUTDIR)/libjscore.a</depends-on-file>
+            <depends-on-file>$(WKOUTPUTDIR)/libjscore.dylib</depends-on-file>
             <depends-on-file>$(WKOUTPUTDIR)/libwebcore-wx.a</depends-on-file>
         </if>
         <if cond="FORMAT=='msvc'">

third_party/WebKit/WebKitTools/ChangeLog

+2009-04-24  Kevin Ollivier  <kevino@theolliviers.com>
+
+        wx build fix. Switching JSCore from a static lib to a dynamic lib
+        to match the Apple build and fix symbol exports.
+
+        * wx/build-wxwebkit:
+
 2009-04-24  Eric Seidel  <eric@webkit.org>
 
         Reviewed by Adam Roben.

third_party/WebKit/WebKitTools/wx/build-wxwebkit

@@ -217,6 +217,12 @@ if [ $do_clean != 1 ]; then
         # platform it's running on with GNU format, and so it defaults
         # to the standard Unix file endings and linker args.
         if [ "${OSTYPE:0:6}" = "darwin" ]; then    
+            sed "s/libjscore.so/libjscore.dylib/" < $WK_ROOT/JavaScriptCore/GNUmakefile > temp
+            mv temp $WK_ROOT/JavaScriptCore/GNUmakefile
+            
+            sed "s/\-shared/\-dynamiclib/" < $WK_ROOT/JavaScriptCore/GNUmakefile > temp
+            mv temp $WK_ROOT/JavaScriptCore/GNUmakefile
+            
             sed "s/\-shared/\-dynamiclib/" < $WK_ROOT/WebCore/GNUmakefile > temp
             mv temp $WK_ROOT/WebCore/GNUmakefile