AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[build] Prepare moving v8.gyp to src/

Browse Source 
This will allow to pull in gyp as a deps to the same location
as chromium (tools/gyp not build/gyp), needed for gn switch.

This is the first step of a 3-way move.
1) Copy v8.gyp in v8
2) Update references in embedders (follow up)
3) Remove old v8.gyp (follow up)

BUG=chromium:474921
LOG=n
NOTRY=true

Review URL: https://codereview.chromium.org/1920793002

Cr-Commit-Position: refs/heads/master@{#35760}
This commit is contained in:
machenbach 2016-04-25 05:19:32 -07:00 committed by Commit bot
parent 17024be077
commit cb855fe728
14 changed files with 2258 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -264,7 +264,7 @@ GYPFILES = third_party/icu/icu.gypi third_party/icu/icu.gyp \
build/shim_headers.gypi build/features.gypi build/standalone.gypi \
build/toolchain.gypi build/all.gyp build/mac/asan.gyp \
test/cctest/cctest.gyp test/fuzzer/fuzzer.gyp \
test/unittests/unittests.gyp tools/gyp/v8.gyp \
test/unittests/unittests.gyp src/v8.gyp \
tools/parser-shell.gyp testing/gmock.gyp testing/gtest.gyp \
buildtools/third_party/libc++abi/libc++abi.gyp \
buildtools/third_party/libc++/libc++.gyp samples/samples.gyp \

8
WATCHLISTS
View File

@ -62,7 +62,10 @@
},
'merges': {
'filepath': '.',
}
},
'v8_gyp': {
'filepath': 'tools/gyp/v8.gyp|src/v8.gyp',
},
},
'WATCHLISTS': {
@ -97,5 +100,8 @@
# Only enabled on branches created with tools/release/create_release.py
# 'v8-merges@googlegroups.com',
],
'v8_gyp': [
'machenbach@chromium.org',
],
},
}

4
samples/samples.gyp
View File

