2011-05-23 Ruben <chromium@hybridsource.org>

Reviewed by Tony Chang. Chromium gyp patch to use new POSIX defines toolkit_uses_gtk and os_posix https://bugs.webkit.org/show_bug.cgi?id=61219 * JavaScriptCore.gyp/JavaScriptCore.gyp: 2011-05-23 Ruben <chromium@hybridsource.org> Reviewed by Tony Chang. Chromium gyp patch to use new POSIX defines toolkit_uses_gtk and os_posix https://bugs.webkit.org/show_bug.cgi?id=61219 No new tests, just changing gyp defines. * WebCore.gyp/WebCore.gyp: 2011-05-23 Ruben <chromium@hybridsource.org> Reviewed by Tony Chang. Chromium gyp patch to use new POSIX defines toolkit_uses_gtk and os_posix https://bugs.webkit.org/show_bug.cgi?id=61219 * WebKit.gyp: * WebKit.gypi: Canonical link: https://commits.webkit.org/76672@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@87089 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · May 23, 2011 · 3814760 · 3814760
1 parent 789a8b9
commit 3814760
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 16 deletions.
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2011-05-23  Ruben  <chromium@hybridsource.org>
+
+        Reviewed by Tony Chang.
+
+        Chromium gyp patch to use new POSIX defines toolkit_uses_gtk and os_posix
+        https://bugs.webkit.org/show_bug.cgi?id=61219
+
+        * JavaScriptCore.gyp/JavaScriptCore.gyp:
+
 2011-05-23  Thouraya ANDOLSI  <thouraya.andolsi@st.com>
 
         Reviewed by Gavin Barraclough.

diff --git a/Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp b/Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
@@ -83,7 +83,7 @@
               'WTF_USE_NEW_THEME=1',
             ],
           }],
