ADD: added new version of protobuf
This commit is contained in:
@@ -39,8 +39,8 @@ proto2_protos = %w[
|
||||
|
||||
if !ENV['PROTOC'].nil?
|
||||
protoc_command = ENV['PROTOC']
|
||||
elsif system('../bazel-bin/protoc --version')
|
||||
protoc_command = '../bazel-bin/protoc'
|
||||
elsif system('../src/protoc --version')
|
||||
protoc_command = '../src/protoc'
|
||||
else
|
||||
protoc_command = 'protoc'
|
||||
end
|
||||
@@ -49,7 +49,7 @@ genproto_output = []
|
||||
|
||||
# We won't have access to .. from within docker, but the proto files
|
||||
# will be there, thanks to the :genproto rule dependency for gem:native.
|
||||
unless ENV['IN_DOCKER'] == 'true' or ENV['BAZEL'] == 'true'
|
||||
unless ENV['IN_DOCKER'] == 'true'
|
||||
well_known_protos.each do |proto_file|
|
||||
input_file = "../src/" + proto_file
|
||||
output_file = "lib/" + proto_file.sub(/\.proto$/, "_pb.rb")
|
||||
@@ -84,16 +84,12 @@ if RUBY_PLATFORM == "java"
|
||||
else
|
||||
unless ENV['IN_DOCKER'] == 'true'
|
||||
# We need utf8_range in-tree.
|
||||
if ENV['BAZEL'] == 'true'
|
||||
utf8_root = '../external/utf8_range'
|
||||
else
|
||||
utf8_root = '../third_party/utf8_range'
|
||||
end
|
||||
FileUtils.mkdir_p("ext/google/protobuf_c/third_party/utf8_range")
|
||||
FileUtils.cp(utf8_root+"/utf8_range.h", "ext/google/protobuf_c/third_party/utf8_range")
|
||||
FileUtils.cp(utf8_root+"/naive.c", "ext/google/protobuf_c/third_party/utf8_range")
|
||||
FileUtils.cp(utf8_root+"/range2-neon.c", "ext/google/protobuf_c/third_party/utf8_range")
|
||||
FileUtils.cp(utf8_root+"/range2-sse.c", "ext/google/protobuf_c/third_party/utf8_range")
|
||||
FileUtils.cp("../third_party/utf8_range/utf8_range.h", "ext/google/protobuf_c/third_party/utf8_range")
|
||||
FileUtils.cp("../third_party/utf8_range/naive.c", "ext/google/protobuf_c/third_party/utf8_range")
|
||||
FileUtils.cp("../third_party/utf8_range/range2-neon.c", "ext/google/protobuf_c/third_party/utf8_range")
|
||||
FileUtils.cp("../third_party/utf8_range/range2-sse.c", "ext/google/protobuf_c/third_party/utf8_range")
|
||||
FileUtils.cp("../third_party/utf8_range/LICENSE", "ext/google/protobuf_c/third_party/utf8_range")
|
||||
end
|
||||
|
||||
Rake::ExtensionTask.new("protobuf_c", spec) do |ext|
|
||||
@@ -157,15 +153,13 @@ end
|
||||
Gem::PackageTask.new(spec) do |pkg|
|
||||
end
|
||||
|
||||
# Skip build/genproto in Bazel builds, where we expect this to
|
||||
# be done already.
|
||||
Rake::TestTask.new(:test => ENV['BAZEL'] == 'true' ? [] : [:build, :genproto]) do |t|
|
||||
Rake::TestTask.new(:test => [:build, :genproto]) do |t|
|
||||
t.test_files = FileList["tests/*.rb"].exclude("tests/gc_test.rb", "tests/common_tests.rb")
|
||||
end
|
||||
|
||||
# gc_test needs to be split out to ensure the generated file hasn't been
|
||||
# imported by other tests.
|
||||
Rake::TestTask.new(:gc_test => ENV['BAZEL'] == 'true' ? [] : :build) do |t|
|
||||
Rake::TestTask.new(:gc_test => :build) do |t|
|
||||
t.test_files = FileList["tests/gc_test.rb"]
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user