Make sure the vendorized jruby only have 1.9 libs, so no extra space is used. Also make sure the jruby is run in 1.9 mode.

Fixes #2285
This commit is contained in:
Pere Urbon-Bayes 2014-12-23 11:12:39 +01:00 committed by Jordan Sissel
parent 8f9d6cc126
commit 1470518c40
2 changed files with 5 additions and 0 deletions

View file

@ -87,6 +87,7 @@ setup_ruby() {
}
jruby_opts() {
echo "--1.9"
for i in $JAVA_OPTS ; do
echo "-J$i"
done

View file

@ -71,6 +71,8 @@ namespace "vendor" do
download = file_fetch(url, info["sha1"])
parent = vendor(name).gsub(/\/$/, "")
directory parent => "vendor" do
next if parent =~ /lib\/ruby\/1.8/
next if parent =~ /lib\/ruby\/2.0/
mkdir parent
end.invoke unless Rake::Task.task_defined?(parent)
@ -79,6 +81,8 @@ namespace "vendor" do
out = entry.full_name.gsub(prefix_re, "")
next if out =~ /^samples/
next if out =~ /@LongLink/
next if out =~ /lib\/ruby\/1.8/
next if out =~ /lib\/ruby\/2.0/
vendor(name, out)
end # untar
end # jruby