-          ['OS=="linux" or OS=="freebsd"', {
+          ['os_posix == 1 and OS != "mac"', {
             'defines': [
               'WTF_USE_PTHREADS=1',
             ],

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2011-05-23  Ruben  <chromium@hybridsource.org>
+
+        Reviewed by Tony Chang.
+
+        Chromium gyp patch to use new POSIX defines toolkit_uses_gtk and os_posix
+        https://bugs.webkit.org/show_bug.cgi?id=61219
+
+        No new tests, just changing gyp defines.
+
+        * WebCore.gyp/WebCore.gyp:
+
 2011-05-23  Abhishek Arya  <inferno@chromium.org>
 
         Reviewed by Simon Fraser.

diff --git a/Source/WebCore/WebCore.gyp/WebCore.gyp b/Source/WebCore/WebCore.gyp/WebCore.gyp
@@ -1084,7 +1084,7 @@
             '<(chromium_src_dir)/gpu/gpu.gyp:gles2_c_lib',
           ],
         }],
-        ['OS=="linux" or OS=="freebsd"', {
+        ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '<(chromium_src_dir)/build/linux/system.gyp:fontconfig',
             '<(chromium_src_dir)/build/linux/system.gyp:gtk',
@@ -1297,7 +1297,7 @@
         ['exclude', 'platform/text/TextEncodingDetectorNone\\.cpp$'],
       ],
       'conditions': [
-        ['OS=="linux" or OS=="freebsd"', {
+        ['toolkit_uses_gtk == 1', {
           'sources/': [
             # Cherry-pick files excluded by the broader regular expressions above.
             ['include', 'platform/chromium/KeyCodeConversionGtk\\.cpp$'],
@@ -1416,7 +1416,7 @@
             ['exclude', 'platform/graphics/FontPlatformData\\.cpp$']
           ],
         }],
-        ['OS!="linux" and OS!="freebsd"', {
+        ['toolkit_uses_gtk == 0', {
           'sources/': [
             ['exclude', '(Gtk|Linux)\\.cpp$'],
             ['exclude', 'Harfbuzz[^/]+\\.(cpp|h)$'],
@@ -1484,12 +1484,12 @@
             ['exclude', 'rendering/RenderThemeChromiumSkia\\.cpp$'],
           ],
         }],
-        ['(OS=="linux" or OS=="freebsd" or OS=="openbsd") and gcc_version==42', {
+        ['os_posix == 1 and OS != "mac" and gcc_version == 42', {
           # Due to a bug in gcc 4.2.1 (the current version on hardy), we get
           # warnings about uninitialized this.
           'cflags': ['-Wno-uninitialized'],
         }],
-        ['OS!="linux" and OS!="freebsd"', {
+        ['toolkit_uses_gtk == 0', {
           'sources/': [
             ['exclude', '(Gtk|Linux)\\.cpp$'],
           ],
@@ -1617,12 +1617,12 @@
             ['include', '/TransparencyWin\\.cpp$'],
           ],
         }],
-        ['(OS=="linux" or OS=="freebsd" or OS=="openbsd") and gcc_version==42', {
+        ['os_posix == 1 and OS != "mac" and gcc_version == 42', {
           # Due to a bug in gcc 4.2.1 (the current version on hardy), we get
           # warnings about uninitialized this.
           'cflags': ['-Wno-uninitialized'],
         }],
-        ['OS!="linux" and OS!="freebsd"', {
+        ['toolkit_uses_gtk == 0', {
           'sources/': [
             ['exclude', '(Gtk|Linux)\\.cpp$'],
           ],

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2011-05-23  Ruben  <chromium@hybridsource.org>
+
+        Reviewed by Tony Chang.
+
+        Chromium gyp patch to use new POSIX defines toolkit_uses_gtk and os_posix
+        https://bugs.webkit.org/show_bug.cgi?id=61219
+
+        * WebKit.gyp:
+        * WebKit.gypi:
+
 2011-05-23  Yury Semikhatsky  <yurys@chromium.org>
 
         Reviewed by Pavel Feldman.

diff --git a/Source/WebKit/chromium/WebKit.gyp b/Source/WebKit/chromium/WebKit.gyp
@@ -650,7 +650,7 @@
                         }],
                     ],
                 }],
-                ['OS=="linux" or OS=="freebsd"', {
+                ['toolkit_uses_gtk == 1', {
                     'dependencies': [
                         '<(chromium_src_dir)/build/linux/system.gyp:fontconfig',
                         '<(chromium_src_dir)/build/linux/system.gyp:gtk',
@@ -661,7 +661,7 @@
                         'public/gtk',
                         'public/linux',
                     ],
-                }, { # else: OS!="linux" and OS!="freebsd"
+                }, { # else: toolkit_uses_gtk != 1
                     'sources/': [
                         ['exclude', '/gtk/'],
                         ['exclude', '/x11/'],
@@ -885,7 +885,7 @@
                         '<@(webkit_unittest_files)',
                     ],
                     'conditions': [
-                        ['OS=="linux" or OS=="freebsd"', {
+                        ['toolkit_uses_gtk == 1', {
                             'include_dirs': [
                                 'public/gtk',
                             ],
@@ -1040,7 +1040,7 @@
                         ['exclude', 'Mac\\.cpp$'],
                     ],
                 }],
-                ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+                ['toolkit_uses_gtk == 1', {
                     'dependencies': [
                         '<(chromium_src_dir)/build/linux/system.gyp:fontconfig',
                         '<(chromium_src_dir)/build/linux/system.gyp:gtk',
@@ -1060,7 +1060,7 @@
                       # FIXME: Enable warnings on other platforms.
                       'chromium_code': 1,
                     },
-                },{ # OS!="linux" and OS!="freebsd" and OS!="openbsd" and OS!="solaris"
+                },{ # toolkit_uses_gtk != 1
                     'sources/': [
                         ['exclude', '(Gtk|Linux)\\.cpp$']
                     ]
@@ -1113,7 +1113,7 @@
                         'INFOPLIST_FILE': '../../../Tools/DumpRenderTree/TestNetscapePlugIn/mac/Info.plist',
                     },
                 }],
-                ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+                ['os_posix == 1 and OS != "mac"', {
                     'cflags': [
                         '-fvisibility=default',
                     ],
@@ -1153,7 +1153,7 @@
                         'files': ['<(PRODUCT_DIR)/TestNetscapePlugIn.plugin/'],
                     }],
                 }],
-                ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+                ['os_posix == 1 and OS != "mac"', {
                     'copies': [{
                         'destination': '<(PRODUCT_DIR)/plugins',
                         'files': ['<(PRODUCT_DIR)/libTestNetscapePlugIn.so'],

diff --git a/Source/WebKit/chromium/WebKit.gypi b/Source/WebKit/chromium/WebKit.gypi
@@ -84,7 +84,7 @@
                     'tests/WebPageSerializerTest.cpp',
                 ],
             }],
-            ['OS=="linux" or OS=="freebsd"', {
+            ['toolkit_uses_gtk == 1', {
                 'webkit_unittest_files': [
                     # FIXME: Port DragImageTest to Mac.
                     'tests/DragImageTest.cpp',