[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit a6d8e05baea711b4a87594cc16ea579ad80ab078
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 28 08:31:10 2010 +0000

    2010-08-28  Marc-Antoine Ruel  <maruel at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            Preparatory patch to split libwebcore in multiple libraries.
    
            Start with a webcore_prerequisites pseudo-target what will be the common
            target for all the other ones.
    
            * WebCore.gyp/WebCore.gyp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66302 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4ea5303..7bb8ce1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-28  Marc-Antoine Ruel  <maruel at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Preparatory patch to split libwebcore in multiple libraries.
+
+        Start with a webcore_prerequisites pseudo-target what will be the common
+        target for all the other ones.
+
+        * WebCore.gyp/WebCore.gyp:
+
 2010-08-28  Pratik Solanki  <psolanki at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebCore/WebCore.gyp/WebCore.gyp b/WebCore/WebCore.gyp/WebCore.gyp
index 4a6af45..800c641 100644
--- a/WebCore/WebCore.gyp/WebCore.gyp
+++ b/WebCore/WebCore.gyp/WebCore.gyp
@@ -811,9 +811,10 @@
       ],
     },
     {
-      'target_name': 'webcore',
-      'type': '<(library)',
-      'msvs_guid': '1C16337B-ACF3-4D03-AA90-851C5B5EADA6',
+      # We'll soon split libwebcore in multiple smaller libraries.
+      # webcore_prerequisites will be the 'base' target of every sub-target.
+      'target_name': 'webcore_prerequisites',
+      'type': 'none',
       'dependencies': [
         'webcore_bindings',
         '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:pcre',
@@ -829,14 +830,45 @@
         '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite',
         '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_common',
       ],
-      'defines': [
-        'WEBCORE_NAVIGATOR_VENDOR="Google Inc."',
+      'export_dependent_settings': [
+        'webcore_bindings',
+        '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:pcre',
+        '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf',
+        '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
+        '<(chromium_src_dir)/skia/skia.gyp:skia',
+        '<(chromium_src_dir)/third_party/libjpeg/libjpeg.gyp:libjpeg',
+        '<(chromium_src_dir)/third_party/libpng/libpng.gyp:libpng',
+        '<(chromium_src_dir)/third_party/libxml/libxml.gyp:libxml',
+        '<(chromium_src_dir)/third_party/libxslt/libxslt.gyp:libxslt',
+        '<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
+        '<(chromium_src_dir)/third_party/ots/ots.gyp:ots',
+        '<(chromium_src_dir)/third_party/sqlite/sqlite.gyp:sqlite',
+        '<(chromium_src_dir)/third_party/angle/src/build_angle.gyp:translator_common',
       ],
-      'include_dirs': [
-        '<(INTERMEDIATE_DIR)',
-        '<@(webcore_include_dirs)',
-        '<(chromium_src_dir)/gpu',
-        '<(chromium_src_dir)/third_party/angle/include/GLSLANG',
+      'direct_dependent_settings': {
+        'defines': [
+          'WEBCORE_NAVIGATOR_VENDOR="Google Inc."',
+        ],
+        'include_dirs': [
+          '<(INTERMEDIATE_DIR)',
+          '<@(webcore_include_dirs)',
+          '<(chromium_src_dir)/gpu',
+          '<(chromium_src_dir)/third_party/angle/include/GLSLANG',
+        ],
+      },
+    },
+    {
+      'target_name': 'webcore',
+      'type': '<(library)',
+      'msvs_guid': '1C16337B-ACF3-4D03-AA90-851C5B5EADA6',
+      'dependencies': [
+        'webcore_prerequisites',
+        # Exported.
+        'webcore_bindings',
+        '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:wtf',
+        '<(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',
       ],
       'sources': [
         '<@(webcore_files)',

-- 
WebKit Debian packaging