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

Commit 30458ae

Browse files
committed
Revert "Simplify dependency setup"
This reverts commit a3fe34e. This fixes #246
1 parent 1b38f31 commit 30458ae

8 files changed

Lines changed: 17 additions & 42 deletions

File tree

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,6 @@ 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: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ 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"
105106
sh "git clean -dxf -e .bundle -e vendor/bundle"
106107
end
107108

ext/libv8/builder.rb

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,19 @@ 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/v8', __FILE__)) do
116-
unless system "git checkout #{source_version}"
117-
fail "unable to checkout source for v8 #{source_version}"
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
118127
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
121128
end
122129
end
123130

vendor/.gclient

Lines changed: 0 additions & 9 deletions
This file was deleted.

vendor/.gclient_entries

Lines changed: 0 additions & 23 deletions
This file was deleted.

vendor/depot_tools

Submodule depot_tools updated from c1a82cb to 83fd81f

vendor/v8

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)