[wx] Unreviewed. Adding Source/WTF to the build and updating waf port list.

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

diff --git a/ChangeLog b/ChangeLog
index a531e05..c7127a3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-03-22  Kevin Ollivier  <kevino@theolliviers.com>
+
+        [wx] Unreviewed. Adding Source/WTF to the build and updating
+        waf port list.
+
+        * wscript:
+
 2012-03-21  Ryosuke Niwa  <rniwa@webkit.org>
 
         Add the forgotten admin.html after r108917.

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index cf0bc63..1957922 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-22  Kevin Ollivier  <kevino@theolliviers.com>
+
+        [wx] Unreviewed. Adding Source/WTF to the build.
+
+        * wscript:
+
 2012-03-22  Gavin Barraclough  <barraclough@apple.com>
 
         Add JSValue::isFunction

diff --git a/Source/JavaScriptCore/wscript b/Source/JavaScriptCore/wscript
index 9da1867..64f545e 100644 (file)
--- a/Source/JavaScriptCore/wscript
+++ b/Source/JavaScriptCore/wscript
@@ -56,7 +56,7 @@ def build(bld):
     # 1. A simple program
     jscore = bld.new_task_gen(
         features = 'cc cxx cshlib',
-        includes = '. .. assembler DerivedSources ForwardingHeaders ' + ' '.join(includes),
+        includes = '. .. assembler ../WTF ../WTF/wtf ' + ' '.join(includes),
         source = sources,
         defines = ['BUILDING_JavaScriptCore'],
         target = 'jscore',
@@ -68,7 +68,7 @@ def build(bld):
     
     obj = bld.new_task_gen(
         features = 'cxx cprogram',
-        includes = '. .. assembler DerivedSources ForwardingHeaders ' + ' '.join(includes),
+        includes = '. .. assembler ../WTF ' + ' '.join(includes),
         source = 'jsc.cpp',
         target = 'jsc',
         uselib = 'WX ICU ' + get_config(),

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 21d4499..687783d 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,11 @@
+2012-03-22  Kevin Ollivier  <kevino@theolliviers.com>
+
+        [wx] Unreviewed. Adding Source/WTF to the build and updating
+        waf port list.
+
+        * DumpRenderTree/wscript:
+        * waf/build/settings.py:
+
 2012-03-22  Dirk Pranke  <dpranke@chromium.org>
 
         Re-land fix for r81603 yet again (!) with latest build fix.

diff --git a/Tools/DumpRenderTree/wscript b/Tools/DumpRenderTree/wscript
index 67efe9f..645c7d6 100644 (file)
--- a/Tools/DumpRenderTree/wscript
+++ b/Tools/DumpRenderTree/wscript
@@ -32,6 +32,7 @@ from settings import *
 include_paths = [
                 os.path.join(output_dir),
                 os.path.join(wk_root, 'Source', 'JavaScriptCore'),
+                os.path.join(wk_root, 'Source', 'WTF'),
                 os.path.join(wk_root, 'Source', 'WebCore'),
                 os.path.join(wk_root, 'Source', 'WebCore', 'bindings', 'wx'),
                 os.path.join(wk_root, 'Source', 'WebKit', 'wx'), 

diff --git a/Tools/waf/build/settings.py b/Tools/waf/build/settings.py
index 7fa3b42..6db2472 100644 (file)
--- a/Tools/waf/build/settings.py
+++ b/Tools/waf/build/settings.py
@@ -61,17 +61,24 @@ common_libpaths = []
 common_frameworks = []
 
 ports = [
+    'BlackBerry',
     'Chromium',
+    'Efl',
     'Gtk',
     'Mac',
     'None',
     'Qt',
     'Safari',
     'Win',
-    'Wince',
+    'WinCE',
     'wx',
 ]
 
+uses = [
+    'CF',
+    'CFNet',
+]
+
 port_uses = {
     'wx': ['CURL', 'WXGC'],
 }
@@ -126,6 +133,7 @@ webcore_dirs_common = [
     'Source/WebCore/loader/archive',
     'Source/WebCore/loader/cache',
     'Source/WebCore/loader/icon',
+    'Source/WebCore/Modules/filesystem',
     'Source/WebCore/Modules/geolocation',
     'Source/WebCore/Modules/indexeddb',
     'Source/WebCore/Modules/webdatabase',

diff --git a/wscript b/wscript
index 224735b..ab9d3dc 100644 (file)
--- a/wscript
+++ b/wscript
@@ -208,7 +208,6 @@ def build(bld):
 
     import TaskGen
 
-    # FIXME: Does this need to be Source/JavaScriptCore?
     bld.add_subdirs('Source/JavaScriptCore')
 
     if sys.platform.startswith('darwin'):
@@ -216,16 +215,24 @@ def build(bld):
         TaskGen.task_gen.mappings['.m'] = TaskGen.task_gen.mappings['.cxx']
 
     features = [Options.options.port.lower()]
-    exclude_patterns = ['*AllInOne.cpp', '*CFNet.cpp', '*Chromium*.cpp', 
-            '*Efl.cpp', '*Gtk.cpp', '*Mac.cpp', '*None.cpp', '*Qt.cpp', '*Safari.cpp',
-            'test*bindings.*', '*WinCE.cpp', "WebDOMCanvas*.cpp", "WebDOMSVG*.cpp"]
+    thisport = Options.options.port
+    
+    exclude_patterns = ['*AllInOne.cpp', '*None.cpp',]
+
+    # exclude the filename patterns for all other ports.
+    for port in ports:
+        if not port == thisport:
+            exclude = "*%s.cpp" % port
+            if port == 'Chromium':
+                exclude = "*Chromium*.cpp"
+            exclude_patterns.append(exclude)
+            
     if Options.options.port == 'wx':
         features.append('curl')
-        exclude_patterns.append('*Win.cpp')
+        exclude_patterns.extend(['*CFNet.cpp', 'test*bindings.*', "WebDOMCanvas*.cpp", "WebDOMSVG*.cpp"])
         
     if sys.platform.startswith('darwin'):
         features.append('cf')
-        
     else:
         exclude_patterns.append('*CF.cpp')
 
@@ -259,7 +266,7 @@ def build(bld):
 
     webcore = bld.new_task_gen(
         features = 'cc cxx cshlib',
-        includes = ' '.join(wk_includes),
+        includes = 'Source/WTF ' + ' '.join(wk_includes),
         source = ' '.join(flattenSources(webcore_sources.values())),
         cxxflags = cxxflags,
         defines = ['WXMAKINGDLL_WEBKIT', 'BUILDING_WebCore'],