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

[tkent at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 8ff14f68ef1496700b68612c0fcba6674140dda1
Author: tkent at chromium.org <tkent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 30 07:45:39 2010 +0000

    2010-08-30  Marc-Antoine Ruel  <maruel at chromium.org>
    
            Reviewed by Kent Tamura.
    
            Split webcore_svg off webcore_remaining. webcore_svg contains all svg
            sources files.
            https://bugs.webkit.org/show_bug.cgi?id=44840
    
            * WebCore.gyp/WebCore.gyp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66373 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5df309d..8c6e9fc 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-30  Marc-Antoine Ruel  <maruel at chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        Split webcore_svg off webcore_remaining. webcore_svg contains all svg
+        sources files.
+        https://bugs.webkit.org/show_bug.cgi?id=44840
+
+        * WebCore.gyp/WebCore.gyp:
+
 2010-08-13  MORITA Hajime  <morrita at google.com>
 
         Reviewed by Kent Tamura.
diff --git a/WebCore/WebCore.gyp/WebCore.gyp b/WebCore/WebCore.gyp/WebCore.gyp
index 1402e00..3891283 100644
--- a/WebCore/WebCore.gyp/WebCore.gyp
+++ b/WebCore/WebCore.gyp/WebCore.gyp
@@ -211,6 +211,7 @@
     ],
 
     'conditions': [
+      # TODO(maruel): Move it in its own project or generate it anyway?
       ['enable_svg!=0', {
         'bindings_idl_files': [
           '<@(webcore_svg_bindings_idl_files)',
@@ -367,6 +368,7 @@
             '<@(_inputs)'
           ],
           'conditions': [
+            # TODO(maruel): Move it in its own project or generate it anyway?
             ['enable_svg!=0', {
               'inputs': [
                 '../css/SVGCSSPropertyNames.in',
@@ -392,6 +394,7 @@
             '<@(_inputs)'
           ],
           'conditions': [
+            # TODO(maruel): Move it in its own project or generate it anyway?
             ['enable_svg!=0', {
               'inputs': [
                 '../css/SVGCSSValueKeywords.in',
@@ -771,6 +774,7 @@
             }],
           ],
         }],
+        # TODO(maruel): Move it in its own project or generate it anyway?
         ['enable_svg!=0', {
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/webkit/SVGElementFactory.cpp',
@@ -971,11 +975,27 @@
       ],
     },
     {
-      # TODO: To be the remaining, there must be other sibbling projects.
-      # Will be done in a separate change to keep the diff simpler.
+      'target_name': 'webcore_svg',
+      'type': '<(library)',
+      'dependencies': [
+        'webcore_prerequisites',
+      ],
+      'sources': [
+        '<@(webcore_files)',
+      ],
+      'sources/': [
+        ['exclude', '.*'],
+        ['include', 'svg/'],
+        ['include', 'css/svg/'],
+        ['include', 'rendering/style/SVG'],
+        ['include', 'rendering/RenderSVG'],
+        ['include', 'rendering/SVG'],
+        ['exclude', 'svg/SVGAllInOne\\.cpp$'],
+      ],
+    },
+    {
       'target_name': 'webcore_remaining',
       'type': '<(library)',
-      'msvs_guid': '1C16337B-ACF3-4D03-AA90-851C5B5EADA6',
       'dependencies': [
         'webcore_prerequisites',
       ],
@@ -1018,6 +1038,13 @@
         ['exclude', 'storage/OriginUsageRecord.cpp'],
         ['exclude', 'storage/OriginUsageRecord.h'],
         ['exclude', 'storage/SQLTransactionClient.cpp'],
+
+        # Exclude SVG.
+        ['exclude', 'svg/'],
+        ['exclude', 'css/svg/'],
+        ['exclude', 'rendering/style/SVG'],
+        ['exclude', 'rendering/RenderSVG'],
+        ['exclude', 'rendering/SVG'],
       ],
       'sources!': [
         # A few things can't be excluded by patterns.  List them individually.
@@ -1108,20 +1135,6 @@
         ],
       },
       'conditions': [
-        ['enable_svg!=0', {
-          'sources/': [
-            ['exclude', 'svg/[^/]+\\.cpp$'],
-            ['include', 'svg/SVGAllInOne\\.cpp$'],
-          ],
-        }, {  # svg disabled
-          'sources/': [
-            ['exclude', 'svg/'],
-            ['exclude', 'css/svg/'],
-            ['exclude', 'rendering/style/SVG'],
-            ['exclude', 'rendering/RenderSVG'],
-            ['exclude', 'rendering/SVG'],
-          ],
-        }],
         ['OS=="linux" or OS=="freebsd"', {
           'sources': [
             '../platform/graphics/chromium/VDMXParser.cpp',
@@ -1335,6 +1348,11 @@
             'include_dirs+++': ['../dom'],
           },
         }],
+        ['enable_svg!=0', {
+          'dependencies': [
+            'webcore_svg',
+          ],
+        }],
       ],
     },
   ],  # targets

-- 
WebKit Debian packaging