Diff
Modified: trunk/ChangeLog (112455 => 112456)
--- trunk/ChangeLog 2012-03-28 22:20:52 UTC (rev 112455)
+++ trunk/ChangeLog 2012-03-28 22:24:14 UTC (rev 112456)
@@ -1,3 +1,10 @@
+2012-03-28 Kevin Ollivier <[email protected]>
+
+ [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 <[email protected]>
[Soup] DNS prefetching spams resolver, shoots self in the foot
Modified: trunk/Source/_javascript_Core/ChangeLog (112455 => 112456)
--- trunk/Source/_javascript_Core/ChangeLog 2012-03-28 22:20:52 UTC (rev 112455)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-03-28 22:24:14 UTC (rev 112456)
@@ -1,3 +1,10 @@
+2012-03-28 Kevin Ollivier <[email protected]>
+
+ [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 <[email protected]>
Yarr: if we're not using the output array, don't populate it!
Modified: trunk/Source/_javascript_Core/wscript (112455 => 112456)
--- trunk/Source/_javascript_Core/wscript 2012-03-28 22:20:52 UTC (rev 112455)
+++ trunk/Source/_javascript_Core/wscript 2012-03-28 22:24:14 UTC (rev 112456)
@@ -68,7 +68,7 @@
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 @@
myenv.CXXFLAGS = myenv.CXXFLAGS[:]
myenv.CXXFLAGS.remove('/EHsc')
obj.env = myenv
+
+ bld.add_group()
Modified: trunk/Tools/ChangeLog (112455 => 112456)
--- trunk/Tools/ChangeLog 2012-03-28 22:20:52 UTC (rev 112455)
+++ trunk/Tools/ChangeLog 2012-03-28 22:24:14 UTC (rev 112456)
@@ -1,3 +1,10 @@
+2012-03-28 Kevin Ollivier <[email protected]>
+
+ [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 <[email protected]>
download-built-product build step should detect 404 errors
Modified: trunk/Tools/waf/build/settings.py (112455 => 112456)
--- trunk/Tools/waf/build/settings.py 2012-03-28 22:20:52 UTC (rev 112455)
+++ trunk/Tools/waf/build/settings.py 2012-03-28 22:24:14 UTC (rev 112456)
@@ -102,16 +102,13 @@
'runtime',
'tools',
'yarr',
+ '../WTF/wtf',
+ '../WTF/wtf/dtoa',
+ '../WTF/wtf/text',
+ '../WTF/wtf/unicode',
+ '../WTF/wtf/unicode/icu',
]
-wtf_dirs = [
- 'wtf',
- 'wtf/dtoa',
- 'wtf/text',
- 'wtf/unicode',
- 'wtf/unicode/icu',
-]
-
webcore_dirs_common = [
'Source/WebCore/Modules/websockets',
'Source/WebCore/accessibility',
Modified: trunk/wscript (112455 => 112456)
--- trunk/wscript 2012-03-28 22:20:52 UTC (rev 112455)
+++ trunk/wscript 2012-03-28 22:24:14 UTC (rev 112456)
@@ -209,7 +209,7 @@
import TaskGen
- bld.add_subdirs('Source/WTF Source/_javascript_Core')
+ bld.add_subdirs('Source/_javascript_Core')
if sys.platform.startswith('darwin'):
TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cxx']
@@ -269,7 +269,7 @@
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,
)
