Changeset 87089 in webkit
- Timestamp:
- May 23, 2011 12:05:57 PM (13 years ago)
- Location:
- trunk/Source
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r87076 r87089 1 2011-05-23 Ruben <chromium@hybridsource.org> 2 3 Reviewed by Tony Chang. 4 5 Chromium gyp patch to use new POSIX defines toolkit_uses_gtk and os_posix 6 https://bugs.webkit.org/show_bug.cgi?id=61219 7 8 * JavaScriptCore.gyp/JavaScriptCore.gyp: 9 1 10 2011-05-23 Thouraya ANDOLSI <thouraya.andolsi@st.com> 2 11 -
trunk/Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
r86965 r87089 84 84 ], 85 85 }], 86 [' OS=="linux" or OS=="freebsd"', {86 ['os_posix == 1 and OS != "mac"', { 87 87 'defines': [ 88 88 'WTF_USE_PTHREADS=1', -
trunk/Source/WebCore/ChangeLog
r87083 r87089 1 2011-05-23 Ruben <chromium@hybridsource.org> 2 3 Reviewed by Tony Chang. 4 5 Chromium gyp patch to use new POSIX defines toolkit_uses_gtk and os_posix 6 https://bugs.webkit.org/show_bug.cgi?id=61219 7 8 No new tests, just changing gyp defines. 9 10 * WebCore.gyp/WebCore.gyp: 11 1 12 2011-05-23 Abhishek Arya <inferno@chromium.org> 2 13 -
trunk/Source/WebCore/WebCore.gyp/WebCore.gyp
r86965 r87089 1085 1085 ], 1086 1086 }], 1087 [' OS=="linux" or OS=="freebsd"', {1087 ['toolkit_uses_gtk == 1', { 1088 1088 'dependencies': [ 1089 1089 '<(chromium_src_dir)/build/linux/system.gyp:fontconfig', … … 1298 1298 ], 1299 1299 'conditions': [ 1300 [' OS=="linux" or OS=="freebsd"', {1300 ['toolkit_uses_gtk == 1', { 1301 1301 'sources/': [ 1302 1302 # Cherry-pick files excluded by the broader regular expressions above. … … 1417 1417 ], 1418 1418 }], 1419 [' OS!="linux" and OS!="freebsd"', {1419 ['toolkit_uses_gtk == 0', { 1420 1420 'sources/': [ 1421 1421 ['exclude', '(Gtk|Linux)\\.cpp$'], … … 1485 1485 ], 1486 1486 }], 1487 [' (OS=="linux" or OS=="freebsd" or OS=="openbsd") and gcc_version==42', {1487 ['os_posix == 1 and OS != "mac" and gcc_version == 42', { 1488 1488 # Due to a bug in gcc 4.2.1 (the current version on hardy), we get 1489 1489 # warnings about uninitialized this. 1490 1490 'cflags': ['-Wno-uninitialized'], 1491 1491 }], 1492 [' OS!="linux" and OS!="freebsd"', {1492 ['toolkit_uses_gtk == 0', { 1493 1493 'sources/': [ 1494 1494 ['exclude', '(Gtk|Linux)\\.cpp$'], … … 1618 1618 ], 1619 1619 }], 1620 [' (OS=="linux" or OS=="freebsd" or OS=="openbsd") and gcc_version==42', {1620 ['os_posix == 1 and OS != "mac" and gcc_version == 42', { 1621 1621 # Due to a bug in gcc 4.2.1 (the current version on hardy), we get 1622 1622 # warnings about uninitialized this. 1623 1623 'cflags': ['-Wno-uninitialized'], 1624 1624 }], 1625 [' OS!="linux" and OS!="freebsd"', {1625 ['toolkit_uses_gtk == 0', { 1626 1626 'sources/': [ 1627 1627 ['exclude', '(Gtk|Linux)\\.cpp$'], -
trunk/Source/WebKit/chromium/ChangeLog
r87074 r87089 1 2011-05-23 Ruben <chromium@hybridsource.org> 2 3 Reviewed by Tony Chang. 4 5 Chromium gyp patch to use new POSIX defines toolkit_uses_gtk and os_posix 6 https://bugs.webkit.org/show_bug.cgi?id=61219 7 8 * WebKit.gyp: 9 * WebKit.gypi: 10 1 11 2011-05-23 Yury Semikhatsky <yurys@chromium.org> 2 12 -
trunk/Source/WebKit/chromium/WebKit.gyp
r86965 r87089 651 651 ], 652 652 }], 653 [' OS=="linux" or OS=="freebsd"', {653 ['toolkit_uses_gtk == 1', { 654 654 'dependencies': [ 655 655 '<(chromium_src_dir)/build/linux/system.gyp:fontconfig', … … 662 662 'public/linux', 663 663 ], 664 }, { # else: OS!="linux" and OS!="freebsd"664 }, { # else: toolkit_uses_gtk != 1 665 665 'sources/': [ 666 666 ['exclude', '/gtk/'], … … 886 886 ], 887 887 'conditions': [ 888 [' OS=="linux" or OS=="freebsd"', {888 ['toolkit_uses_gtk == 1', { 889 889 'include_dirs': [ 890 890 'public/gtk', … … 1041 1041 ], 1042 1042 }], 1043 [' OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {1043 ['toolkit_uses_gtk == 1', { 1044 1044 'dependencies': [ 1045 1045 '<(chromium_src_dir)/build/linux/system.gyp:fontconfig', … … 1061 1061 'chromium_code': 1, 1062 1062 }, 1063 },{ # OS!="linux" and OS!="freebsd" and OS!="openbsd" and OS!="solaris"1063 },{ # toolkit_uses_gtk != 1 1064 1064 'sources/': [ 1065 1065 ['exclude', '(Gtk|Linux)\\.cpp$'] … … 1114 1114 }, 1115 1115 }], 1116 [' OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {1116 ['os_posix == 1 and OS != "mac"', { 1117 1117 'cflags': [ 1118 1118 '-fvisibility=default', … … 1154 1154 }], 1155 1155 }], 1156 [' OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {1156 ['os_posix == 1 and OS != "mac"', { 1157 1157 'copies': [{ 1158 1158 'destination': '<(PRODUCT_DIR)/plugins', -
trunk/Source/WebKit/chromium/WebKit.gypi
r87015 r87089 85 85 ], 86 86 }], 87 [' OS=="linux" or OS=="freebsd"', {87 ['toolkit_uses_gtk == 1', { 88 88 'webkit_unittest_files': [ 89 89 # FIXME: Port DragImageTest to Mac.
Note: See TracChangeset
for help on using the changeset viewer.