diff options
author | Joshua Haberman <jhaberman@gmail.com> | 2016-02-05 17:10:04 -0800 |
---|---|---|
committer | Joshua Haberman <jhaberman@gmail.com> | 2016-02-05 17:10:04 -0800 |
commit | 6efe3aaf3d404bf3bf73a7085bf5cb2992b37acb (patch) | |
tree | 4b5731d9673ea1ffada7cac3d9cc32ae5d87c046 | |
parent | 70a4b03086fae034d1cdf03b6a65d0eb7e8e92e7 (diff) | |
parent | bbb188acddce91bea47bd708d217e33b9eab4442 (diff) | |
download | protobuf-6efe3aaf3d404bf3bf73a7085bf5cb2992b37acb.tar.gz protobuf-6efe3aaf3d404bf3bf73a7085bf5cb2992b37acb.tar.bz2 protobuf-6efe3aaf3d404bf3bf73a7085bf5cb2992b37acb.zip |
Merge pull request #1 from nicolasnoble/bin-gems
Few fixes.
-rw-r--r-- | ruby/Rakefile | 8 | ||||
-rw-r--r-- | ruby/google-protobuf.gemspec | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/ruby/Rakefile b/ruby/Rakefile index 44497dea..81c3119e 100644 --- a/ruby/Rakefile +++ b/ruby/Rakefile @@ -20,11 +20,17 @@ else Rake::ExtensionTask.new("protobuf_c", spec) do |ext| ext.ext_dir = "ext/google/protobuf_c" ext.lib_dir = "lib/google" + ext.cross_compile = true + ext.cross_platform = [ + 'x86-mingw32', 'x64-mingw32', + 'x86_64-linux', 'x86-linux', + 'universal-darwin' + ] end task 'gem:windows' do require 'rake_compiler_dock' - RakeCompilerDock.sh "bundle && rake cross native gem" + RakeCompilerDock.sh "bundle && rake cross native gem RUBY_CC_VERSION=2.3.0:2.2.2:2.1.6" end end diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec index 0762da97..7b64ee77 100644 --- a/ruby/google-protobuf.gemspec +++ b/ruby/google-protobuf.gemspec @@ -8,11 +8,11 @@ Gem::Specification.new do |s| s.authors = ["Protobuf Authors"] s.email = "protobuf@googlegroups.com" s.require_paths = ["lib"] - s.files = `git ls-files -z`.split("\x0").find_all{|f| f =~ /lib\/.+\.rb/} + s.files = Dir.glob('lib/**/*.rb') if RUBY_PLATFORM == "java" s.files += ["lib/google/protobuf_java.jar"] else - s.files += `git ls-files "*.c" "*.h" extconf.rb Makefile`.split + s.files += Dir.glob('ext/**/*') s.extensions= ["ext/google/protobuf_c/extconf.rb"] s.add_development_dependency "rake-compiler-dock" end |