[wx] Unreviewed. Build fix, move WTF back into JSCore target

until issues with JSCore not linking in all WTF symbols are resolved.

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

diff --git a/ChangeLog b/ChangeLog
index c362f35..e00a487 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-03-28  Kevin Ollivier  <kevino@theolliviers.com>
+
+        [wx] Unreviewed. Build fix, move WTF back into JSCore target
+        until issues with JSCore not linking in all WTF symbols are resolved.
+
+        * wscript:
+
 2012-03-28  Sergio Villar Senin  <svillar@igalia.com>
 
         [Soup] DNS prefetching spams resolver, shoots self in the foot

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index d3b586a..8815eab 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,10 @@
+2012-03-28  Kevin Ollivier  <kevino@theolliviers.com>
+
+        [wx] Unreviewed. Build fix, move WTF back into JSCore target
+        until issues with JSCore not linking in all WTF symbols are resolved.
+        
+        * wscript:
+
 2012-03-28  Gavin Barraclough  <barraclough@apple.com>
 
         Yarr: if we're not using the output array, don't populate it!

diff --git a/Source/JavaScriptCore/wscript b/Source/JavaScriptCore/wscript
index 4850465..08ebcdb 100644 (file)
--- a/Source/JavaScriptCore/wscript
+++ b/Source/JavaScriptCore/wscript
@@ -68,7 +68,7 @@ def build(bld):
         defines = ['BUILDING_JavaScriptCore'],
         target = 'jscore',
         uselib = 'WX ICU ' + get_config(),
-        uselib_local = 'wtf',
+        uselib_local = '',
         install_path = output_dir)
 
     jscore.find_sources_in_dirs(full_dirs, excludes = jscore_excludes)
@@ -88,3 +88,5 @@ def build(bld):
         myenv.CXXFLAGS = myenv.CXXFLAGS[:]
         myenv.CXXFLAGS.remove('/EHsc')
         obj.env = myenv
+
+    bld.add_group()

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index afd2c17..3d566e2 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,10 @@
+2012-03-28  Kevin Ollivier  <kevino@theolliviers.com>
+
+        [wx] Unreviewed. Build fix, move WTF back into JSCore target
+        until issues with JSCore not linking in all WTF symbols are resolved.
+
+        * waf/build/settings.py:
+
 2012-03-28  Simon Fraser  <simon.fraser@apple.com>
 
         download-built-product build step should detect 404 errors

diff --git a/Tools/waf/build/settings.py b/Tools/waf/build/settings.py
index 99d0ea5..fdf6c1e 100644 (file)
--- a/Tools/waf/build/settings.py
+++ b/Tools/waf/build/settings.py
@@ -102,14 +102,11 @@ jscore_dirs = [
     'runtime',
     'tools',
     'yarr',
-]
-
-wtf_dirs = [
-    'wtf',
-    'wtf/dtoa',
-    'wtf/text',
-    'wtf/unicode',
-    'wtf/unicode/icu',
+    '../WTF/wtf',
+    '../WTF/wtf/dtoa',
+    '../WTF/wtf/text',
+    '../WTF/wtf/unicode',
+    '../WTF/wtf/unicode/icu',
 ]
 
 webcore_dirs_common = [

diff --git a/wscript b/wscript
index e4f060a..8c17d61 100644 (file)
--- a/wscript
+++ b/wscript
@@ -209,7 +209,7 @@ def build(bld):
 
     import TaskGen
 
-    bld.add_subdirs('Source/WTF Source/JavaScriptCore')
+    bld.add_subdirs('Source/JavaScriptCore')
 
     if sys.platform.startswith('darwin'):
         TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cxx']
@@ -269,7 +269,7 @@ def build(bld):
         libpath = [output_dir],
         target = 'wxwebkit',
         uselib = 'WX ICU XML XSLT CURL SQLITE3 WKINTERFACE ' + get_config(),
-        uselib_local = 'wtf jscore',
+        uselib_local = 'jscore',
         install_path = output_dir,
         )