2010-08-30 Marc-Antoine Ruel <maruel@chromium.org>
authortkent@chromium.org <tkent@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 30 Aug 2010 07:45:39 +0000 (07:45 +0000)
committertkent@chromium.org <tkent@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 30 Aug 2010 07:45:39 +0000 (07:45 +0000)
        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: https://svn.webkit.org/repository/webkit/trunk@66373 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/WebCore.gyp/WebCore.gyp

index 5df309d..8c6e9fc 100644 (file)
@@ -1,3 +1,13 @@
+2010-08-30  Marc-Antoine Ruel  <maruel@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@google.com>
 
         Reviewed by Kent Tamura.
index 1402e00..3891283 100644 (file)
     ],
 
     'conditions': [
+      # TODO(maruel): Move it in its own project or generate it anyway?
       ['enable_svg!=0', {
         'bindings_idl_files': [
           '<@(webcore_svg_bindings_idl_files)',
             '<@(_inputs)'
           ],
           'conditions': [
+            # TODO(maruel): Move it in its own project or generate it anyway?
             ['enable_svg!=0', {
               'inputs': [
                 '../css/SVGCSSPropertyNames.in',
             '<@(_inputs)'
           ],
           'conditions': [
+            # TODO(maruel): Move it in its own project or generate it anyway?
             ['enable_svg!=0', {
               'inputs': [
                 '../css/SVGCSSValueKeywords.in',
             }],
           ],
         }],
+        # TODO(maruel): Move it in its own project or generate it anyway?
         ['enable_svg!=0', {
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/webkit/SVGElementFactory.cpp',
       ],
     },
     {
-      # 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',
       ],
         ['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.
         ],
       },
       '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',
             'include_dirs+++': ['../dom'],
           },
         }],
+        ['enable_svg!=0', {
+          'dependencies': [
+            'webcore_svg',
+          ],
+        }],
       ],
     },
   ],  # targets