@ -34,8 +34,8 @@
'target_defaults': {
'type': 'executable',
'dependencies': [
'../tools/gyp/v8.gyp:v8',
'../tools/gyp/v8.gyp:v8_libplatform',
'../src/v8.gyp:v8',
'../src/v8.gyp:v8_libplatform',
],
'include_dirs': [
'..',

4
src/d8.gyp
View File

@ -39,8 +39,8 @@
'target_name': 'd8',
'type': 'executable',
'dependencies': [
'../tools/gyp/v8.gyp:v8',
'../tools/gyp/v8.gyp:v8_libplatform',
'v8.gyp:v8',
'v8.gyp:v8_libplatform',
],
# Generated source files need this explicitly:
'include_dirs+': [

2
src/third_party/vtune/v8vtune.gyp vendored
View File

@ -35,7 +35,7 @@
'target_name': 'v8_vtune',
'type': 'static_library',
'dependencies': [
'../../../tools/gyp/v8.gyp:v8',
'../../v8.gyp:v8',
],
'sources': [
'ittnotify_config.h',

2225
src/v8.gyp Normal file
View File

File diff suppressed because it is too large Load Diff

12
test/cctest/cctest.gyp
View File

@ -37,7 +37,7 @@
'type': 'executable',
'dependencies': [
'resources',
'../../tools/gyp/v8.gyp:v8_libplatform',
'../../src/v8.gyp:v8_libplatform',
],
'include_dirs': [
'../..',
@ -345,9 +345,9 @@
['component=="shared_library"', {
# cctest can't be built against a shared library, so we need to
# depend on the underlying static target in that case.
'dependencies': ['../../tools/gyp/v8.gyp:v8_maybe_snapshot'],
'dependencies': ['../../src/v8.gyp:v8_maybe_snapshot'],
}, {
'dependencies': ['../../tools/gyp/v8.gyp:v8'],
'dependencies': ['../../src/v8.gyp:v8'],
}],
],
},
@ -390,14 +390,14 @@
'target_name': 'generate-bytecode-expectations',
'type': 'executable',
'dependencies': [
'../../tools/gyp/v8.gyp:v8_libplatform',
'../../src/v8.gyp:v8_libplatform',
],
'conditions': [
['component=="shared_library"', {
# Same as cctest, we need to depend on the underlying static target.
'dependencies': ['../../tools/gyp/v8.gyp:v8_maybe_snapshot'],
'dependencies': ['../../src/v8.gyp:v8_maybe_snapshot'],
}, {
'dependencies': ['../../tools/gyp/v8.gyp:v8'],
'dependencies': ['../../src/v8.gyp:v8'],
}],
],
'include_dirs+': [

6
test/fuzzer/fuzzer.gyp
View File

@ -142,7 +142,7 @@
'target_name': 'fuzzer_support',
'type': 'static_library',
'dependencies': [
'../../tools/gyp/v8.gyp:v8_libplatform',
'../../src/v8.gyp:v8_libplatform',
],
'include_dirs': [
'../..',
@ -155,9 +155,9 @@
['component=="shared_library"', {
# fuzzers can't be built against a shared library, so we need to
# depend on the underlying static target in that case.
'dependencies': ['../../tools/gyp/v8.gyp:v8_maybe_snapshot'],
'dependencies': ['../../src/v8.gyp:v8_maybe_snapshot'],
}, {
'dependencies': ['../../tools/gyp/v8.gyp:v8'],
'dependencies': ['../../src/v8.gyp:v8'],
}],
],
},

6
test/unittests/unittests.gyp
View File

@ -17,7 +17,7 @@
'dependencies': [
'../../testing/gmock.gyp:gmock',
'../../testing/gtest.gyp:gtest',
'../../tools/gyp/v8.gyp:v8_libplatform',
'../../src/v8.gyp:v8_libplatform',
],
'include_dirs': [
'../..',
@ -182,9 +182,9 @@
['component=="shared_library"', {
# compiler-unittests can't be built against a shared library, so we
# need to depend on the underlying static target in that case.
'dependencies': ['../../tools/gyp/v8.gyp:v8_maybe_snapshot'],
'dependencies': ['../../src/v8.gyp:v8_maybe_snapshot'],
}, {
'dependencies': ['../../tools/gyp/v8.gyp:v8'],
'dependencies': ['../../src/v8.gyp:v8'],
}],
['os_posix == 1', {
# TODO(svenpanne): This is a temporary work-around to fix the warnings

2
tools/gcmole/gcmole.lua
View File

@ -185,7 +185,7 @@ end
local function ParseGYPFile()
local gyp = ""
local gyp_files = { "tools/gyp/v8.gyp", "test/cctest/cctest.gyp" }
local gyp_files = { "src/v8.gyp", "test/cctest/cctest.gyp" }
for i = 1, #gyp_files do
local f = assert(io.open(gyp_files[i]), "failed to open GYP file")
local t = f:read('*a')

1
tools/gcmole/run-gcmole.isolate
View File

@ -12,7 +12,6 @@
'parallel.py',
'run-gcmole.py',
# The following contains all relevant source and gyp files.
'../gyp/v8.gyp',
'../../base/',
'../../include/',
'../../src/',

4
tools/gyp/OWNERS Normal file
View File

@ -0,0 +1,4 @@
set noparent
jochen@chromium.org
machenbach@chromium.org

4
tools/parser-shell.gyp
View File

@ -36,8 +36,8 @@
'target_name': 'parser-shell',
'type': 'executable',
'dependencies': [
'../tools/gyp/v8.gyp:v8',
'../tools/gyp/v8.gyp:v8_libplatform',
'../src/v8.gyp:v8',
'../src/v8.gyp:v8_libplatform',
],
'conditions': [
['v8_enable_i18n_support==1', {

2
tools/verify_source_deps.py
View File

@ -24,10 +24,10 @@ V8_INCLUDE_BASE = os.path.join(V8_BASE, 'include')
GYP_FILES = [
os.path.join(V8_BASE, 'src', 'd8.gyp'),
os.path.join(V8_BASE, 'src', 'v8.gyp'),
os.path.join(V8_BASE, 'src', 'third_party', 'vtune', 'v8vtune.gyp'),
os.path.join(V8_BASE, 'test', 'cctest', 'cctest.gyp'),
os.path.join(V8_BASE, 'test', 'unittests', 'unittests.gyp'),
os.path.join(V8_BASE, 'tools', 'gyp', 'v8.gyp'),
os.path.join(V8_BASE, 'tools', 'parser-shell.gyp'),
]