jruby-launcher 1.0.9-java → 1.0.10-java

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/Makefile +14 -4
  2. data/extconf.rb +2 -1
  3. data/lib/jruby-launcher.rb +1 -1
  4. metadata +6 -4
data/Makefile CHANGED
@@ -1,7 +1,8 @@
1
1
  # These line gets substituted with the actual Config::CONFIG items location by extconf.rb
2
2
  PREFIX = notspecified
3
3
  BINDIR = $(PREFIX)/bin
4
- SITELIBDIR = $(PREFIX)/lib/ruby/site_ruby/1.8
4
+ INSTALLDIR = $(PREFIX)/lib/ruby/shared/rubygems/defaults
5
+ OLDINSTALLDIR = $(PREFIX)/lib/ruby/site_ruby/1.8/rubygems/defaults
5
6
 
6
7
  ifeq (true,$(shell test -x $(BINDIR)/jruby && echo true))
7
8
  RAKE=$(BINDIR)/jruby -S rake
@@ -37,9 +38,18 @@ install:
37
38
  @if [ ! -w $(BINDIR) ]; then echo "'$(BINDIR)' does not exist or cannot write to '$(BINDIR)'."; exit 1; fi
38
39
  @if [ -f $(BINDIR)/jruby -a ! -w $(BINDIR)/jruby ]; then echo "Cannot write to '$(BINDIR)/jruby'."; exit 1; fi
39
40
  cp ./jruby $(BINDIR)/jruby
40
- @if [ x$(SITELIBDIR) = xnotspecified/lib/ruby/site_ruby/1.8 ]; then echo "Please define where to install by passing PREFIX=<jruby-home>."; exit 1; fi
41
- @if [ ! -w $(SITELIBDIR) ]; then echo "'$(SITELIBDIR)' does not exist or cannot write to '$(SITELIBDIR)'."; exit 1; fi
42
- cp ./lib/rubygems/defaults/jruby_native.rb $(SITELIBDIR)/rubygems/defaults
41
+ @if [ x$(PREFIX) = xnotspecified ]; then echo "Please define where to install by passing PREFIX=<jruby-home>."; exit 1; fi
42
+ @if [ ! -w $(INSTALLDIR) ]; then \
43
+ if [ ! -w $(OLDINSTALLDIR) ]; then \
44
+ echo "Neither '$(INSTALLDIR)' nor '$(OLDINSTALLDIR)' exist and are writable"; exit 1; \
45
+ else \
46
+ echo "cp ./lib/rubygems/defaults/jruby_native.rb $(OLDINSTALLDIR)"; \
47
+ cp ./lib/rubygems/defaults/jruby_native.rb $(OLDINSTALLDIR); \
48
+ fi; \
49
+ else \
50
+ echo "cp ./lib/rubygems/defaults/jruby_native.rb $(INSTALLDIR)"; \
51
+ cp ./lib/rubygems/defaults/jruby_native.rb $(INSTALLDIR); \
52
+ fi;
43
53
 
44
54
  test:
45
55
  $(RAKE)
data/extconf.rb CHANGED
@@ -2,5 +2,6 @@ require 'rbconfig'
2
2
 
3
3
  mf = File.read('Makefile')
4
4
  mf = mf.gsub(/^BINDIR\s*=.*$/, "BINDIR = #{Config::CONFIG['bindir']}")
5
- mf = mf.gsub(/^SITELIBDIR\s*=.*$/, "SITELIBDIR = #{Config::CONFIG['sitelibdir']}")
5
+ mf = mf.gsub(/^PREFIX\s*=.*$/, "PREFIX = #{File.dirname(Config::CONFIG['libdir'])}")
6
+ puts mf
6
7
  File.open('Makefile', 'wb') {|f| f << mf}
@@ -1,3 +1,3 @@
1
1
  module JRubyLauncher
2
- VERSION = "1.0.9"
2
+ VERSION = "1.0.10"
3
3
  end
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: jruby-launcher
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 1.0.9
5
+ version: 1.0.10
6
6
  platform: java
7
7
  authors:
8
8
  - Nick Sieger
@@ -11,7 +11,7 @@ autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
13
 
14
- date: 2011-10-25 00:00:00 Z
14
+ date: 2012-01-03 00:00:00 Z
15
15
  dependencies: []
16
16
 
17
17
  description: Builds and installs a native launcher for JRuby on your system
@@ -61,6 +61,8 @@ files:
61
61
  homepage: http://jruby.org
62
62
  licenses: []
63
63
 
64
+ metadata: {}
65
+
64
66
  post_install_message:
65
67
  rdoc_options: []
66
68
 
@@ -81,9 +83,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
81
83
  requirements: []
82
84
 
83
85
  rubyforge_project: jruby-extras
84
- rubygems_version: 1.8.9
86
+ rubygems_version: 1.8.10
85
87
  signing_key:
86
- specification_version: 3
88
+ specification_version: 4
87
89
  summary: Native launcher for JRuby
88
90
  test_files: []
89
91