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

commit-queue at webkit.org commit-queue at webkit.org
Wed Dec 22 13:53:58 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit b35e3fc788ba3b50d25923b144ad4355ff989e63
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 29 00:44:07 2010 +0000

    2010-09-28  Marc-Antoine Ruel  <maruel at chromium.org>
    
            Reviewed by Tony Chang.
    
            Split webcore_html off webcore_remaining.
    
            webcore_remaining is still too large for certain 32 bits toolsets.
            https://bugs.webkit.org/show_bug.cgi?id=46445
    
            * WebCore.gyp/WebCore.gyp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68615 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 56708ea..9a2c861 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-28  Marc-Antoine Ruel  <maruel at chromium.org>
+
+        Reviewed by Tony Chang.
+
+        Split webcore_html off webcore_remaining.
+
+        webcore_remaining is still too large for certain 32 bits toolsets.
+        https://bugs.webkit.org/show_bug.cgi?id=46445
+
+        * WebCore.gyp/WebCore.gyp:
+
 2010-09-28  Jia Pu  <jpu at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebCore/WebCore.gyp/WebCore.gyp b/WebCore/WebCore.gyp/WebCore.gyp
index e9a9c37..6b13eb5 100644
--- a/WebCore/WebCore.gyp/WebCore.gyp
+++ b/WebCore/WebCore.gyp/WebCore.gyp
@@ -982,6 +982,21 @@
       ],
     },
     {
+      'target_name': 'webcore_html',
+      'type': '<(library)',
+      'dependencies': [
+        'webcore_prerequisites',
+      ],
+      'sources': [
+        '<@(webcore_files)',
+      ],
+      'sources/': [
+        # Start by excluding everything then include html files only.
+        ['exclude', '.*'],
+        ['include', 'html/'],
+      ],
+    },
+    {
       'target_name': 'webcore_svg',
       'type': '<(library)',
       'dependencies': [
@@ -1210,7 +1225,7 @@
         # Exclude things that don't apply to the Chromium platform on the basis
         # of their enclosing directories and tags at the ends of their
         # filenames.
-        ['exclude', '(android|cairo|cf|cg|curl|gtk|haiku|linux|mac|opentype|platform|posix|qt|soup|svg|symbian|win|wx)/'],
+        ['exclude', '(android|cairo|cf|cg|curl|gtk|haiku|html|linux|mac|opentype|platform|posix|qt|soup|svg|symbian|win|wx)/'],
         ['exclude', '(?<!Chromium)(Android|Cairo|CF|CG|Curl|Gtk|Linux|Mac|OpenType|POSIX|Posix|Qt|Safari|Soup|Symbian|Win|Wx)\\.(cpp|mm?)$'],
 
         # Exclude most of SVG except css and javascript bindings.
@@ -1340,6 +1355,7 @@
       'target_name': 'webcore',
       'type': 'none',
       'dependencies': [
+        'webcore_html',
         'webcore_platform',
         'webcore_remaining',
         # Exported.

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list