Skip to content

Additional fixes and tweaks for the skinny launcher #49

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

Merged
merged 4 commits into from
Apr 4, 2025
Merged

Additional fixes and tweaks for the skinny launcher #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
834854e
Omit old launcher specs except on Windows
headius Apr 1, 2025
20cc363
Bump version for 2.0 experiment
headius Apr 3, 2025
0004209
Stop modifying RubyGems defaults
headius Apr 3, 2025
dcbec67
Copy jruby.sh into place if it is not present
headius Apr 3, 2025
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
20 changes: 1 addition & 19 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ PREFIX = notspecified
BINDIR = $(PREFIX)/bin
JRUBY_VERSION = notspecified
JRUBY_MODULE = 1
INSTALLDIR = $(PREFIX)/lib/ruby/shared/rubygems/defaults
INSTALLDIR9000 = $(PREFIX)/lib/ruby/stdlib/rubygems/defaults
OLDINSTALLDIR = $(PREFIX)/lib/ruby/site_ruby/1.8/rubygems/defaults

ifeq (true,$(shell test -x $(BINDIR)/jruby && echo true))
RAKE=$(BINDIR)/jruby -S rake
Expand Down Expand Up @@ -42,22 +39,7 @@ install:
@if [ -f $(BINDIR)/jruby -a ! -w $(BINDIR)/jruby ]; then echo "Cannot write to '$(BINDIR)/jruby'."; exit 1; fi
cp ./jruby $(BINDIR)/jruby
@if [ x$(PREFIX) = xnotspecified ]; then echo "Please define where to install by passing PREFIX=<jruby-home>."; exit 1; fi
@if [ ! -w $(INSTALLDIR) ]; then \
if [ ! -w $(OLDINSTALLDIR) ]; then \
if [ ! -w $(INSTALLDIR9000) ]; then \
echo "Neither '$(INSTALLDIR9000)' nor '$(INSTALLDIR)' nor '$(OLDINSTALLDIR)' exist and are writable"; exit 1; \
else \
echo "cp ./lib/rubygems/defaults/jruby_native.rb $(INSTALLDIR9000)"; \
cp ./lib/rubygems/defaults/jruby_native.rb $(INSTALLDIR9000); \
fi; \
else \
echo "cp ./lib/rubygems/defaults/jruby_native.rb $(OLDINSTALLDIR)"; \
cp ./lib/rubygems/defaults/jruby_native.rb $(OLDINSTALLDIR); \
fi; \
else \
echo "cp ./lib/rubygems/defaults/jruby_native.rb $(INSTALLDIR)"; \
cp ./lib/rubygems/defaults/jruby_native.rb $(INSTALLDIR); \
fi;
@if [ ! -f $(BINDIR)/jruby.sh ]; then cp ./exe/jruby.sh $(BINDIR)/jruby.sh; fi

test:
$(RAKE)
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ task :gemspec => './lib/jruby-launcher.rb' do
s.summary = %q{Native launcher for JRuby}
s.email = ["nick@nicksieger.com", "vsizikov@gmail.com"]
s.extensions = ["extconf.rb"]
s.files = FileList["COPYING", "README.md", "Makefile", "Rakefile", "*.c", "*.cpp", "*.h", "inc/*.*", "**/*.rb", "resources/*.*"]
s.files = FileList["COPYING", "README.md", "Makefile", "Rakefile", "*.c", "*.cpp", "*.h", "inc/*.*", "**/*.rb", "resources/*.*", "exe/jruby.sh"]
s.homepage = %q{http://jruby.org}
end
end
Expand Down
Loading