From adb0012ff2891de83ba588016894630f9717755f Mon Sep 17 00:00:00 2001 From: Yang Guo Date: Mon, 29 Jan 2018 09:03:31 +0100 Subject: [PATCH] [gyp] move parser-shell.gyp to gypfiles. R=machenbach@chromium.org Bug: v8:7335 Change-Id: Ic89f9cd1fd45ece80da24c85559ef04bee93ee64 Reviewed-on: https://chromium-review.googlesource.com/888699 Commit-Queue: Yang Guo Reviewed-by: Michael Achenbach Cr-Commit-Position: refs/heads/master@{#50918} --- Makefile | 2 +- gypfiles/all.gyp | 2 +- {tools => gypfiles}/parser-shell.gyp | 12 ++++++------ gypfiles/verify_source_deps.py | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) rename {tools => gypfiles}/parser-shell.gyp (89%) diff --git a/Makefile b/Makefile index 3957195e1b..40937f3235 100644 --- a/Makefile +++ b/Makefile @@ -281,7 +281,7 @@ GYPFILES = third_party/icu/icu.gypi third_party/icu/icu.gyp \ gypfiles/toolchain.gypi gypfiles/all.gyp gypfiles/mac/asan.gyp \ gypfiles/cctest.gyp test/fuzzer/fuzzer.gyp \ test/unittests/unittests.gyp gypfiles/v8.gyp \ - tools/parser-shell.gyp testing/gmock.gyp testing/gtest.gyp \ + gypfiles/parser-shell.gyp testing/gmock.gyp testing/gtest.gyp \ gypfiles/samples.gyp gypfiles/v8vtune.gyp gypfiles/d8.gyp # Generates all combinations of ARCHES and MODES, e.g. "ia32.release". diff --git a/gypfiles/all.gyp b/gypfiles/all.gyp index 80cd935678..e63935814f 100644 --- a/gypfiles/all.gyp +++ b/gypfiles/all.gyp @@ -15,7 +15,7 @@ 'conditions': [ ['component!="shared_library"', { 'dependencies': [ - '../tools/parser-shell.gyp:parser-shell', + 'parser-shell.gyp:parser-shell', ], }], # These items don't compile for Android on Mac. diff --git a/tools/parser-shell.gyp b/gypfiles/parser-shell.gyp similarity index 89% rename from tools/parser-shell.gyp rename to gypfiles/parser-shell.gyp index 9505114e6d..464e2676ac 100644 --- a/tools/parser-shell.gyp +++ b/gypfiles/parser-shell.gyp @@ -30,15 +30,15 @@ 'v8_code': 1, 'v8_enable_i18n_support%': 1, }, - 'includes': ['../gypfiles/toolchain.gypi', '../gypfiles/features.gypi'], + 'includes': ['toolchain.gypi', 'features.gypi'], 'targets': [ { 'target_name': 'parser-shell', 'type': 'executable', 'dependencies': [ - '../gypfiles/v8.gyp:v8', - '../gypfiles/v8.gyp:v8_libbase', - '../gypfiles/v8.gyp:v8_libplatform', + 'v8.gyp:v8', + 'v8.gyp:v8_libbase', + 'v8.gyp:v8_libplatform', ], 'conditions': [ ['v8_enable_i18n_support==1', { @@ -52,8 +52,8 @@ '..', ], 'sources': [ - 'parser-shell.cc', - 'shell-utils.h', + '../tools/parser-shell.cc', + '../tools/shell-utils.h', ], }, ], diff --git a/gypfiles/verify_source_deps.py b/gypfiles/verify_source_deps.py index 09ba38ecfc..f3214e4543 100755 --- a/gypfiles/verify_source_deps.py +++ b/gypfiles/verify_source_deps.py @@ -34,7 +34,7 @@ GYP_FILES = [ os.path.join(V8_BASE, 'test', 'mkgrokdump', 'mkgrokdump.gyp'), os.path.join(V8_BASE, 'testing', 'gmock.gyp'), os.path.join(V8_BASE, 'testing', 'gtest.gyp'), - os.path.join(V8_BASE, 'tools', 'parser-shell.gyp'), + os.path.join(V8_BASE, 'gypfiles', 'parser-shell.gyp'), ] ALL_GYP_PREFIXES = [