Changeset 112048 in webkit

Timestamp:

Mar 25, 2012, 10:47:21 PM (15 years ago)

Author:

kevino@webkit.org

Message:

[wx] Unreviewed build fix. Move WTF to its own static lib build.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/wscript (modified) (1 diff)
• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wscript (added)
• Tools/ChangeLog (modified) (1 diff)
• Tools/waf/build/settings.py (modified) (4 diffs)
• wscript (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2012-03-25  Kevin Ollivier  <kevino@theolliviers.com>
+
+        [wx] Unreviewed build fix. Move WTF to its own static lib build.
+        
+        * wscript:
+
 2012-03-24  Kevin Ollivier  <kevino@theolliviers.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-03-25  Kevin Ollivier  <kevino@theolliviers.com>
+
+        [wx] Unreviewed build fix. Move WTF to its own static lib build.
+
+        * wscript:
+
 2012-03-25  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/wscript

@@ -69 +69 @@
         target = 'jscore',
         uselib = 'WX ICU ' + get_config(),
-        uselib_local = '',
+        uselib_local = 'wtf',
         install_path = output_dir)
 

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2012-03-25  Kevin Ollivier  <kevino@theolliviers.com>
+
+        [wx] Unreviewed build fix. Move WTF to its own static lib build.
+
+        * wscript: Added.
+
 2012-03-23  Tony Chang  <tony@chromium.org>
 

trunk/Tools/ChangeLog

@@ +1 @@
+2012-03-25  Kevin Ollivier  <kevino@theolliviers.com>
+
+        [wx] Unreviewed build fix. Move WTF to its own static lib build.
+
+        * waf/build/settings.py:
+        (common_configure):
+
 2012-03-24  Chris Fleizach  <cfleizach@apple.com>
 

trunk/Tools/waf/build/settings.py

@@ -50 +50 @@
     wx_root = commands.getoutput('wx-config --prefix')
 
+wtf_dir = os.path.join(wk_root, 'Source', 'WTF')
 jscore_dir = os.path.join(wk_root, 'Source', 'JavaScriptCore')
 webcore_dir = os.path.join(wk_root, 'Source', 'WebCore')
@@ -101 +102 @@
     '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',
 ]
 
@@ -304 +308 @@
     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)
 
@@ -418 +422 @@
 
         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:

trunk/wscript

@@ -210 +210 @@
     import TaskGen
 
-    bld.add_subdirs('Source/JavaScriptCore')
+    bld.add_subdirs('Source/WTF Source/JavaScriptCore')
 
     if sys.platform.startswith('darwin'):
@@ -270 +270 @@
         target = 'wxwebkit',
         uselib = 'WX ICU XML XSLT CURL SQLITE3 WKINTERFACE ' + get_config(),
-        uselib_local = 'jscore',
+        uselib_local = 'wtf jscore',
         install_path = output_dir,
         )