Merge branch 'graal'

Closes rbenv#514

Author: mislav

bin/ruby-build

@@ -519,10 +519,29 @@ 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() {
-  cd "${PREFIX_PATH}/bin"
-  { ./ruby gem install jruby-launcher
-  } >&4 2>&1
+  # 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
 }
 
 fix_jruby_shebangs() {

share/ruby-build/jruby-9000+graal-dev

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

test/build.bats

@@ -421,6 +421,22 @@ 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
+
+  assert [ ! -e "$INSTALL_ROOT/build.log" ]
+}
+
 @test "JRuby Java 7 missing" {
   cached_tarball "jruby-9000.dev" bin/jruby