Skip to content

Commit 11528d4

Browse files
committed
Add shared build_package_jruby for all JRuby definitions
1 parent 7b3dc50 commit 11528d4

File tree

3 files changed

+21
-36
lines changed

3 files changed

+21
-36
lines changed

bin/ruby-build

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,25 @@ build_package_rbx() {
147147
} >&4 2>&1
148148
}
149149

150+
build_package_jruby() {
151+
build_package_copy
152+
cd "${PREFIX_PATH}/bin"
153+
ln -fs jruby ruby
154+
install_jruby_launcher
155+
remove_windows_files
156+
}
157+
158+
install_jruby_launcher() {
159+
cd "${PREFIX_PATH}/bin"
160+
{ ./ruby gem install jruby-launcher
161+
} >&4 2>&1
162+
}
163+
164+
remove_windows_files() {
165+
cd "$PREFIX_PATH"
166+
rm -f bin/*.exe bin/*.dll bin/*.bat bin/jruby.sh
167+
}
168+
150169
build_package_copy() {
151170
cp -R . "$PREFIX_PATH"
152171
}

share/ruby-build/jruby-1.6.3

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,2 @@
1-
after_install_package() {
2-
shim_jruby
3-
remove_windows_files
4-
}
5-
6-
shim_jruby() {
7-
cd "${PREFIX_PATH}/bin"
8-
ln -fs jruby ruby
9-
{ ./ruby gem install jruby-launcher
10-
} >&4 2>&1
11-
}
12-
13-
remove_windows_files() {
14-
cd "$PREFIX_PATH"
15-
rm -f bin/*.exe bin/*.dll bin/*.bat bin/jruby.sh
16-
}
17-
18-
install_package "jruby-1.6.3" "http://jruby.org.s3.amazonaws.com/downloads/1.6.3/jruby-bin-1.6.3.tar.gz" copy
1+
install_package "jruby-1.6.3" "http://jruby.org.s3.amazonaws.com/downloads/1.6.3/jruby-bin-1.6.3.tar.gz" jruby
192
install_package "rubygems-1.6.2" "http://production.cf.rubygems.org/rubygems/rubygems-1.6.2.tgz" ruby

share/ruby-build/jruby-1.6.4

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,2 @@
1-
after_install_package() {
2-
shim_jruby
3-
remove_windows_files
4-
}
5-
6-
shim_jruby() {
7-
cd "${PREFIX_PATH}/bin"
8-
ln -fs jruby ruby
9-
{ ./ruby gem install jruby-launcher
10-
} >&4 2>&1
11-
}
12-
13-
remove_windows_files() {
14-
cd "$PREFIX_PATH"
15-
rm -f bin/*.exe bin/*.dll bin/*.bat bin/jruby.sh
16-
}
17-
18-
install_package "jruby-1.6.4" "http://jruby.org.s3.amazonaws.com/downloads/1.6.4/jruby-bin-1.6.4.tar.gz" copy
1+
install_package "jruby-1.6.4" "http://jruby.org.s3.amazonaws.com/downloads/1.6.4/jruby-bin-1.6.4.tar.gz" jruby
192
install_package "rubygems-1.6.2" "http://production.cf.rubygems.org/rubygems/rubygems-1.6.2.tgz" ruby

0 commit comments

Comments
 (0)