mirrors/rbenv-ruby-build
1
0
Fork 0
mirror of https://github.com/rbenv/ruby-build.git synced 2025-09-03 07:41:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #864

Browse source
This commit is contained in:
Mislav Marohnić 2016-01-30 18:23:34 +11:00
commit 80796ac1cf
5 changed files with 3 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
bin/ruby-build
View file

@ -659,29 +659,10 @@ build_package_jruby() {
fix_jruby_shebangs
}
graal_architecture() {
if [ "$(uname -m)" != "x86_64" ]; then
echo "no nightly builds available" >&2
exit 1
fi
case "$(uname -s)" in
"Darwin") echo "macosx-x86_64";;
"Linux") echo "linux-x86_64";;
*)
echo "no nightly builds available" >&2
exit 1;;
esac
}
install_jruby_launcher() {
# If this version of JRuby has been modified for Graal, don't overwrite the
# launcher scripts
if ! grep -q graalvm "${PREFIX_PATH}/bin/jruby"; then
cd "${PREFIX_PATH}/bin"
{ ./ruby gem install jruby-launcher
} >&4 2>&1
fi
cd "${PREFIX_PATH}/bin"
{ ./ruby gem install jruby-launcher
} >&4 2>&1
}
fix_jruby_shebangs() {

1
share/ruby-build/jruby-9.0.0.0+graal-dev
View file

@ -1 +0,0 @@
install_package "jruby-9.0.0.0-SNAPSHOT" "http://lafo.ssw.uni-linz.ac.at/graalvm/jruby-dist-9.0.0.0-SNAPSHOT+graal-$(graal_architecture)-bin.tar.gz" jruby

1
share/ruby-build/jruby-9.0.2.0+graal-dev
View file

@ -1 +0,0 @@
install_package "jruby-9.0.2.0-SNAPSHOT" "http://lafo.ssw.uni-linz.ac.at/graalvm/jruby-dist-9.0.2.0-SNAPSHOT+graal-$(graal_architecture)-bin.tar.gz" jruby

1
share/ruby-build/jruby-master+graal-dev
View file

@ -1 +0,0 @@
install_package "jruby-master" "http://lafo.ssw.uni-linz.ac.at/graalvm/jruby-dist-master+graal-$(graal_architecture)-bin.tar.gz" jruby

16
test/build.bats
View file

@ -533,22 +533,6 @@ nice gem things
OUT
}
@test "JRuby+Graal does not install launchers" {
executable "${RUBY_BUILD_CACHE_PATH}/jruby-9000.dev/bin/jruby" <<OUT
#!${BASH}
# graalvm
echo jruby "\$@" >> ../build.log
OUT
cached_tarball "jruby-9000.dev"
run_inline_definition <<DEF
install_package "jruby-9000.dev" "http://lafo.ssw.uni-linz.ac.at/jruby-9000+graal-macosx-x86_64.tar.gz" jruby
DEF
assert_success
refute [ -e "$INSTALL_ROOT/build.log" ]
}
@test "JRuby Java 7 missing" {
cached_tarball "jruby-9000.dev" bin/jruby