[webkit-changes] [100851] trunk/Source

Sat, 19 Nov 2011 00:25:18 -0800

Title: [100851] trunk/Source
Revision
100851
Author
[email protected]
Date
2011-11-19 00:25:10 -0800 (Sat, 19 Nov 2011)

Log Message

Integrate Source/WTF with the Chromium build system
https://bugs.webkit.org/show_bug.cgi?id=72790

Reviewed by Eric Seidel.

Source/WebCore: 

Add a dependency on the new WTF.

* WebCore.gyp/WebCore.gyp:

Source/WebKit/chromium: 

Add a dependency on the new WTF.

* WebKit.gyp:

Source/WTF: 

Rename the target in this file to "newwtf" to avoid naming conflicts.

* WTF.gyp/WTF.gyp:

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (100850 => 100851)


--- trunk/Source/WTF/ChangeLog	2011-11-19 08:09:22 UTC (rev 100850)
+++ trunk/Source/WTF/ChangeLog	2011-11-19 08:25:10 UTC (rev 100851)
@@ -1,3 +1,14 @@
+2011-11-19  Adam Barth  <[email protected]>
+
+        Integrate Source/WTF with the Chromium build system
+        https://bugs.webkit.org/show_bug.cgi?id=72790
+
+        Reviewed by Eric Seidel.
+
+        Rename the target in this file to "newwtf" to avoid naming conflicts.
+
+        * WTF.gyp/WTF.gyp:
+
 2011-11-19  Mark Rowe  <[email protected]>
 
         WTF should have an Xcode project

Modified: trunk/Source/WTF/WTF.gyp/WTF.gyp (100850 => 100851)


--- trunk/Source/WTF/WTF.gyp/WTF.gyp	2011-11-19 08:09:22 UTC (rev 100850)
+++ trunk/Source/WTF/WTF.gyp/WTF.gyp	2011-11-19 08:25:10 UTC (rev 100851)
@@ -32,7 +32,7 @@
     '../WTF.gypi',
   ],
   'targets': [{
-    'target_name': 'wtf',
+    'target_name': 'newwtf',
     'type': 'static_library',
     'include_dirs': [
       '../',

Modified: trunk/Source/WebCore/ChangeLog (100850 => 100851)


--- trunk/Source/WebCore/ChangeLog	2011-11-19 08:09:22 UTC (rev 100850)
+++ trunk/Source/WebCore/ChangeLog	2011-11-19 08:25:10 UTC (rev 100851)
@@ -1,3 +1,14 @@
+2011-11-19  Adam Barth  <[email protected]>
+
+        Integrate Source/WTF with the Chromium build system
+        https://bugs.webkit.org/show_bug.cgi?id=72790
+
+        Reviewed by Eric Seidel.
+
+        Add a dependency on the new WTF.
+
+        * WebCore.gyp/WebCore.gyp:
+
 2011-11-18  Takashi Toyoshima  <[email protected]>
 
         [Chromium] [WebSocket] export WebSocketChannel interface for plugins

Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (100850 => 100851)


--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp	2011-11-19 08:09:22 UTC (rev 100850)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp	2011-11-19 08:25:10 UTC (rev 100851)
@@ -989,6 +989,7 @@
         'debugger_script_source',
         '../../_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp:yarr',
         '../../_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp:wtf',
+        '../../WTF/WTF.gyp/WTF.gyp:newwtf',
         '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
         '<(chromium_src_dir)/skia/skia.gyp:skia',
         '<(chromium_src_dir)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg',
@@ -1110,6 +1111,7 @@
         '../../ThirdParty/glu/glu.gyp:libtess',
         '../../_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp:yarr',
         '../../_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp:wtf',
+        '../../WTF/WTF.gyp/WTF.gyp:newwtf',
         '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
         '<(chromium_src_dir)/skia/skia.gyp:skia',
         '<(chromium_src_dir)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg',
@@ -1127,6 +1129,7 @@
       'export_dependent_settings': [
         '../../_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp:yarr',
         '../../_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp:wtf',
+        '../../WTF/WTF.gyp/WTF.gyp:newwtf',
         '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
         '<(chromium_src_dir)/skia/skia.gyp:skia',
         '<(chromium_src_dir)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg',
@@ -1871,6 +1874,7 @@
         # Exported.
         'webcore_bindings',
         '../../_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp:wtf',
+        '../../WTF/WTF.gyp/WTF.gyp:newwtf',
         '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
         '<(chromium_src_dir)/skia/skia.gyp:skia',
         '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
@@ -1879,6 +1883,7 @@
       'export_dependent_settings': [
         'webcore_bindings',
         '../../_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp:wtf',
+        '../../WTF/WTF.gyp/WTF.gyp:newwtf',
         '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
         '<(chromium_src_dir)/skia/skia.gyp:skia',
         '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',

Modified: trunk/Source/WebKit/chromium/ChangeLog (100850 => 100851)


--- trunk/Source/WebKit/chromium/ChangeLog	2011-11-19 08:09:22 UTC (rev 100850)
+++ trunk/Source/WebKit/chromium/ChangeLog	2011-11-19 08:25:10 UTC (rev 100851)
@@ -1,3 +1,14 @@
+2011-11-19  Adam Barth  <[email protected]>
+
+        Integrate Source/WTF with the Chromium build system
+        https://bugs.webkit.org/show_bug.cgi?id=72790
+
+        Reviewed by Eric Seidel.
+
+        Add a dependency on the new WTF.
+
+        * WebKit.gyp:
+
 2011-11-18  Takashi Toyoshima  <[email protected]>
 
         [Chromium] [WebSocket] export WebSocketChannel interface for plugins

Modified: trunk/Source/WebKit/chromium/WebKit.gyp (100850 => 100851)


--- trunk/Source/WebKit/chromium/WebKit.gyp	2011-11-19 08:09:22 UTC (rev 100850)
+++ trunk/Source/WebKit/chromium/WebKit.gyp	2011-11-19 08:25:10 UTC (rev 100851)
@@ -1236,6 +1236,7 @@
                     ],
                     'dependencies': [
                         '../../_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp:wtf',
+                        '../../WTF/WTF.gyp/WTF.gyp:newwtf',
                     ],
                 }],
                 ['inside_chromium_build==0', {

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to