Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (147293 => 147294)
--- trunk/Source/_javascript_Core/ChangeLog 2013-04-01 01:16:33 UTC (rev 147293)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-04-01 03:06:57 UTC (rev 147294)
@@ -1,3 +1,17 @@
+2013-03-31 Adam Barth <aba...@webkit.org>
+
+ [Chromium] Yarr should build using a separate GYP file from _javascript_Core
+ https://bugs.webkit.org/show_bug.cgi?id=113652
+
+ Reviewed by Nico Weber.
+
+ This patch moves _javascript_Core.gyp to yarr.gyp because Chromium only
+ uses this GYP file to build yarr.
+
+ * _javascript_Core.gyp/_javascript_CoreGTK.gyp:
+ * _javascript_Core.gypi:
+ * yarr/yarr.gyp: Renamed from Source/_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp.
+
2013-03-31 Filip Pizlo <fpi...@apple.com>
Unreviewed, fix a comment. While thinking about TBAA for array accesses,
Deleted: trunk/Source/_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp (147293 => 147294)
--- trunk/Source/_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp 2013-04-01 01:16:33 UTC (rev 147293)
+++ trunk/Source/_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp 2013-04-01 03:06:57 UTC (rev 147294)
@@ -1,100 +0,0 @@
-#
-# Copyright (C) 2009, 2012 Google Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-# * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-{
- 'includes': [
- '../../WebKit/chromium/WinPrecompile.gypi',
- '../../WebKit/chromium/features.gypi',
- '../_javascript_Core.gypi',
- ],
- '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': '../../../../..',
- }],
- ],
- },
- 'conditions': [
- ['os_posix == 1 and OS != "mac" 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': [
- {
- 'target_name': 'yarr',
- 'type': 'static_library',
- 'dependencies': [
- '../../WTF/WTF.gyp/WTF.gyp:wtf',
- ],
- 'variables': { 'optimize': 'max' },
- 'actions': [
- {
- 'action_name': 'retgen',
- 'inputs': [
- '../create_regex_tables',
- ],
- 'arguments': [
- '--no-tables',
- ],
- 'outputs': [
- '<(INTERMEDIATE_DIR)/RegExpJitTables.h',
- ],
- 'action': ['python', '<@(_inputs)', '<@(_arguments)', '<@(_outputs)'],
- },
- ],
- 'include_dirs': [
- '<(INTERMEDIATE_DIR)',
- '..',
- '../runtime',
- ],
- 'sources': [
- '<@(_javascript_core_yarr_files)',
- ],
- 'export_dependent_settings': [
- '../../WTF/WTF.gyp/WTF.gyp:wtf',
- ],
- 'conditions': [
- ['OS=="win"', {
- # Disable c4267 warnings until we fix size_t to int truncations.
- 'msvs_disabled_warnings': [4267, ],
- }],
- ],
- },
- ], # targets
-}
Modified: trunk/Source/_javascript_Core/_javascript_Core.gyp/_javascript_CoreGTK.gyp (147293 => 147294)
--- trunk/Source/_javascript_Core/_javascript_Core.gyp/_javascript_CoreGTK.gyp 2013-04-01 01:16:33 UTC (rev 147293)
+++ trunk/Source/_javascript_Core/_javascript_Core.gyp/_javascript_CoreGTK.gyp 2013-04-01 03:06:57 UTC (rev 147294)
@@ -139,7 +139,6 @@
'cflags': [ '-fPIC', ],
'include_dirs': [ '<@(_javascript_core_includes)' ],
'sources': [
- '<@(_javascript_core_yarr_files)',
'<@(_javascript_core_derived_source_files)',
'<@(_javascript_core_files)',
],
Modified: trunk/Source/_javascript_Core/_javascript_Core.gypi (147293 => 147294)
--- trunk/Source/_javascript_Core/_javascript_Core.gypi 2013-04-01 01:16:33 UTC (rev 147293)
+++ trunk/Source/_javascript_Core/_javascript_Core.gypi 2013-04-01 03:06:57 UTC (rev 147294)
@@ -1,12 +1,6 @@
{
'variables': {
'project_dir': ['.'],
- '_javascript_core_yarr_files': [
- 'yarr/YarrCanonicalizeUCS2.cpp',
- 'yarr/YarrInterpreter.cpp',
- 'yarr/YarrPattern.cpp',
- 'yarr/YarrSyntaxChecker.cpp',
- ],
'_javascript_core_derived_source_files': [
'<(PRODUCT_DIR)/DerivedSources/_javascript_Core/RegExpJitTables.h',
'<(PRODUCT_DIR)/DerivedSources/_javascript_Core/Lexer.lut.h',
@@ -826,13 +820,17 @@
'tools/CodeProfiling.h',
'tools/ProfileTreeNode.h',
'tools/TieredMMapArray.h',
- 'yarr/YarrCanonicalizeUCS2.h',
'yarr/Yarr.h',
+ 'yarr/YarrCanonicalizeUCS2.cpp',
+ 'yarr/YarrCanonicalizeUCS2.h',
+ 'yarr/YarrInterpreter.cpp',
'yarr/YarrInterpreter.h',
'yarr/YarrJIT.cpp',
'yarr/YarrJIT.h',
'yarr/YarrParser.h',
+ 'yarr/YarrPattern.cpp',
'yarr/YarrPattern.h',
+ 'yarr/YarrSyntaxChecker.cpp',
'yarr/YarrSyntaxChecker.h',
],
'minidom_files': [
Copied: trunk/Source/_javascript_Core/yarr/yarr.gyp (from rev 147293, trunk/Source/_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp) (0 => 147294)
--- trunk/Source/_javascript_Core/yarr/yarr.gyp (rev 0)
+++ trunk/Source/_javascript_Core/yarr/yarr.gyp 2013-04-01 03:06:57 UTC (rev 147294)
@@ -0,0 +1,95 @@
+#
+# Copyright (C) 2009, 2012 Google Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+# * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+{
+ 'includes': [
+ '../../WebKit/chromium/WinPrecompile.gypi',
+ '../../WebKit/chromium/features.gypi',
+ ],
+ 'conditions': [
+ ['os_posix == 1 and OS != "mac" 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': [
+ {
+ 'target_name': 'yarr',
+ 'type': 'static_library',
+ 'dependencies': [
+ '../../WTF/WTF.gyp/WTF.gyp:wtf',
+ ],
+ 'variables': { 'optimize': 'max' },
+ 'actions': [
+ {
+ 'action_name': 'retgen',
+ 'inputs': [
+ '../create_regex_tables',
+ ],
+ 'arguments': [
+ '--no-tables',
+ ],
+ 'outputs': [
+ '<(INTERMEDIATE_DIR)/RegExpJitTables.h',
+ ],
+ 'action': ['python', '<@(_inputs)', '<@(_arguments)', '<@(_outputs)'],
+ },
+ ],
+ 'include_dirs': [
+ '<(INTERMEDIATE_DIR)',
+ '..',
+ ],
+ 'sources': [
+ 'Yarr.h',
+ 'YarrCanonicalizeUCS2.cpp',
+ 'YarrCanonicalizeUCS2.h',
+ 'YarrInterpreter.cpp',
+ 'YarrInterpreter.h',
+ 'YarrParser.h',
+ 'YarrPattern.cpp',
+ 'YarrPattern.h',
+ 'YarrSyntaxChecker.cpp',
+ 'YarrSyntaxChecker.h',
+ ],
+ 'export_dependent_settings': [
+ '../../WTF/WTF.gyp/WTF.gyp:wtf',
+ ],
+ 'conditions': [
+ ['OS=="win"', {
+ # Disable c4267 warnings until we fix size_t to int truncations.
+ 'msvs_disabled_warnings': [4267, ],
+ }],
+ ],
+ },
+ ], # targets
+}
Modified: trunk/Source/WebCore/ChangeLog (147293 => 147294)
--- trunk/Source/WebCore/ChangeLog 2013-04-01 01:16:33 UTC (rev 147293)
+++ trunk/Source/WebCore/ChangeLog 2013-04-01 03:06:57 UTC (rev 147294)
@@ -1,3 +1,13 @@
+2013-03-31 Adam Barth <aba...@webkit.org>
+
+ [Chromium] Yarr should build using a separate GYP file from _javascript_Core
+ https://bugs.webkit.org/show_bug.cgi?id=113652
+
+ Reviewed by Nico Weber.
+
+ * WebCore.gyp/WebCore.gyp:
+ - Update references to yarr.gyp.
+
2013-03-31 Kangil Han <kangil....@samsung.com>
[EFL] Remove unused stdio.h includes
Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (147293 => 147294)
--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2013-04-01 01:16:33 UTC (rev 147293)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2013-04-01 03:06:57 UTC (rev 147294)
@@ -1258,7 +1258,7 @@
'injected_canvas_script_source',
'injected_script_source',
'debugger_script_source',
- '../../_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp:yarr',
+ '../../_javascript_Core/yarr/yarr.gyp:yarr',
'../../WTF/WTF.gyp/WTF.gyp:wtf',
'<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
'<(chromium_src_dir)/skia/skia.gyp:skia',
@@ -1386,7 +1386,7 @@
'inspector_protocol_sources',
'webcore_bindings_sources',
'../../ThirdParty/glu/glu.gyp:libtess',
- '../../_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp:yarr',
+ '../../_javascript_Core/yarr/yarr.gyp:yarr',
'../../WTF/WTF.gyp/WTF.gyp:wtf',
'<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
'<(chromium_src_dir)/skia/skia.gyp:skia',
@@ -1405,7 +1405,7 @@
'<(libjpeg_gyp_path):libjpeg',
],
'export_dependent_settings': [
- '../../_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp:yarr',
+ '../../_javascript_Core/yarr/yarr.gyp:yarr',
'../../WTF/WTF.gyp/WTF.gyp:wtf',
'<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
'<(chromium_src_dir)/skia/skia.gyp:skia',
