From a141f4c5c589075be81a42225d330dcdf810aff5 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Tue, 2 Aug 2011 20:21:23 -0500 Subject: [PATCH 1/5] Add JRuby 1.6.3 --- bin/ruby-build | 4 ++++ versions/jruby-1.6.3 | 1 + 2 files changed, 5 insertions(+) create mode 100644 versions/jruby-1.6.3 diff --git a/bin/ruby-build b/bin/ruby-build index a883bdd0f0..a7069e11fa 100755 --- a/bin/ruby-build +++ b/bin/ruby-build @@ -65,6 +65,10 @@ build_package_ruby() { } >$LOG_PATH 2>&1 } +build_package_copy() { + cp -R . $PREFIX_PATH +} + usage() { echo "usage: ruby-build DEFINITION-PATH INSTALLATION-PREFIX" exit 1 diff --git a/versions/jruby-1.6.3 b/versions/jruby-1.6.3 new file mode 100644 index 0000000000..a08ca73c2f --- /dev/null +++ b/versions/jruby-1.6.3 @@ -0,0 +1 @@ +install_package "jruby-1.6.3" "http://jruby.org.s3.amazonaws.com/downloads/1.6.3/jruby-bin-1.6.3.tar.gz" copy From f353577f50632828ec31978e0d4290e76174afa2 Mon Sep 17 00:00:00 2001 From: Sam Stephenson Date: Tue, 2 Aug 2011 20:55:10 -0500 Subject: [PATCH 2/5] Add after_install_package hook --- bin/ruby-build | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bin/ruby-build b/bin/ruby-build index a7069e11fa..1dcbb127c2 100755 --- a/bin/ruby-build +++ b/bin/ruby-build @@ -13,6 +13,7 @@ install_package() { extract_package "$package_name" cd "$package_name" build_package "$package_name" $* + after_install_package "$package_name" cd "$cwd" } @@ -69,6 +70,10 @@ build_package_copy() { cp -R . $PREFIX_PATH } +after_install_package() { + local stub=1 +} + usage() { echo "usage: ruby-build DEFINITION-PATH INSTALLATION-PREFIX" exit 1 From 624b61477d4da998b1a8cc3e1c210ce05435118b Mon Sep 17 00:00:00 2001 From: Sam Stephenson Date: Tue, 2 Aug 2011 20:55:28 -0500 Subject: [PATCH 3/5] Quote $PREFIX_PATH in copy --- bin/ruby-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/ruby-build b/bin/ruby-build index 1dcbb127c2..d9c0aeebfd 100755 --- a/bin/ruby-build +++ b/bin/ruby-build @@ -67,7 +67,7 @@ build_package_ruby() { } build_package_copy() { - cp -R . $PREFIX_PATH + cp -R . "$PREFIX_PATH" } after_install_package() { From 0a51ad4811db0babe50134f3ee0b48d6b0e1d12e Mon Sep 17 00:00:00 2001 From: Sam Stephenson Date: Tue, 2 Aug 2011 20:56:09 -0500 Subject: [PATCH 4/5] Symlink jruby to ruby --- versions/jruby-1.6.3 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/versions/jruby-1.6.3 b/versions/jruby-1.6.3 index a08ca73c2f..f18fe85361 100644 --- a/versions/jruby-1.6.3 +++ b/versions/jruby-1.6.3 @@ -1 +1,11 @@ +after_install_package() { + shim_jruby +} + +shim_jruby() { + cd "${PREFIX_PATH}/bin" + sed -i "" 's/^#!\/bin\/bash/#!\/usr\/bin\/env bash/' jruby + ln -fs jruby ruby +} + install_package "jruby-1.6.3" "http://jruby.org.s3.amazonaws.com/downloads/1.6.3/jruby-bin-1.6.3.tar.gz" copy From 45b5a9d64fba501f3b3165f327c01c89988722af Mon Sep 17 00:00:00 2001 From: Sam Stephenson Date: Tue, 2 Aug 2011 20:56:20 -0500 Subject: [PATCH 5/5] Remove Windows files --- versions/jruby-1.6.3 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/versions/jruby-1.6.3 b/versions/jruby-1.6.3 index f18fe85361..27e742c820 100644 --- a/versions/jruby-1.6.3 +++ b/versions/jruby-1.6.3 @@ -1,5 +1,6 @@ after_install_package() { shim_jruby + remove_windows_files } shim_jruby() { @@ -8,4 +9,9 @@ shim_jruby() { ln -fs jruby ruby } +remove_windows_files() { + cd "$PREFIX_PATH" + rm -f bin/*.exe bin/*.dll bin/*.bat bin/jruby.sh +} + install_package "jruby-1.6.3" "http://jruby.org.s3.amazonaws.com/downloads/1.6.3/jruby-bin-1.6.3.tar.gz" copy