Skip to content
This repository was archived by the owner on Dec 4, 2023. It is now read-only.

Commit a3fe34e

Browse files
committed
Simplify dependency setup
1 parent c4f42dc commit a3fe34e

8 files changed

Lines changed: 42 additions & 17 deletions

File tree

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,3 @@ lib/libv8/VERSION
1313
/release/**/libv8
1414
/release/**/.vagrant
1515
/release/**/.scaleway
16-
/vendor/.gclient
17-
/vendor/.gclient_entries
18-
/vendor/v8/

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "vendor/depot_tools"]
22
path = vendor/depot_tools
33
url = https://chromium.googlesource.com/chromium/tools/depot_tools.git
4+
[submodule "vendor/v8"]
5+
path = vendor/v8
6+
url = https://chromium.googlesource.com/v8/v8.git

Rakefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ end
102102
desc "clean up artifacts of the build"
103103
task :clean => [:clean_submodules] do
104104
sh "rm -rf pkg"
105-
sh "rm -rf vendor/v8"
106105
sh "git clean -dxf -e .bundle -e vendor/bundle"
107106
end
108107

ext/libv8/builder.rb

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -112,19 +112,12 @@ def source_version
112112
#
113113
def setup_build_deps!
114114
ENV['PATH'] = "#{File.expand_path('../../../vendor/depot_tools', __FILE__)}:#{ENV['PATH']}"
115-
Dir.chdir(File.expand_path('../../../vendor', __FILE__)) do
116-
unless Dir.exists? 'v8'
117-
system "env #{gyp_defines} fetch v8" or fail "unable to fetch v8 source"
118-
else
119-
system "env #{gyp_defines} gclient fetch" or fail "could not fetch v8 build dependencies commits"
120-
end
121-
Dir.chdir('v8') do
122-
unless system "git checkout #{source_version}"
123-
fail "unable to checkout source for v8 #{source_version}"
124-
end
125-
system "env #{gyp_defines} gclient sync" or fail "could not sync v8 build dependencies"
126-
system "git checkout Makefile" # Work around a weird bug on FreeBSD
115+
Dir.chdir(File.expand_path('../../../vendor/v8', __FILE__)) do
116+
unless system "git checkout #{source_version}"
117+
fail "unable to checkout source for v8 #{source_version}"
127118
end
119+
system "env #{gyp_defines} gclient sync -n" or fail "could not sync v8 build dependencies"
120+
system "git checkout Makefile" # Work around a weird bug on FreeBSD
128121
end
129122
end
130123

vendor/.gclient

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
solutions = [
2+
{
3+
"url": "https://chromium.googlesource.com/v8/v8.git",
4+
"managed": False,
5+
"name": "v8",
6+
"deps_file": "DEPS",
7+
"custom_deps": {},
8+
},
9+
]

vendor/.gclient_entries

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
entries = {
2+
'v8': 'https://chromium.googlesource.com/v8/v8.git',
3+
'v8/base/trace_event/common': 'https://chromium.googlesource.com/chromium/src/base/trace_event/common.git@39a3450531fc73432e963db8668695d2e8f13053',
4+
'v8/build': 'https://chromium.googlesource.com/chromium/src/build.git@1caf3a69f3b0379c9fef2493aa1b3cda96e17d7b',
5+
'v8/buildtools': 'https://chromium.googlesource.com/chromium/buildtools.git@98f00fa10dbad2cdbb2e297a66c3d6d5bc3994f3',
6+
'v8/test/benchmarks/data': 'https://chromium.googlesource.com/v8/deps/third_party/benchmarks.git@05d7188267b4560491ff9155c5ee13e207ecd65f',
7+
'v8/test/mozilla/data': 'https://chromium.googlesource.com/v8/deps/third_party/mozilla-tests.git@f6c578a10ea707b1a8ab0b88943fe5115ce2b9be',
8+
'v8/test/test262/data': 'https://chromium.googlesource.com/external/github.com/tc39/test262.git@230f9fc5688ce76bfaa99aba5f680a159eaac9e2',
9+
'v8/test/test262/harness': 'https://chromium.googlesource.com/external/github.com/test262-utils/test262-harness-py.git@0f2acdd882c84cff43b9d60df7574a1901e2cdcd',
10+
'v8/test/wasm-js': 'https://chromium.googlesource.com/external/github.com/WebAssembly/spec.git@07fd6430f879d36928d179a62d9bdeed82286065',
11+
'v8/testing/gmock': 'https://chromium.googlesource.com/external/googlemock.git@0421b6f358139f02e102c9c332ce19a33faf75be',
12+
'v8/testing/gtest': 'https://chromium.googlesource.com/external/github.com/google/googletest.git@6f8a66431cb592dad629028a50b3dd418a408c87',
13+
'v8/third_party/icu': 'https://chromium.googlesource.com/chromium/deps/icu.git@c844075aa0f1758d04f9192825f1b1e7e607992e',
14+
'v8/third_party/instrumented_libraries': 'https://chromium.googlesource.com/chromium/src/third_party/instrumented_libraries.git@644afd349826cb68204226a16c38bde13abe9c3c',
15+
'v8/third_party/jinja2': 'https://chromium.googlesource.com/chromium/src/third_party/jinja2.git@d34383206fa42d52faa10bb9931d6d538f3a57e0',
16+
'v8/third_party/markupsafe': 'https://chromium.googlesource.com/chromium/src/third_party/markupsafe.git@8f45f5cfa0009d2a70589bcda0349b8cb2b72783',
17+
'v8/tools/clang': 'https://chromium.googlesource.com/chromium/src/tools/clang.git@05f306039aa5029fa88768690e5c512097419f9d',
18+
'v8/tools/gyp': 'https://chromium.googlesource.com/external/gyp.git@eb296f67da078ec01f5e3a9ea9cdc6d26d680161',
19+
'v8/tools/swarming_client': 'https://chromium.googlesource.com/external/swarming.client.git@a941a089ff1000403078b74cb628eb430f07d271',
20+
'v8/buildtools/clang_format/script': 'https://chromium.googlesource.com/chromium/llvm-project/cfe/tools/clang-format.git@c09c8deeac31f05bd801995c475e7c8070f9ecda',
21+
'v8/buildtools/third_party/libc++/trunk': 'https://chromium.googlesource.com/chromium/llvm-project/libcxx.git@b1ece9c037d879843b0b0f5a2802e1e9d443b75a',
22+
'v8/buildtools/third_party/libc++abi/trunk': 'https://chromium.googlesource.com/chromium/llvm-project/libcxxabi.git@0edb61e2e581758fc4cd4cd09fc588b3fc91a653',
23+
}

vendor/depot_tools

Submodule depot_tools updated from cfbb775 to 290f5f5

vendor/v8

Submodule v8 added at d96f5c4

0 commit comments

Comments
 (0)