diff options
author | Michaƫl Zasso <targos@protonmail.com> | 2018-03-14 13:04:48 +0100 |
---|---|---|
committer | Myles Borins <mylesborins@google.com> | 2018-04-11 13:23:27 -0400 |
commit | 3e6ff8589442fddcd15828c272bf68c26c30d951 (patch) | |
tree | 064c5b74967251bbe4a3034c4b8fe914d4614d22 /tools/make-v8.sh | |
parent | 17d4368cb170041505866a97de88b13c37873428 (diff) | |
download | android-node-v8-3e6ff8589442fddcd15828c272bf68c26c30d951.tar.gz android-node-v8-3e6ff8589442fddcd15828c272bf68c26c30d951.tar.bz2 android-node-v8-3e6ff8589442fddcd15828c272bf68c26c30d951.zip |
tools: fix make test-v8
PR-URL: https://github.com/nodejs/node/pull/19201
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'tools/make-v8.sh')
-rwxr-xr-x | tools/make-v8.sh | 50 |
1 files changed, 6 insertions, 44 deletions
diff --git a/tools/make-v8.sh b/tools/make-v8.sh index 786171facf..4365412856 100755 --- a/tools/make-v8.sh +++ b/tools/make-v8.sh @@ -1,47 +1,9 @@ #!/bin/bash -# Get V8 branch from v8/include/v8-version.h -MAJOR=$(grep V8_MAJOR_VERSION deps/v8/include/v8-version.h | cut -d ' ' -f 3) -MINOR=$(grep V8_MINOR_VERSION deps/v8/include/v8-version.h | cut -d ' ' -f 3) -BRANCH=$MAJOR.$MINOR +BUILD_ARCH_TYPE=$1 +V8_BUILD_OPTIONS=$2 -# clean up if someone presses ctrl-c -trap cleanup INT - -function cleanup() { - trap - INT - rm .gclient || true - rm .gclient_entries || true - rm -rf _bad_scm/ || true - find v8 -name ".git" | xargs rm -rf || true - echo "git cleanup" - git reset --hard HEAD - git clean -fdq - # unstash local changes - git stash pop - exit 0 -} - -cd deps -# stash local changes -git stash -rm -rf v8 - -echo "Fetching V8 from chromium.googlesource.com" -fetch v8 -if [ "$?" -ne 0 ]; then - echo "V8 fetch failed" - exit 1 -fi -echo "V8 fetched" - -cd v8 - -echo "Checking out branch:$BRANCH" -git checkout remotes/branch-heads/$BRANCH - -echo "Sync dependencies" -gclient sync - -cd .. -cleanup +cd deps/v8 +tools/node/fetch_deps.py . +PATH=~/_depot_tools:$PATH tools/dev/v8gen.py $BUILD_ARCH_TYPE --no-goma $V8_BUILD_OPTIONS +PATH=~/_depot_tools:$PATH ninja -C out.gn/$BUILD_ARCH_TYPE/ d8 cctest inspector-test |