Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (111790 => 111791)
--- trunk/Source/_javascript_Core/ChangeLog 2012-03-23 00:17:37 UTC (rev 111790)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-03-23 00:18:56 UTC (rev 111791)
@@ -1,3 +1,11 @@
+2012-03-22 Tony Chang <t...@chromium.org>
+
+ Unreviewed, fix chromium build after wtf move.
+
+ Remove old wtf_config and wtf targets.
+
+ * _javascript_Core.gyp/_javascript_Core.gyp:
+
2012-03-22 Martin Robinson <mrobin...@igalia.com>
Fixed the GTK+ WTF/_javascript_Core build after r111778.
Modified: trunk/Source/_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp (111790 => 111791)
--- trunk/Source/_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp 2012-03-23 00:17:37 UTC (rev 111790)
+++ trunk/Source/_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp 2012-03-23 00:18:56 UTC (rev 111791)
@@ -57,146 +57,9 @@
],
'targets': [
{
- # This target sets up defines and includes that are required by WTF and
- # its dependents.
- 'target_name': 'wtf_config',
- 'type': 'none',
- 'direct_dependent_settings': {
- 'defines': [
- # Import features_defines from features.gypi
- '<@(feature_defines)',
-
- # Turns on #if PLATFORM(CHROMIUM)
- 'BUILDING_CHROMIUM__=1',
- # Controls wtf/FastMalloc
- # FIXME: consider moving into config.h
- 'USE_SYSTEM_MALLOC=1',
- ],
- 'conditions': [
- ['OS=="win"', {
- 'defines': [
- '__STD_C',
- '_CRT_SECURE_NO_DEPRECATE',
- '_SCL_SECURE_NO_DEPRECATE',
- 'CRASH=__debugbreak',
- ],
- 'include_dirs': [
- '../os-win32',
- ],
- }],
- ['OS=="mac"', {
- 'defines': [
- # Use USE_NEW_THEME on Mac.
- 'WTF_USE_NEW_THEME=1',
- ],
- }],
- ['os_posix == 1 and OS != "mac"', {
- 'defines': [
- 'WTF_USE_PTHREADS=1',
- ],
- }],
- ],
- }
- },
- {
- 'target_name': 'wtf',
- 'type': 'static_library',
- 'variables': { 'optimize': 'max' },
- 'dependencies': [
- 'wtf_config',
- '<(chromium_src_dir)/third_party/icu/icu.gyp:icui18n',
- '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
- '../../WTF/WTF.gyp/WTF.gyp:newwtf',
- ],
- 'include_dirs': [
- '../',
- '../wtf', # Some .cpp expect #include "Assertions.h", etc. to work.
- '../wtf/unicode', # Likewise some expect #include "Collator.h" to work.
- ],
- 'sources': [
- '<@(_javascript_core_publicheader_files)',
- '<@(_javascript_core_privateheader_files)',
- '<@(_javascript_core_files)',
- ],
- 'sources/': [
- # First exclude everything ...
- ['exclude', '../'],
- # ... Then include what we want.
- ['include', '../wtf/'],
- # FIXME: This is clearly not sustainable.
- ['exclude', '../wtf/efl'],
- ['exclude', '../wtf/gobject'],
- ['exclude', '../wtf/gtk'],
- ['exclude', '../wtf/mac'],
- ['exclude', '../wtf/qt'],
- ['exclude', '../wtf/url'],
- ['exclude', '../wtf/wince'],
- ['exclude', '../wtf/wx'],
- ['exclude', '../wtf/unicode/wince'],
- ['exclude', '../wtf/unicode/glib'],
- ['exclude', '../wtf/unicode/qt4'],
- # GLib/GTK, even though its name doesn't really indicate.
- ['exclude', '/(gtk|glib|gobject)/.*\\.(cpp|h)$'],
- ['exclude', '(Default|Gtk|Mac|None|Qt|Win|Wx|Efl|Symbian)\\.(cpp|mm)$'],
- ['exclude', 'wtf/CurrentTime\\.cpp$'],
- ['exclude', 'wtf/OSRandomSource\\.cpp$'],
- ['exclude', 'wtf/MainThread.cpp$'],
- ['exclude', 'wtf/TC.*\\.(cpp|h)$'],
- ],
- 'direct_dependent_settings': {
- 'include_dirs': [
- '../',
- ],
- # Some warnings occur in JSC headers, so they must also be disabled
- # in targets that use JSC.
- 'msvs_disabled_warnings': [
- # Don't complain about calling specific versions of templatized
- # functions (e.g. in RefPtrHashMap.h).
- 4344,
- # Don't complain about using "this" in an initializer list
- # (e.g. in StringImpl.h).
- 4355,
- ],
- },
- 'export_dependent_settings': [
- 'wtf_config',
- '<(chromium_src_dir)/third_party/icu/icu.gyp:icui18n',
- '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
- ],
- 'msvs_disabled_warnings': [4127, 4355, 4510, 4512, 4610, 4706],
- 'conditions': [
- ['OS=="win"', {
- 'sources/': [
- ['exclude', 'ThreadIdentifierDataPthreads\\.(h|cpp)$'],
- ['exclude', 'ThreadingPthreads\\.cpp$'],
- ['include', 'Thread(ing|Specific)Win\\.cpp$'],
- ['exclude', 'OSAllocatorPosix\\.cpp$'],
- ['include', 'OSAllocatorWin\\.cpp$'],
- ['include', 'win/OwnPtrWin\\.cpp$'],
- ],
- 'include_dirs!': [
- '<(SHARED_INTERMEDIATE_DIR)/webkit',
- ],
- 'conditions': [
- ['inside_chromium_build==1 and component=="shared_library"', {
- # Chromium windows multi-dll build enables c++ exception and this
- # causes wtf generates 4291 warning due to operator new/delete
- # implementations. Disable the warning for chromium windows
- # multi-dll build.
- 'msvs_disabled_warnings': [4291],
- 'direct_dependent_settings': {
- 'msvs_disabled_warnings': [4291],
- },
- }],
- ],
- }],
- ],
- },
- {
'target_name': 'yarr',
'type': 'static_library',
'dependencies': [
- 'wtf',
'../../WTF/WTF.gyp/WTF.gyp:newwtf',
],
'variables': { 'optimize': 'max' },
@@ -217,6 +80,7 @@
],
'include_dirs': [
'<(INTERMEDIATE_DIR)',
+ '..',
'../runtime',
],
'sources': [
@@ -231,7 +95,7 @@
['exclude', '../yarr/YarrJIT\\.(h|cpp)$'],
],
'export_dependent_settings': [
- 'wtf',
+ '../../WTF/WTF.gyp/WTF.gyp:newwtf',
],
},
], # targets
Modified: trunk/Source/Platform/ChangeLog (111790 => 111791)
--- trunk/Source/Platform/ChangeLog 2012-03-23 00:17:37 UTC (rev 111790)
+++ trunk/Source/Platform/ChangeLog 2012-03-23 00:18:56 UTC (rev 111791)
@@ -1,3 +1,11 @@
+2012-03-22 Tony Chang <t...@chromium.org>
+
+ Unreviewed, fix chromium build after wtf move.
+
+ Only use newwtf, remove references to wtf.
+
+ * Platform.gyp/Platform.gyp:
+
2012-03-21 Ryosuke Niwa <rn...@webkit.org>
Touch a file to make Chromium Windows bots happy.
Modified: trunk/Source/Platform/Platform.gyp/Platform.gyp (111790 => 111791)
--- trunk/Source/Platform/Platform.gyp/Platform.gyp 2012-03-23 00:17:37 UTC (rev 111790)
+++ trunk/Source/Platform/Platform.gyp/Platform.gyp 2012-03-23 00:18:56 UTC (rev 111791)
@@ -38,7 +38,6 @@
'target_name': 'webkit_platform',
'type': 'static_library',
'dependencies': [
- '../../_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp:wtf',
'../../WTF/WTF.gyp/WTF.gyp:newwtf',
],
'include_dirs': [
Modified: trunk/Source/WTF/ChangeLog (111790 => 111791)
--- trunk/Source/WTF/ChangeLog 2012-03-23 00:17:37 UTC (rev 111790)
+++ trunk/Source/WTF/ChangeLog 2012-03-23 00:18:56 UTC (rev 111791)
@@ -1,3 +1,11 @@
+2012-03-22 Tony Chang <t...@chromium.org>
+
+ Unreviewed, fix chromium build after wtf move.
+
+ Move wtf_config and wtf settings to newwtf.
+
+ * WTF.gyp/WTF.gyp:
+
2012-03-22 Martin Robinson <mrobin...@igalia.com>
One more GTK+ build fix after r111778.
Modified: trunk/Source/WTF/WTF.gyp/WTF.gyp (111790 => 111791)
--- trunk/Source/WTF/WTF.gyp/WTF.gyp 2012-03-23 00:17:37 UTC (rev 111790)
+++ trunk/Source/WTF/WTF.gyp/WTF.gyp 2012-03-23 00:18:56 UTC (rev 111791)
@@ -31,27 +31,163 @@
'../../WebKit/chromium/features.gypi',
'../WTF.gypi',
],
- 'targets': [{
- 'target_name': 'newwtf',
- 'type': 'static_library',
- 'include_dirs': [
- '../',
+ 'variables': {
+ # Location of the chromium src directory.
+ 'conditions': [
+ ['inside_chromium_build==0', {
+ # Webkit is being built outside of the full chromium project.
+ 'chromium_src_dir': '../../WebKit/chromium',
+ },{
+ # WebKit is checked out in src/chromium/third_party/WebKit
+ 'chromium_src_dir': '../../../../..',
+ }],
],
- 'sources': [
- '<@(wtf_privateheader_files)',
- '<@(wtf_files)',
- ],
- 'direct_dependent_settings': {
+ },
+ 'conditions': [
+ ['os_posix == 1 and OS != "mac" and OS != "android" and gcc_version==46', {
+ 'target_defaults': {
+ # Disable warnings about c++0x compatibility, as some names (such as nullptr) conflict
+ # with upcoming c++0x types.
+ 'cflags_cc': ['-Wno-c++0x-compat'],
+ },
+ }],
+ ],
+ 'targets': [
+ {
+ # This target sets up defines and includes that are required by WTF and
+ # its dependents.
+ 'target_name': 'wtf_config',
+ 'type': 'none',
+ 'direct_dependent_settings': {
+ 'defines': [
+ # Import features_defines from features.gypi
+ '<@(feature_defines)',
+
+ # Turns on #if PLATFORM(CHROMIUM)
+ 'BUILDING_CHROMIUM__=1',
+ # Controls wtf/FastMalloc
+ # FIXME: consider moving into config.h
+ 'USE_SYSTEM_MALLOC=1',
+ ],
+ 'conditions': [
+ ['OS=="win"', {
+ 'defines': [
+ '__STD_C',
+ '_CRT_SECURE_NO_DEPRECATE',
+ '_SCL_SECURE_NO_DEPRECATE',
+ 'CRASH=__debugbreak',
+ ],
+ 'include_dirs': [
+ '../os-win32',
+ ],
+ }],
+ ['OS=="mac"', {
+ 'defines': [
+ # Use USE_NEW_THEME on Mac.
+ 'WTF_USE_NEW_THEME=1',
+ ],
+ }],
+ ['os_posix == 1 and OS != "mac"', {
+ 'defines': [
+ 'WTF_USE_PTHREADS=1',
+ ],
+ }],
+ ],
+ }
+ },
+ {
+ 'target_name': 'newwtf',
+ 'type': 'static_library',
'include_dirs': [
'../',
+ '../../_javascript_Core', # FIXME: This is too broad, but matches the rules when wtf lived in _javascript_Core.
+ '../wtf',
+ '../wtf/unicode',
],
+ 'dependencies': [
+ 'wtf_config',
+ '<(chromium_src_dir)/third_party/icu/icu.gyp:icui18n',
+ '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
+ ],
+ 'sources': [
+ '<@(wtf_privateheader_files)',
+ '<@(wtf_files)',
+ ],
+ 'sources/': [
+ # FIXME: This is clearly not sustainable.
+ ['exclude', '../wtf/efl'],
+ ['exclude', '../wtf/gobject'],
+ ['exclude', '../wtf/gtk'],
+ ['exclude', '../wtf/mac'],
+ ['exclude', '../wtf/qt'],
+ ['exclude', '../wtf/url'],
+ ['exclude', '../wtf/wince'],
+ ['exclude', '../wtf/wx'],
+ ['exclude', '../wtf/unicode/wince'],
+ ['exclude', '../wtf/unicode/glib'],
+ ['exclude', '../wtf/unicode/qt4'],
+ # GLib/GTK, even though its name doesn't really indicate.
+ ['exclude', '/(gtk|glib|gobject)/.*\\.(cpp|h)$'],
+ ['exclude', '(Default|Gtk|Mac|None|Qt|Win|Wx|Efl|Symbian)\\.(cpp|mm)$'],
+ ['exclude', 'wtf/CurrentTime\\.cpp$'],
+ ['exclude', 'wtf/OSRandomSource\\.cpp$'],
+ ['exclude', 'wtf/MainThread.cpp$'],
+ ['exclude', 'wtf/TC.*\\.(cpp|h)$'],
+ ],
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '../',
+ '../../_javascript_Core',
+ ],
+ # Some warnings occur in JSC headers, so they must also be disabled
+ # in targets that use JSC.
+ 'msvs_disabled_warnings': [
+ # Don't complain about calling specific versions of templatized
+ # functions (e.g. in RefPtrHashMap.h).
+ 4344,
+ # Don't complain about using "this" in an initializer list
+ # (e.g. in StringImpl.h).
+ 4355,
+ ],
+ },
+ 'export_dependent_settings': [
+ 'wtf_config',
+ '<(chromium_src_dir)/third_party/icu/icu.gyp:icui18n',
+ '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
+ ],
+ 'msvs_disabled_warnings': [4127, 4355, 4510, 4512, 4610, 4706],
+ 'conditions': [
+ ['OS=="win"', {
+ 'sources/': [
+ ['exclude', 'ThreadIdentifierDataPthreads\\.(h|cpp)$'],
+ ['exclude', 'ThreadingPthreads\\.cpp$'],
+ ['include', 'Thread(ing|Specific)Win\\.cpp$'],
+ ['exclude', 'OSAllocatorPosix\\.cpp$'],
+ ['include', 'OSAllocatorWin\\.cpp$'],
+ ['include', 'win/OwnPtrWin\\.cpp$'],
+ ],
+ 'include_dirs!': [
+ '<(SHARED_INTERMEDIATE_DIR)/webkit',
+ ],
+ 'conditions': [
+ ['inside_chromium_build==1 and component=="shared_library"', {
+ # Chromium windows multi-dll build enables c++ exception and this
+ # causes wtf generates 4291 warning due to operator new/delete
+ # implementations. Disable the warning for chromium windows
+ # multi-dll build.
+ 'msvs_disabled_warnings': [4291],
+ 'direct_dependent_settings': {
+ 'msvs_disabled_warnings': [4291],
+ },
+ }],
+ ],
+ }],
+ ['OS=="android"', {
+ # Android builds ImageDiff for host, which has a dependency on newwtf
+ # so needs to be able to build this target for host as well.
+ 'toolsets': ['host', 'target'],
+ }],
+ ],
},
- 'conditions': [
- ['OS=="android"', {
- # Android builds ImageDiff for host, which has a dependency on newwtf
- # so needs to be able to build this target for host as well.
- 'toolsets': ['host', 'target'],
- }],
- ],
- }]
+ ]
}
Modified: trunk/Source/WebCore/ChangeLog (111790 => 111791)
--- trunk/Source/WebCore/ChangeLog 2012-03-23 00:17:37 UTC (rev 111790)
+++ trunk/Source/WebCore/ChangeLog 2012-03-23 00:18:56 UTC (rev 111791)
@@ -1,3 +1,11 @@
+2012-03-22 Tony Chang <t...@chromium.org>
+
+ Unreviewed, fix chromium build after wtf move.
+
+ Only use newwtf, remove references to wtf.
+
+ * WebCore.gyp/WebCore.gyp:
+
2012-03-22 Benjamin Poulain <bpoul...@apple.com>
Remove an obsolete comment regarding magic frames from Geolocation
Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (111790 => 111791)
--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-03-23 00:17:37 UTC (rev 111790)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-03-23 00:18:56 UTC (rev 111791)
@@ -1034,7 +1034,6 @@
'injected_script_source',
'debugger_script_source',
'../../_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp:yarr',
- '../../_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp:wtf',
'../../WTF/WTF.gyp/WTF.gyp:newwtf',
'<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
'<(chromium_src_dir)/skia/skia.gyp:skia',
@@ -1154,7 +1153,6 @@
'webcore_bindings_sources',
'../../ThirdParty/glu/glu.gyp:libtess',
'../../_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp:yarr',
- '../../_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp:wtf',
'../../WTF/WTF.gyp/WTF.gyp:newwtf',
'<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
'<(chromium_src_dir)/skia/skia.gyp:skia',
@@ -1173,7 +1171,6 @@
],
'export_dependent_settings': [
'../../_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp:yarr',
- '../../_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp:wtf',
'../../WTF/WTF.gyp/WTF.gyp:newwtf',
'<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
'<(chromium_src_dir)/skia/skia.gyp:skia',
@@ -1917,7 +1914,6 @@
'webcore_rendering',
# Exported.
'webcore_bindings',
- '../../_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp:wtf',
'../../WTF/WTF.gyp/WTF.gyp:newwtf',
'<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
'<(chromium_src_dir)/skia/skia.gyp:skia',
@@ -1926,7 +1922,6 @@
],
'export_dependent_settings': [
'webcore_bindings',
- '../../_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp:wtf',
'../../WTF/WTF.gyp/WTF.gyp:newwtf',
'<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
'<(chromium_src_dir)/skia/skia.gyp:skia',
Modified: trunk/Tools/ChangeLog (111790 => 111791)
--- trunk/Tools/ChangeLog 2012-03-23 00:17:37 UTC (rev 111790)
+++ trunk/Tools/ChangeLog 2012-03-23 00:18:56 UTC (rev 111791)
@@ -1,3 +1,11 @@
+2012-03-22 Tony Chang <t...@chromium.org>
+
+ Unreviewed, fix chromium build after wtf move.
+
+ Only use newwtf, remove references to wtf.
+
+ * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
+
2012-03-22 Csaba Osztrogonác <o...@webkit.org>
Actually move WTF files to their new home
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp (111790 => 111791)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2012-03-23 00:17:37 UTC (rev 111790)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2012-03-23 00:18:56 UTC (rev 111791)
@@ -78,7 +78,6 @@
'dependencies': [
'<(source_dir)/WebKit/chromium/WebKit.gyp:inspector_resources',
'<(source_dir)/WebKit/chromium/WebKit.gyp:webkit',
- '<(source_dir)/_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp:wtf_config',
'<(source_dir)/WTF/WTF.gyp/WTF.gyp:newwtf',
'<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
'<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
@@ -254,7 +253,6 @@
'<(source_dir)/WebKit/chromium/public',
],
'dependencies': [
- '<(source_dir)/_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp:wtf',
'<(source_dir)/WTF/WTF.gyp/WTF.gyp:newwtf',
],
}],
