organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #2199 from JasonLunn/patch-1

Browse source 
Set platform to "java" under JRuby
This commit is contained in:
Joshua Haberman 2016-10-04 11:21:34 -07:00 • committed by GitHub
commit 60bc203346
3 changed files with 5 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile.am
View file

@ -672,7 +672,6 @@ python_EXTRA_DIST= \
ruby_EXTRA_DIST= \
ruby/Gemfile \
ruby/Gemfile.lock \
ruby/.gitignore \
ruby/README.md \
ruby/Rakefile \

30
ruby/Gemfile.lock
View file

@ -1,30 +0,0 @@
PATH
remote: .
specs:
google-protobuf (3.0.0.alpha.5.0.5)
GEM
remote: https://rubygems.org/
specs:
power_assert (0.2.2)
rake (10.4.2)
rake-compiler (0.9.5)
rake
rake-compiler-dock (0.5.1)
rubygems-tasks (0.2.4)
test-unit (3.0.9)
power_assert
PLATFORMS
java
ruby
DEPENDENCIES
google-protobuf!
rake-compiler
rake-compiler-dock
rubygems-tasks
test-unit
BUNDLED WITH
1.11.2

9
ruby/google-protobuf.gemspec
View file

@ -10,16 +10,17 @@ Gem::Specification.new do |s|
s.require_paths = ["lib"]
s.files = Dir.glob('lib/**/*.rb')
if RUBY_PLATFORM == "java"
s.platform = "java"
s.files += ["lib/google/protobuf_java.jar"]
else
s.files += Dir.glob('ext/**/*')
s.extensions= ["ext/google/protobuf_c/extconf.rb"]
s.add_development_dependency "rake-compiler-dock"
s.add_development_dependency "rake-compiler-dock", "~> 0.5.1"
end
s.test_files = ["tests/basic.rb",
"tests/stress.rb",
"tests/generated_code_test.rb"]
s.add_development_dependency "rake-compiler"
s.add_development_dependency "test-unit"
s.add_development_dependency "rubygems-tasks"
s.add_development_dependency "rake-compiler", "~> 0.9.5"
s.add_development_dependency "test-unit", "~> 3.0.9"
s.add_development_dependency "rubygems-tasks", "~> 0.2.4"
end