[webkit-changes] [146680] trunk/Source

Fri, 22 Mar 2013 16:45:37 -0700

Title: [146680] trunk/Source
Revision
146680
Author
[email protected]
Date
2013-03-22 16:47:27 -0700 (Fri, 22 Mar 2013)

Log Message

[GTK] Add WebCoreHTML to the gyp build
https://bugs.webkit.org/show_bug.cgi?id=112727

Reviewed by Nico Weber.

* WebCore.gyp/WebCoreGTK.gyp: Add support for building all files under
the HTML directory. This includes splitting off common WebCore dependencies
into an aggregate target and adding a top-level WebCore target.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (146679 => 146680)


--- trunk/Source/WebCore/ChangeLog	2013-03-22 23:43:21 UTC (rev 146679)
+++ trunk/Source/WebCore/ChangeLog	2013-03-22 23:47:27 UTC (rev 146680)
@@ -1,3 +1,14 @@
+2013-03-19  Martin Robinson  <[email protected]>
+
+        [GTK] Add WebCoreHTML to the gyp build
+        https://bugs.webkit.org/show_bug.cgi?id=112727
+
+        Reviewed by Nico Weber.
+
+        * WebCore.gyp/WebCoreGTK.gyp: Add support for building all files under
+        the HTML directory. This includes splitting off common WebCore dependencies
+        into an aggregate target and adding a top-level WebCore target.
+
 2013-03-22  Tim Horton  <[email protected]>
 
         Plugin Snapshotting: Auto-start dominant plugins

Modified: trunk/Source/WebCore/WebCore.gyp/WebCoreGTK.gyp (146679 => 146680)


--- trunk/Source/WebCore/WebCore.gyp/WebCoreGTK.gyp	2013-03-22 23:43:21 UTC (rev 146679)
+++ trunk/Source/WebCore/WebCore.gyp/WebCoreGTK.gyp	2013-03-22 23:47:27 UTC (rev 146680)
@@ -93,6 +93,39 @@
 
   'targets': [
     {
+      'target_name': 'WebCoreDependencies',
+      'type': 'none',
+      'dependencies': [
+        '<(Dependencies):cairo',
+        '<(Dependencies):freetype',
+        '<(Dependencies):gail',
+        '<(Dependencies):glib',
+        '<(Dependencies):gstreamer',
+        '<(Dependencies):gtk',
+        '<(Dependencies):icu',
+        '<(Dependencies):libsoup',
+        '<(Dependencies):libsecret',
+        '<(Source)/_javascript_Core/_javascript_Core.gyp/_javascript_CoreGTK.gyp:libjavascriptcoregtk',
+        '<(Source)/WTF/WTF.gyp/WTFGTK.gyp:wtf',
+        '<(Source)/ThirdParty/ANGLE/ANGLE.gyp/ANGLE.gyp:angle',
+        'WebCoreBindingsSources',
+      ],
+      'export_dependent_settings': [
+        '<(Dependencies):cairo',
+        '<(Dependencies):freetype',
+        '<(Dependencies):gail',
+        '<(Dependencies):glib',
+        '<(Dependencies):gstreamer',
+        '<(Dependencies):gtk',
+        '<(Dependencies):icu',
+        '<(Dependencies):libsoup',
+        '<(Dependencies):libsecret',
+        '<(Source)/_javascript_Core/_javascript_Core.gyp/_javascript_CoreGTK.gyp:libjavascriptcoregtk',
+        '<(Source)/WTF/WTF.gyp/WTFGTK.gyp:wtf',
+        '<(Source)/ThirdParty/ANGLE/ANGLE.gyp/ANGLE.gyp:angle',
+      ],
+    },
+    {
       'target_name': 'InspectorProtocolSources',
       'type': 'none',
       'dependencies': [
@@ -741,31 +774,13 @@
       'type': 'static_library',
       'hard_dependency': 1,
       'dependencies': [
-        '<(Dependencies):glib',
-        '<(Dependencies):icu',
-        '<(Dependencies):libsoup',
-        '<(Dependencies):cairo',
-        '<(Dependencies):freetype',
-        'WebCoreBindingsSources',
+        'WebCoreDependencies',
         'InjectedScriptSource',
         'InjectedScriptCanvasModuleSource',
         'InspectorOverlayPage',
         'InspectorProtocolSources',
-        '<(Source)/_javascript_Core/_javascript_Core.gyp/_javascript_CoreGTK.gyp:libjavascriptcoregtk',
-        '<(Source)/WTF/WTF.gyp/WTFGTK.gyp:wtf',
-        '<(Source)/ThirdParty/ANGLE/ANGLE.gyp/ANGLE.gyp:angle',
       ],
-      'include_dirs': [
-        '<@(webcoregtk_include_dirs)',
-        '<(webcore_derived_sources_directory)',
-        '<(webcore_derived_sources_directory)/bindings',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(SHARED_INTERMEDIATE_DIR)/WebCore',
-          '<(SHARED_INTERMEDIATE_DIR)/WebCore/bindings',
-        ],
-      },
+      'include_dirs': [ '<@(webcoregtk_include_dirs)', ],
       'sources': [
         '<@(webcore_derived_source_files)',
       ],
@@ -780,7 +795,24 @@
         }],
       ],
     },
-
+    {
+      'target_name': 'WebCoreHTML',
+      'type': 'static_library',
+      'dependencies': [ 'WebCoreDependencies', ],
+      'include_dirs': [ '<@(webcoregtk_include_dirs)', ],
+      'sources': [ '<@(webcore_html_files)', ],
+      'sources/': [
+        ['exclude', 'AllInOne\\.cpp$'],
+        ['exclude', 'Android\\.cpp$'],
+      ],
+    },
+    {
+      'target_name': 'WebCore',
+      'type': 'none',
+      'dependencies': [ 
+        'WebCoreHTML',
+        'WebCoreBindings',
+      ],
+    },
   ],
 }
-

Modified: trunk/Source/WebKit/gtk/gyp/Dependencies.gyp (146679 => 146680)


--- trunk/Source/WebKit/gtk/gyp/Dependencies.gyp	2013-03-22 23:43:21 UTC (rev 146679)
+++ trunk/Source/WebKit/gtk/gyp/Dependencies.gyp	2013-03-22 23:47:27 UTC (rev 146680)
@@ -90,6 +90,16 @@
       },
     },
     {
+      'target_name': 'gstreamer',
+      'type': 'none',
+      'direct_dependent_settings': {
+        'cflags': [ '<@(GSTREAMER_CFLAGS)' ],
+        'link_settings': {
+          'libraries' : [ '<@(GSTREAMER_LIBS)' ],
+        },
+      },
+    },
+    {
       'target_name': 'gtk2',
       'type': 'none',
       'direct_dependent_settings': {

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

Reply via email to