Skip to content

Make building of jruby-launcher gem optional #1293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Make building of jruby-launcher gem optional #1293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59ed6cc
Parameterize building of the jruby-launcher gem
jayjlawrence Mar 17, 2019
811e071
Advertise that the jruby-launcher gem is being installed
jayjlawrence Mar 17, 2019
9076127
documentation
jayjlawrence Mar 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ The build process may be configured through the following environment variables:
| `RUBY_CONFIGURE_OPTS` | Additional `./configure` options (applies only to Ruby source). |
| `RUBY_MAKE_OPTS` | Additional `make` options (applies only to Ruby source). |
| `RUBY_MAKE_INSTALL_OPTS` | Additional `make install` options (applies only to Ruby source). |
| `JRUBY_DISABLE_LAUNCHER` | Do not install the jruby-launcher gem when installing JRuby |

#### Applying Patches

Expand Down
7 changes: 6 additions & 1 deletion bin/ruby-build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,12 +727,17 @@ build_package_jruby() {
cd "${PREFIX_PATH}/bin"
ln -fs jruby ruby
chmod +x ruby
install_jruby_launcher
[ -z "${JRUBY_LAUNCHER_DISABLED}" ] && install_jruby_launcher
remove_windows_files
fix_jruby_shebangs
}

build_package_disable_launcher() {
JRUBY_LAUNCHER_DISABLED=true
}

install_jruby_launcher() {
echo "Installing the jruby-launcher gem"
cd "${PREFIX_PATH}/bin"
{ ./ruby gem install jruby-launcher
} >&4 2>&1
Expand Down
2 changes: 1 addition & 1 deletion share/ruby-build/jruby-1.6.8
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
install_package "jruby-1.6.8" "https://s3.amazonaws.com/jruby-org/downloads/1.6.8/jruby-bin-1.6.8.tar.gz#e3b05f9cf0ba9b02e6cba75d5b62e2abf8ac7a4483c3713dc4eb83e3b8b162d4" warn_eol jruby
install_package "jruby-1.6.8" "https://s3.amazonaws.com/jruby-org/downloads/1.6.8/jruby-bin-1.6.8.tar.gz#e3b05f9cf0ba9b02e6cba75d5b62e2abf8ac7a4483c3713dc4eb83e3b8b162d4" warn_eol disable_launcher jruby