Skip to content

Commit

Permalink
Merge pull request #1 from nicolasnoble/bin-gems
Browse files Browse the repository at this point in the history
Few fixes.
  • Loading branch information
haberman committed Feb 6, 2016
2 parents 70a4b03 + bbb188a commit 6efe3aa
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
8 changes: 7 additions & 1 deletion ruby/Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions ruby/google-protobuf.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6efe3aa

Please sign in to comment.