Diff
Modified: trunk/ChangeLog (111745 => 111746)
--- trunk/ChangeLog 2012-03-22 19:37:22 UTC (rev 111745)
+++ trunk/ChangeLog 2012-03-22 19:43:29 UTC (rev 111746)
@@ -1,3 +1,10 @@
+2012-03-22 Kevin Ollivier <kev...@theolliviers.com>
+
+ [wx] Unreviewed. Adding Source/WTF to the build and updating
+ waf port list.
+
+ * wscript:
+
2012-03-21 Ryosuke Niwa <rn...@webkit.org>
Add the forgotten admin.html after r108917.
Modified: trunk/Source/_javascript_Core/ChangeLog (111745 => 111746)
--- trunk/Source/_javascript_Core/ChangeLog 2012-03-22 19:37:22 UTC (rev 111745)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-03-22 19:43:29 UTC (rev 111746)
@@ -1,3 +1,9 @@
+2012-03-22 Kevin Ollivier <kev...@theolliviers.com>
+
+ [wx] Unreviewed. Adding Source/WTF to the build.
+
+ * wscript:
+
2012-03-22 Gavin Barraclough <barraclo...@apple.com>
Add JSValue::isFunction
Modified: trunk/Source/_javascript_Core/wscript (111745 => 111746)
--- trunk/Source/_javascript_Core/wscript 2012-03-22 19:37:22 UTC (rev 111745)
+++ trunk/Source/_javascript_Core/wscript 2012-03-22 19:43:29 UTC (rev 111746)
@@ -56,7 +56,7 @@
# 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 @@
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(),
Modified: trunk/Tools/ChangeLog (111745 => 111746)
--- trunk/Tools/ChangeLog 2012-03-22 19:37:22 UTC (rev 111745)
+++ trunk/Tools/ChangeLog 2012-03-22 19:43:29 UTC (rev 111746)
@@ -1,3 +1,11 @@
+2012-03-22 Kevin Ollivier <kev...@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 <dpra...@chromium.org>
Re-land fix for r81603 yet again (!) with latest build fix.
Modified: trunk/Tools/DumpRenderTree/wscript (111745 => 111746)
--- trunk/Tools/DumpRenderTree/wscript 2012-03-22 19:37:22 UTC (rev 111745)
+++ trunk/Tools/DumpRenderTree/wscript 2012-03-22 19:43:29 UTC (rev 111746)
@@ -32,6 +32,7 @@
include_paths = [
os.path.join(output_dir),
os.path.join(wk_root, 'Source', '_javascript_Core'),
+ 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'),
Modified: trunk/Tools/waf/build/settings.py (111745 => 111746)
--- trunk/Tools/waf/build/settings.py 2012-03-22 19:37:22 UTC (rev 111745)
+++ trunk/Tools/waf/build/settings.py 2012-03-22 19:43:29 UTC (rev 111746)
@@ -61,17 +61,24 @@
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 @@
'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',
Modified: trunk/wscript (111745 => 111746)
--- trunk/wscript 2012-03-22 19:37:22 UTC (rev 111745)
+++ trunk/wscript 2012-03-22 19:43:29 UTC (rev 111746)
@@ -208,7 +208,6 @@
import TaskGen
- # FIXME: Does this need to be Source/_javascript_Core?
bld.add_subdirs('Source/_javascript_Core')
if sys.platform.startswith('darwin'):
@@ -216,16 +215,24 @@
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 @@
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'],
