1
0
Fork 0
mirror of https://github.com/rubyjs/libv8 synced 2023-03-27 23:21:48 -04:00

Revert "Simplify dependency setup"

This reverts commit a3fe34e327.
This fixes #246
This commit is contained in:
Petko Bordjukov 2017-10-24 00:01:15 +03:00
parent 5066c6ab73
commit 8aa6f6142c
8 changed files with 17 additions and 43 deletions

3
.gitignore vendored
View file

@ -13,3 +13,6 @@ lib/libv8/VERSION
/release/**/libv8
/release/**/.vagrant
/release/**/.scaleway
/vendor/.gclient
/vendor/.gclient_entries
/vendor/v8/

3
.gitmodules vendored
View file

@ -1,6 +1,3 @@
[submodule "vendor/depot_tools"]
path = vendor/depot_tools
url = https://chromium.googlesource.com/chromium/tools/depot_tools.git
[submodule "vendor/v8"]
path = vendor/v8
url = https://chromium.googlesource.com/v8/v8.git

View file

@ -102,6 +102,7 @@ end
desc "clean up artifacts of the build"
task :clean => [:clean_submodules] do
sh "rm -rf pkg"
sh "rm -rf vendor/v8"
sh "git clean -dxf -e .bundle -e vendor/bundle"
end

View file

@ -112,12 +112,19 @@ module Libv8
#
def setup_build_deps!
ENV['PATH'] = "#{File.expand_path('../../../vendor/depot_tools', __FILE__)}:#{ENV['PATH']}"
Dir.chdir(File.expand_path('../../../vendor/v8', __FILE__)) do
unless system "git checkout #{source_version}"
fail "unable to checkout source for v8 #{source_version}"
Dir.chdir(File.expand_path('../../../vendor', __FILE__)) do
unless Dir.exists? 'v8'
system "env #{gyp_defines} fetch v8" or fail "unable to fetch v8 source"
else
system "env #{gyp_defines} gclient fetch" or fail "could not fetch v8 build dependencies commits"
end
Dir.chdir('v8') do
unless system "git checkout #{source_version}"
fail "unable to checkout source for v8 #{source_version}"
end
system "env #{gyp_defines} gclient sync" or fail "could not sync v8 build dependencies"
system "git checkout Makefile" # Work around a weird bug on FreeBSD
end
system "env #{gyp_defines} gclient sync -n" or fail "could not sync v8 build dependencies"
system "git checkout Makefile" # Work around a weird bug on FreeBSD
end
end

9
vendor/.gclient vendored
View file

@ -1,9 +0,0 @@
solutions = [
{
"url": "https://chromium.googlesource.com/v8/v8.git",
"managed": False,
"name": "v8",
"deps_file": "DEPS",
"custom_deps": {},
},
]

View file

@ -1,24 +0,0 @@
entries = {
'v8': 'https://chromium.googlesource.com/v8/v8.git',
'v8/base/trace_event/common': 'https://chromium.googlesource.com/chromium/src/base/trace_event/common.git@65d1d42a5df6c0a563a6fdfa58a135679185e5d9',
'v8/build': 'https://chromium.googlesource.com/chromium/src/build.git@1808a907ce42f13b224c263e9843d718fc6d9c39',
'v8/buildtools': 'https://chromium.googlesource.com/chromium/buildtools.git@5ad14542a6a74dd914f067b948c5d3e8d170396b',
'v8/test/benchmarks/data': 'https://chromium.googlesource.com/v8/deps/third_party/benchmarks.git@05d7188267b4560491ff9155c5ee13e207ecd65f',
'v8/test/mozilla/data': 'https://chromium.googlesource.com/v8/deps/third_party/mozilla-tests.git@f6c578a10ea707b1a8ab0b88943fe5115ce2b9be',
'v8/test/test262/data': 'https://chromium.googlesource.com/external/github.com/tc39/test262.git@1b911a8f8abf4cb63882cfbe72dcd4c82bb8ad91',
'v8/test/test262/harness': 'https://chromium.googlesource.com/external/github.com/test262-utils/test262-harness-py.git@0f2acdd882c84cff43b9d60df7574a1901e2cdcd',
'v8/test/wasm-js': 'https://chromium.googlesource.com/external/github.com/WebAssembly/spec.git@aadd3a340c78e53078a7bb6c17cc30f105c2960c',
'v8/testing/gmock': 'https://chromium.googlesource.com/external/googlemock.git@0421b6f358139f02e102c9c332ce19a33faf75be',
'v8/testing/gtest': 'https://chromium.googlesource.com/external/github.com/google/googletest.git@6f8a66431cb592dad629028a50b3dd418a408c87',
'v8/third_party/icu': 'https://chromium.googlesource.com/chromium/deps/icu.git@dfa798fe694702b43a3debc3290761f22b1acaf8',
'v8/third_party/instrumented_libraries': 'https://chromium.googlesource.com/chromium/src/third_party/instrumented_libraries.git@644afd349826cb68204226a16c38bde13abe9c3c',
'v8/third_party/jinja2': 'https://chromium.googlesource.com/chromium/src/third_party/jinja2.git@d34383206fa42d52faa10bb9931d6d538f3a57e0',
'v8/third_party/markupsafe': 'https://chromium.googlesource.com/chromium/src/third_party/markupsafe.git@8f45f5cfa0009d2a70589bcda0349b8cb2b72783',
'v8/tools/clang': 'https://chromium.googlesource.com/chromium/src/tools/clang.git@844603c1fcd47f578931b3ccd583e19f816a3842',
'v8/tools/gyp': 'https://chromium.googlesource.com/external/gyp.git@eb296f67da078ec01f5e3a9ea9cdc6d26d680161',
'v8/tools/swarming_client': 'https://chromium.googlesource.com/external/swarming.client.git@a56c2b39ca23bdf41458421a7f825ddbf3f43f28',
'v8/buildtools/clang_format/script': 'https://chromium.googlesource.com/chromium/llvm-project/cfe/tools/clang-format.git@0653eee0c81ea04715c635dd0885e8096ff6ba6d',
'v8/buildtools/third_party/libc++/trunk': 'https://chromium.googlesource.com/chromium/llvm-project/libcxx.git@3a07dd740be63878167a0ea19fe81869954badd7',
'v8/buildtools/third_party/libc++abi/trunk': 'https://chromium.googlesource.com/chromium/llvm-project/libcxxabi.git@4072e8fd76febee37f60aeda76d6d9f5e3791daa',
'v8/buildtools/third_party/libunwind/trunk': 'https://chromium.googlesource.com/external/llvm.org/libunwind.git@41f982e5887185b904a456e20dfcd58e6be6cc19',
}

2
vendor/depot_tools vendored

@ -1 +1 @@
Subproject commit c1a82cb1a9e7234c0b9a633f684225dee1185ab1
Subproject commit 83fd81f8a4eef6c8f176a7257662b18cac3e89be

1
vendor/v8 vendored

@ -1 +0,0 @@
Subproject commit 8451c08ed1887eb8c5d9de2ff452306fa833ef4c