summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXuân Baldauf <xuan--2016--json--xb--github.com@software.baldauf.org>2017-03-27 19:57:40 +0200
committerXuân Baldauf <xuan--2016--json--xb--github.com@software.baldauf.org>2017-03-27 19:57:40 +0200
commit27eeabf4c9a4916adf5a42554bfa451034653167 (patch)
tree204920e772c964202032c5006bcdcaf06c89138b
parentc9fc0f047b11497bb30c75880a9f5af7698d350b (diff)
downloadjson-27eeabf4c9a4916adf5a42554bfa451034653167.tar.gz
Back-out change of directory of json-java.gemspec.
-rw-r--r--Gemfile2
-rw-r--r--Rakefile2
-rw-r--r--json-java.gemspec (renamed from java/json.gemspec)6
3 files changed, 3 insertions, 7 deletions
diff --git a/Gemfile b/Gemfile
index 747bc71..64f98d6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ source 'https://rubygems.org'
case ENV['JSON']
when 'ext', nil
if ENV['RUBY_ENGINE'] == 'jruby'
- gemspec :name => 'json', :path => 'java'
+ gemspec :name => 'json-java'
else
gemspec :name => 'json'
end
diff --git a/Rakefile b/Rakefile
index 017d14a..c6c195f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -251,7 +251,7 @@ if defined?(RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
desc "Package the jruby gem"
task :jruby_gem => :create_jar do
- sh 'gem build java/json.gemspec'
+ sh 'gem build json-java.gemspec'
mkdir_p 'pkg'
mv "json-#{PKG_VERSION}-java.gem", 'pkg'
end
diff --git a/java/json.gemspec b/json-java.gemspec
index e0e4efe..1524b1f 100644
--- a/java/json.gemspec
+++ b/json-java.gemspec
@@ -3,11 +3,7 @@ require "rubygems"
spec = Gem::Specification.new do |s|
s.name = "json"
- s.version = if File.exist?('VERSION')
- File.read("VERSION").chomp
- else
- File.read("../VERSION").chomp
- end
+ s.version = File.read("VERSION").chomp
s.summary = "JSON implementation for JRuby"
s.description = "A JSON implementation as a JRuby extension."
s.author = "Daniel Luz"