From 4e141bb3b885f2f79664958b7086fa4a0a526bef Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Sat, 6 Feb 2016 00:55:28 +0100 Subject: [PATCH 1/2] Removing usage of git - not everyone grabs the gem using it. --- ruby/google-protobuf.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec index 0762da975c..7b64ee779c 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 From bbb188acddce91bea47bd708d217e33b9eab4442 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Sat, 6 Feb 2016 00:55:45 +0100 Subject: [PATCH 2/2] Actually enabling cross compilation. --- ruby/Rakefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ruby/Rakefile b/ruby/Rakefile index 44497dea76..81c3119e1a 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