Diff
Modified: trunk/ChangeLog (112047 => 112048)
--- trunk/ChangeLog 2012-03-26 05:37:46 UTC (rev 112047)
+++ trunk/ChangeLog 2012-03-26 05:47:21 UTC (rev 112048)
@@ -1,3 +1,9 @@
+2012-03-25 Kevin Ollivier <[email protected]>
+
+ [wx] Unreviewed build fix. Move WTF to its own static lib build.
+
+ * wscript:
+
2012-03-24 Kevin Ollivier <[email protected]>
[wx] Unreviewed. Fix the build after WTF move.
Modified: trunk/Source/_javascript_Core/ChangeLog (112047 => 112048)
--- trunk/Source/_javascript_Core/ChangeLog 2012-03-26 05:37:46 UTC (rev 112047)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-03-26 05:47:21 UTC (rev 112048)
@@ -1,3 +1,9 @@
+2012-03-25 Kevin Ollivier <[email protected]>
+
+ [wx] Unreviewed build fix. Move WTF to its own static lib build.
+
+ * wscript:
+
2012-03-25 Filip Pizlo <[email protected]>
DFG int-to-double conversion should be revealed to CSE
Modified: trunk/Source/_javascript_Core/wscript (112047 => 112048)
--- trunk/Source/_javascript_Core/wscript 2012-03-26 05:37:46 UTC (rev 112047)
+++ trunk/Source/_javascript_Core/wscript 2012-03-26 05:47:21 UTC (rev 112048)
@@ -68,7 +68,7 @@
defines = ['BUILDING_JavaScriptCore'],
target = 'jscore',
uselib = 'WX ICU ' + get_config(),
- uselib_local = '',
+ uselib_local = 'wtf',
install_path = output_dir)
jscore.find_sources_in_dirs(full_dirs, excludes = jscore_excludes)
Modified: trunk/Source/WTF/ChangeLog (112047 => 112048)
--- trunk/Source/WTF/ChangeLog 2012-03-26 05:37:46 UTC (rev 112047)
+++ trunk/Source/WTF/ChangeLog 2012-03-26 05:47:21 UTC (rev 112048)
@@ -1,3 +1,9 @@
+2012-03-25 Kevin Ollivier <[email protected]>
+
+ [wx] Unreviewed build fix. Move WTF to its own static lib build.
+
+ * wscript: Added.
+
2012-03-23 Tony Chang <[email protected]>
[chromium] Unreviewed, move a comment closer to where it matters and
Added: trunk/Source/WTF/wscript (0 => 112048)
--- trunk/Source/WTF/wscript (rev 0)
+++ trunk/Source/WTF/wscript 2012-03-26 05:47:21 UTC (rev 112048)
@@ -0,0 +1,66 @@
+#! /usr/bin/env python
+
+# Copyright (C) 2012 Kevin Ollivier All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# WTF build script for the waf build system
+
+import commands
+
+from settings import *
+
+def build(bld):
+
+ import Options
+
+ wtf_excludes = []
+ wtf_exclude_patterns = get_port_excludes(Options.options.port)
+ wtf_exclude_patterns.append('*None.cpp')
+
+ if Options.options.port == "wx":
+ if building_on_win32:
+ wtf_excludes += ['OSAllocatorPosix.cpp', 'ThreadingPthreads.cpp']
+
+ bld.env.LIBDIR = output_dir
+ full_dirs = get_dirs_for_features(wtf_dir, features=[Options.options.port.lower()], dirs=wtf_dirs)
+ abs_dirs = []
+ for adir in full_dirs:
+ abs_dirs.append(os.path.join(wtf_dir, adir))
+
+ wtf_excludes.extend(get_excludes_in_dirs(abs_dirs, wtf_exclude_patterns))
+
+ includes = common_includes + full_dirs + [output_dir]
+
+ if sys.platform.startswith('darwin'):
+ includes.append(os.path.join(wtf_dir, 'icu'))
+
+ wtf = bld.new_task_gen(
+ features = 'cc cxx cstaticlib',
+ includes = '. .. assembler ../WTF ' + ' '.join(includes),
+ defines = ['BUILDING_WTF'],
+ target = 'wtf',
+ uselib = 'WX ICU ' + get_config(),
+ uselib_local = '',
+ install_path = output_dir)
+
+ wtf.find_sources_in_dirs(full_dirs, excludes = wtf_excludes)
Modified: trunk/Tools/ChangeLog (112047 => 112048)
--- trunk/Tools/ChangeLog 2012-03-26 05:37:46 UTC (rev 112047)
+++ trunk/Tools/ChangeLog 2012-03-26 05:47:21 UTC (rev 112048)
@@ -1,3 +1,10 @@
+2012-03-25 Kevin Ollivier <[email protected]>
+
+ [wx] Unreviewed build fix. Move WTF to its own static lib build.
+
+ * waf/build/settings.py:
+ (common_configure):
+
2012-03-24 Chris Fleizach <[email protected]>
AX: Support solution to handle invalid ax text marker
Modified: trunk/Tools/waf/build/settings.py (112047 => 112048)
--- trunk/Tools/waf/build/settings.py 2012-03-26 05:37:46 UTC (rev 112047)
+++ trunk/Tools/waf/build/settings.py 2012-03-26 05:47:21 UTC (rev 112048)
@@ -49,6 +49,7 @@
else:
wx_root = commands.getoutput('wx-config --prefix')
+wtf_dir = os.path.join(wk_root, 'Source', 'WTF')
jscore_dir = os.path.join(wk_root, 'Source', '_javascript_Core')
webcore_dir = os.path.join(wk_root, 'Source', 'WebCore')
wklibs_dir = os.path.join(wk_root, 'WebKitLibraries')
@@ -100,14 +101,17 @@
'profiler',
'runtime',
'tools',
- '../WTF/wtf',
- '../WTF/wtf/dtoa',
- '../WTF/wtf/text',
- '../WTF/wtf/unicode',
- '../WTF/wtf/unicode/icu',
'yarr',
]
+wtf_dirs = [
+ 'wtf',
+ 'wtf/dtoa',
+ 'wtf/text',
+ 'wtf/unicode',
+ 'wtf/unicode/icu',
+]
+
webcore_dirs_common = [
'Source/WebCore/Modules/websockets',
'Source/WebCore/accessibility',
@@ -303,7 +307,7 @@
if Options.options.cairo and build_port == 'wx':
if building_on_win32 and not "CAIRO_ROOT" in os.environ:
- Log.error("To build with Cairo on Windows, you must set the CAIRO_ROOT environment variable.")
+ Logs.error("To build with Cairo on Windows, you must set the CAIRO_ROOT environment variable.")
sys.exit(1)
if building_on_win32:
@@ -417,6 +421,9 @@
archs = [arch]
sdkroot = '/Developer/SDKs/MacOSX%s.sdk' % sdk_version
+ if not os.path.exists(sdkroot):
+ Logs.error("Cannot find the specified SDK needed to build: %r" % sdkroot)
+ sys.exit(1)
sdkflags = ['-isysroot', sdkroot]
for arch in archs:
sdkflags.extend(['-arch', arch])
Modified: trunk/wscript (112047 => 112048)
--- trunk/wscript 2012-03-26 05:37:46 UTC (rev 112047)
+++ trunk/wscript 2012-03-26 05:47:21 UTC (rev 112048)
@@ -209,7 +209,7 @@
import TaskGen
- bld.add_subdirs('Source/_javascript_Core')
+ bld.add_subdirs('Source/WTF 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 = 'jscore',
+ uselib_local = 'wtf jscore',
install_path = output_dir,
)
