Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (143092 => 143093)
--- trunk/Source/_javascript_Core/ChangeLog 2013-02-16 03:06:19 UTC (rev 143092)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-02-16 03:26:06 UTC (rev 143093)
@@ -1,3 +1,13 @@
+2013-02-15 Martin Robinson <mrobin...@igalia.com>
+
+ [GTK] Spread the gyp build files throughout the tree
+ https://bugs.webkit.org/show_bug.cgi?id=109960
+
+ Reviewed by Dirk Pranke.
+
+ * _javascript_Core.gyp/_javascript_CoreGTK.gyp: Renamed from Source/WebKit/gtk/gyp/_javascript_Core.gyp.
+ * _javascript_Core.gyp/generate-derived-sources.sh: Renamed from Source/WebKit/gtk/gyp/generate-derived-sources.sh.
+
2013-02-15 Filip Pizlo <fpi...@apple.com>
DFG SpeculativeJIT64 should be more precise about when it's dealing with a cell (even though it probably doesn't matter)
Copied: trunk/Source/_javascript_Core/_javascript_Core.gyp/_javascript_CoreGTK.gyp (from rev 143092, trunk/Source/WebKit/gtk/gyp/_javascript_Core.gyp) (0 => 143093)
--- trunk/Source/_javascript_Core/_javascript_Core.gyp/_javascript_CoreGTK.gyp (rev 0)
+++ trunk/Source/_javascript_Core/_javascript_Core.gyp/_javascript_CoreGTK.gyp 2013-02-16 03:26:06 UTC (rev 143093)
@@ -0,0 +1,137 @@
+{
+ 'includes': [
+ '../_javascript_Core.gypi',
+ ],
+
+ 'variables': {
+ '_javascript_Core': '..',
+ 'Source': '../..',
+ 'Dependencies': '<(Source)/WebKit/gtk/gyp/Dependencies.gyp',
+ '_javascript_core_includes': [
+ '<(Source)',
+ '<(_javascript_Core)',
+ '<(_javascript_Core)/API',
+ '<(_javascript_Core)/assembler',
+ '<(_javascript_Core)/bytecode',
+ '<(_javascript_Core)/bytecompiler',
+ '<(_javascript_Core)/dfg',
+ '<(_javascript_Core)/disassembler',
+ '<(_javascript_Core)/heap',
+ '<(_javascript_Core)/debugger',
+ '<(_javascript_Core)/ForwardingHeaders',
+ '<(_javascript_Core)/interpreter',
+ '<(_javascript_Core)/jit',
+ '<(_javascript_Core)/jit',
+ '<(_javascript_Core)/llint',
+ '<(_javascript_Core)/parser',
+ '<(_javascript_Core)/profiler',
+ '<(_javascript_Core)/runtime',
+ '<(_javascript_Core)/tools',
+ '<(_javascript_Core)/yarr',
+ '<(PRODUCT_DIR)/DerivedSources/_javascript_Core',
+ ],
+ },
+
+ 'target_defaults' : {
+ 'cflags' : [ '<@(global_cflags)', ],
+ 'defines': [ '<@(global_defines)' ],
+ },
+
+ 'targets': [
+ {
+ 'target_name': 'LLIntOffsetExtractor',
+ 'dependencies': [
+ '<(Source)/WTF/WTF.gyp/WTFGTK.gyp:wtf',
+ ],
+ 'type': 'executable',
+ 'sources': [
+ '<(PRODUCT_DIR)/DerivedSources/_javascript_Core/LLIntDesiredOffsets.h',
+ '<@(llintoffsetextractor_files)',
+ ],
+ 'include_dirs': [ '<@(_javascript_core_includes)' ],
+ 'actions': [
+ {
+ 'action_name': 'llint_desired_offsets',
+ 'inputs': [
+ '<(_javascript_Core)/offlineasm/generate_offset_extractor.rb',
+ '<(_javascript_Core)/llint/LowLevelInterpreter.asm',
+ '<@(llintdesiredoffsets_h_files)',
+ ],
+ 'outputs': [
+ '<(PRODUCT_DIR)/DerivedSources/_javascript_Core/LLIntDesiredOffsets.h',
+ ],
+ 'action': [
+ 'ruby',
+ '<(_javascript_Core)/offlineasm/generate_offset_extractor.rb',
+ '<(_javascript_Core)/llint/LowLevelInterpreter.asm',
+ '<@(_outputs)',
+ ],
+ },
+ ],
+ },
+ {
+ 'target_name': 'libjavascriptcoregtk',
+ 'type': 'shared_library',
+ 'dependencies': [
+ '<(Source)/WTF/WTF.gyp/WTFGTK.gyp:wtf',
+ 'LLIntOffsetExtractor',
+ '<(Dependencies):glib',
+ '<(Dependencies):icu',
+ ],
+ 'product_extension': 'so.<@(_javascript_core_soname_version)',
+ 'product_name': '_javascript_coregtk-<@(api_version)',
+ 'cflags': [ '-fPIC', ],
+ 'include_dirs': [ '<@(_javascript_core_includes)' ],
+ 'sources': [
+ '<@(_javascript_core_yarr_files)',
+ '<@(_javascript_core_derived_source_files)',
+ '<@(_javascript_core_files)',
+ ],
+ 'sources/': [
+ ['exclude', '(BlackBerry)\\.(cpp|mm|h)$'],
+ ['exclude', 'JSStringRefBSTR\\.(h|cpp)$'],
+ ['exclude', 'JSStringRefCF\\.(h|cpp)$'],
+ ],
+ 'actions': [
+ {
+ 'action_name': 'Generate Derived Sources',
+ 'inputs': [
+ '<(_javascript_Core)/DerivedSources.make',
+ 'generate-derived-sources.sh',
+ ],
+ 'outputs': [
+ '<@(_javascript_core_derived_source_files)',
+ ],
+ 'action': ['sh', 'generate-derived-sources.sh', '<@(project_dir)', '<(PRODUCT_DIR)/DerivedSources/_javascript_Core'],
+ },
+ {
+ 'action_name': 'llintassembly_header_generation',
+ 'inputs': [
+ '<(_javascript_Core)/offlineasm/asm.rb',
+ '<(_javascript_Core)/llint/LowLevelInterpreter.asm',
+ '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)LLIntOffsetExtractor<(EXECUTABLE_SUFFIX)',
+ ],
+ 'outputs': [
+ '<(PRODUCT_DIR)/DerivedSources/_javascript_Core/LLIntAssembly.h',
+ ],
+ 'action': ['ruby', '<@(_inputs)', '<@(_outputs)'],
+ },
+ ],
+ },
+ {
+ 'target_name': 'jsc',
+ 'dependencies': [ 'libjavascriptcoregtk' ],
+ 'type': 'executable',
+ 'sources': [ '<@(jsc_files)' ],
+ 'include_dirs': [ '<@(_javascript_core_includes)' ],
+ },
+ {
+ 'target_name': 'minidom',
+ 'dependencies': [ 'libjavascriptcoregtk' ],
+ 'type': 'executable',
+ 'sources': [ '<@(minidom_files)' ],
+ 'include_dirs': [ '<@(_javascript_core_includes)', ],
+ },
+ ]
+}
+
Property changes: trunk/Source/_javascript_Core/_javascript_Core.gyp/_javascript_CoreGTK.gyp
Added: svn:eol-style
Copied: trunk/Source/_javascript_Core/_javascript_Core.gyp/generate-derived-sources.sh (from rev 143092, trunk/Source/WebKit/gtk/gyp/generate-derived-sources.sh) (0 => 143093)
--- trunk/Source/_javascript_Core/_javascript_Core.gyp/generate-derived-sources.sh (rev 0)
+++ trunk/Source/_javascript_Core/_javascript_Core.gyp/generate-derived-sources.sh 2013-02-16 03:26:06 UTC (rev 143093)
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+abspath () {
+ case "$1" in /*)
+ printf "%s\n" "$1";;
+ *)
+ printf "%s\n" "$PWD/$1";;
+ esac;
+}
+
+_javascript_Core=`abspath $1`
+cd $2
+echo `abspath $2`
+make --no-builtin-rules -f "$_javascript_Core/DerivedSources.make" _javascript_Core=$_javascript_Core
+
Property changes: trunk/Source/_javascript_Core/_javascript_Core.gyp/generate-derived-sources.sh
Added: svn:eol-style
Modified: trunk/Source/WTF/ChangeLog (143092 => 143093)
--- trunk/Source/WTF/ChangeLog 2013-02-16 03:06:19 UTC (rev 143092)
+++ trunk/Source/WTF/ChangeLog 2013-02-16 03:26:06 UTC (rev 143093)
@@ -1,3 +1,12 @@
+2013-02-15 Martin Robinson <mrobin...@igalia.com>
+
+ [GTK] Spread the gyp build files throughout the tree
+ https://bugs.webkit.org/show_bug.cgi?id=109960
+
+ Reviewed by Dirk Pranke.
+
+ * WTF.gyp/WTFGTK.gyp: Renamed from Source/WebKit/gtk/gyp/WTF.gyp.
+
2013-02-15 Anders Carlsson <ander...@apple.com>
Add HashMap::isValidKey and HashSet::isValidValue
Copied: trunk/Source/WTF/WTF.gyp/WTFGTK.gyp (from rev 143092, trunk/Source/WebKit/gtk/gyp/WTF.gyp) (0 => 143093)
--- trunk/Source/WTF/WTF.gyp/WTFGTK.gyp (rev 0)
+++ trunk/Source/WTF/WTF.gyp/WTFGTK.gyp 2013-02-16 03:26:06 UTC (rev 143093)
@@ -0,0 +1,61 @@
+{
+ 'includes': [
+ '../WTF.gypi',
+ ],
+
+ 'variables': {
+ 'WTF': '..',
+ 'Source': '../..',
+ 'Dependencies': '<(Source)/WebKit/gtk/gyp/Dependencies.gyp',
+ },
+
+ 'target_defaults' : {
+ 'cflags' : [ '<@(global_cflags)', ],
+ 'defines': [ '<@(global_defines)' ],
+ },
+
+ 'targets': [
+ {
+ 'target_name': 'wtf',
+ 'type': 'static_library',
+ 'dependencies': [
+ '<(Dependencies):glib',
+ '<(Dependencies):icu',
+ ],
+ 'include_dirs': [
+ '<(WTF)',
+ '<(WTF)/wtf',
+ '<(WTF)/wtf/unicode',
+ ],
+ 'sources': [
+ '<@(wtf_privateheader_files)',
+ '<@(wtf_files)',
+ ],
+ 'sources/': [
+ ['exclude', 'wtf/efl'],
+ ['exclude', 'wtf/chromium'],
+ ['exclude', 'wtf/mac'],
+ ['exclude', 'wtf/qt'],
+ ['exclude', 'wtf/url'],
+ ['exclude', 'wtf/wince'],
+ ['exclude', 'wtf/wx'],
+ ['exclude', 'wtf/unicode/qt4'],
+ ['exclude', 'wtf/unicode/wchar'],
+ ['exclude', '(Default|Wchar|Mac|None|Qt|Win|Wx|Efl)\\.(cpp|mm)$'],
+ ],
+ 'cflags' : [ '-fPIC', ],
+ 'all_dependent_settings': {
+ 'cflags' : [
+ '<(global_cflags)',
+ ],
+ 'include_dirs': [
+ '<(WTF)',
+ '<(WTF)/wtf',
+ ],
+ },
+ 'direct_dependent_settings': {
+ 'ldflags': [ '-pthread' ],
+ },
+ },
+ ]
+}
Property changes: trunk/Source/WTF/WTF.gyp/WTFGTK.gyp
Added: svn:eol-style
Modified: trunk/Source/WebKit/gtk/ChangeLog (143092 => 143093)
--- trunk/Source/WebKit/gtk/ChangeLog 2013-02-16 03:06:19 UTC (rev 143092)
+++ trunk/Source/WebKit/gtk/ChangeLog 2013-02-16 03:26:06 UTC (rev 143093)
@@ -1,5 +1,15 @@
2013-02-15 Martin Robinson <mrobin...@igalia.com>
+ [GTK] Spread the gyp build files throughout the tree
+ https://bugs.webkit.org/show_bug.cgi?id=109960
+
+ Reviewed by Dirk Pranke.
+
+ * gyp/Configuration.gypi.in: Remove the 'Source', since now it cannot be shared.
+ * gyp/run-gyp: Update the path to the _javascript_Core gypfile.
+
+2013-02-15 Martin Robinson <mrobin...@igalia.com>
+
Unreviewed, rolling out parts of r142731.
http://trac.webkit.org/changeset/142731
https://bugs.webkit.org/show_bug.cgi?id=109672
Modified: trunk/Source/WebKit/gtk/gyp/Configuration.gypi.in (143092 => 143093)
--- trunk/Source/WebKit/gtk/gyp/Configuration.gypi.in 2013-02-16 03:06:19 UTC (rev 143092)
+++ trunk/Source/WebKit/gtk/gyp/Configuration.gypi.in 2013-02-16 03:26:06 UTC (rev 143093)
@@ -5,9 +5,6 @@
# relative to the source directory after running autogen.sh.
'toplevel_directory': '@TOPLEVEL_DIRECTORY@',
- # Source is <toplevel>/Source, but relative to the actual .gyp files.
- 'Source': '../../..',
-
'api_version': '@WEBKITGTK_API_VERSION@',
# TODO: Currently this is calculated by libtool, but we could move
Deleted: trunk/Source/WebKit/gtk/gyp/_javascript_Core.gyp (143092 => 143093)
--- trunk/Source/WebKit/gtk/gyp/_javascript_Core.gyp 2013-02-16 03:06:19 UTC (rev 143092)
+++ trunk/Source/WebKit/gtk/gyp/_javascript_Core.gyp 2013-02-16 03:26:06 UTC (rev 143093)
@@ -1,137 +0,0 @@
-{
- 'includes': [
- '../../../_javascript_Core/_javascript_Core.gypi',
- ],
- 'variables': {
- '_javascript_core_includes': [
- '<(Source)/',
- '<(Source)/_javascript_Core',
- '<(Source)/_javascript_Core/API',
- '<(Source)/_javascript_Core/assembler',
- '<(Source)/_javascript_Core/bytecode',
- '<(Source)/_javascript_Core/bytecompiler',
- '<(Source)/_javascript_Core/dfg',
- '<(Source)/_javascript_Core/disassembler',
- '<(Source)/_javascript_Core/heap',
- '<(Source)/_javascript_Core/debugger',
- '<(Source)/_javascript_Core/ForwardingHeaders',
- '<(Source)/_javascript_Core/interpreter',
- '<(Source)/_javascript_Core/jit',
- '<(Source)/_javascript_Core/jit',
- '<(Source)/_javascript_Core/llint',
- '<(Source)/_javascript_Core/parser',
- '<(Source)/_javascript_Core/profiler',
- '<(Source)/_javascript_Core/runtime',
- '<(Source)/_javascript_Core/tools',
- '<(Source)/_javascript_Core/yarr',
- '<(PRODUCT_DIR)/DerivedSources/_javascript_Core',
- ],
- },
- 'target_defaults' : {
- 'cflags' : [ '<@(global_cflags)', ],
- 'defines': [ '<@(global_defines)' ],
- },
- 'targets': [
- {
- 'target_name': 'LLIntOffsetExtractor',
- 'dependencies': [
- 'WTF.gyp:wtf',
- ],
- 'type': 'executable',
- 'sources': [
- '<(PRODUCT_DIR)/DerivedSources/_javascript_Core/LLIntDesiredOffsets.h',
- '<@(llintoffsetextractor_files)',
- ],
- 'include_dirs': [ '<@(_javascript_core_includes)' ],
- 'actions': [
- {
- 'action_name': 'llint_desired_offsets',
- 'inputs': [
- '<(Source)/_javascript_Core/offlineasm/generate_offset_extractor.rb',
- '<(Source)/_javascript_Core/llint/LowLevelInterpreter.asm',
- '<@(llintdesiredoffsets_h_files)',
- ],
- 'outputs': [
- '<(PRODUCT_DIR)/DerivedSources/_javascript_Core/LLIntDesiredOffsets.h',
- ],
- 'action': [
- 'ruby',
- '<(Source)/_javascript_Core/offlineasm/generate_offset_extractor.rb',
- '<(Source)/_javascript_Core/llint/LowLevelInterpreter.asm',
- '<@(_outputs)',
- ],
- },
- ],
- },
- {
- 'target_name': 'libjavascriptcoregtk',
- 'type': 'shared_library',
- 'dependencies': [
- 'WTF.gyp:wtf',
- 'LLIntOffsetExtractor',
- 'Dependencies.gyp:glib',
- 'Dependencies.gyp:icu',
- ],
- 'product_extension': 'so.<@(_javascript_core_soname_version)',
- 'product_name': '_javascript_coregtk-<@(api_version)',
- 'cflags': [ '-fPIC', ],
- 'include_dirs': [ '<@(_javascript_core_includes)' ],
- 'sources': [
- '<@(_javascript_core_yarr_files)',
- '<@(_javascript_core_derived_source_files)',
- '<@(_javascript_core_files)',
- ],
- 'sources/': [
- ['exclude', '(BlackBerry)\\.(cpp|mm|h)$'],
- ['exclude', 'JSStringRefBSTR\\.(h|cpp)$'],
- ['exclude', 'JSStringRefCF\\.(h|cpp)$'],
- ],
- 'direct_dependent_settings': {
- 'include_dirs': [
- '<(Source)/WTF',
- '<(Source)/WTF/wtf',
- ],
- },
- 'actions': [
- {
- 'action_name': 'Generate Derived Sources',
- 'inputs': [
- '<(Source)/_javascript_Core/DerivedSources.make',
- 'generate-derived-sources.sh',
- ],
- 'outputs': [
- '<@(_javascript_core_derived_source_files)',
- ],
- 'action': ['sh', 'generate-derived-sources.sh', '<@(project_dir)', '<(PRODUCT_DIR)/DerivedSources/_javascript_Core'],
- },
- {
- 'action_name': 'llintassembly_header_generation',
- 'inputs': [
- '<(Source)/_javascript_Core/offlineasm/asm.rb',
- '<(Source)/_javascript_Core/llint/LowLevelInterpreter.asm',
- '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)LLIntOffsetExtractor<(EXECUTABLE_SUFFIX)',
- ],
- 'outputs': [
- '<(PRODUCT_DIR)/DerivedSources/_javascript_Core/LLIntAssembly.h',
- ],
- 'action': ['ruby', '<@(_inputs)', '<@(_outputs)'],
- },
- ],
- },
- {
- 'target_name': 'jsc',
- 'dependencies': [ 'libjavascriptcoregtk' ],
- 'type': 'executable',
- 'sources': [ '<@(jsc_files)' ],
- 'include_dirs': [ '<@(_javascript_core_includes)' ],
- },
- {
- 'target_name': 'minidom',
- 'dependencies': [ 'libjavascriptcoregtk' ],
- 'type': 'executable',
- 'sources': [ '<@(minidom_files)' ],
- 'include_dirs': [ '<@(_javascript_core_includes)', ],
- },
- ]
-}
-
Deleted: trunk/Source/WebKit/gtk/gyp/WTF.gyp (143092 => 143093)
--- trunk/Source/WebKit/gtk/gyp/WTF.gyp 2013-02-16 03:06:19 UTC (rev 143092)
+++ trunk/Source/WebKit/gtk/gyp/WTF.gyp 2013-02-16 03:26:06 UTC (rev 143093)
@@ -1,53 +0,0 @@
-{
- 'includes': [
- '../../../WTF/WTF.gypi',
- ],
- 'target_defaults' : {
- 'cflags' : [ '<@(global_cflags)', ],
- 'defines': [ '<@(global_defines)' ],
- },
- 'targets': [
- {
- 'target_name': 'wtf',
- 'type': 'static_library',
- 'dependencies': [
- 'Dependencies.gyp:glib',
- 'Dependencies.gyp:icu',
- ],
- 'include_dirs': [
- '<(Source)/WTF',
- '<(Source)/WTF/wtf',
- '<(Source)/WTF/wtf/unicode',
- ],
- 'sources': [
- '<@(wtf_privateheader_files)',
- '<@(wtf_files)',
- ],
- 'sources/': [
- ['exclude', 'wtf/efl'],
- ['exclude', 'wtf/chromium'],
- ['exclude', 'wtf/mac'],
- ['exclude', 'wtf/qt'],
- ['exclude', 'wtf/url'],
- ['exclude', 'wtf/wince'],
- ['exclude', 'wtf/wx'],
- ['exclude', 'wtf/unicode/qt4'],
- ['exclude', 'wtf/unicode/wchar'],
- ['exclude', '(Default|Wchar|Mac|None|Qt|Win|Wx|Efl)\\.(cpp|mm)$'],
- ],
- 'cflags' : [ '-fPIC', ],
- 'all_dependent_settings': {
- 'cflags' : [
- '<(global_cflags)',
- ],
- 'include_dirs': [
- '<(Source)/WTF',
- '<(Source)/WTF/wtf',
- ],
- },
- 'direct_dependent_settings': {
- 'ldflags': [ '-pthread' ],
- },
- },
- ]
-}
Deleted: trunk/Source/WebKit/gtk/gyp/generate-derived-sources.sh (143092 => 143093)
--- trunk/Source/WebKit/gtk/gyp/generate-derived-sources.sh 2013-02-16 03:06:19 UTC (rev 143092)
+++ trunk/Source/WebKit/gtk/gyp/generate-derived-sources.sh 2013-02-16 03:26:06 UTC (rev 143093)
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-abspath () {
- case "$1" in /*)
- printf "%s\n" "$1";;
- *)
- printf "%s\n" "$PWD/$1";;
- esac;
-}
-
-_javascript_Core=`abspath $1`
-cd $2
-echo `abspath $2`
-make --no-builtin-rules -f "$_javascript_Core/DerivedSources.make" _javascript_Core=$_javascript_Core
-
Modified: trunk/Source/WebKit/gtk/gyp/run-gyp (143092 => 143093)
--- trunk/Source/WebKit/gtk/gyp/run-gyp 2013-02-16 03:06:19 UTC (rev 143092)
+++ trunk/Source/WebKit/gtk/gyp/run-gyp 2013-02-16 03:26:06 UTC (rev 143093)
@@ -15,5 +15,5 @@
sys.exit(subprocess.call(['gyp',
'--depth=.',
'--generator-output=%s' % build_directory,
- 'Source/WebKit/gtk/gyp/_javascript_Core.gyp',
+ 'Source/_javascript_Core/_javascript_Core.gyp/_javascript_CoreGTK.gyp',
'-I', os.path.join(build_directory, 'Configuration.gypi')]))
