| Index: third_party/protobuf/ruby/Rakefile
|
| diff --git a/third_party/protobuf/ruby/Rakefile b/third_party/protobuf/ruby/Rakefile
|
| index fa29c3151fa6b06ce6ab1dea1d420fa26fe89d81..40d0a314f97e9de603ee2600886b8e51ee344d3f 100644
|
| --- a/third_party/protobuf/ruby/Rakefile
|
| +++ b/third_party/protobuf/ruby/Rakefile
|
| @@ -31,7 +31,7 @@ genproto_output = []
|
| unless ENV['IN_DOCKER'] == 'true'
|
| well_known_protos.each do |proto_file|
|
| input_file = "../src/" + proto_file
|
| - output_file = "lib/" + proto_file.sub(/\.proto$/, ".rb")
|
| + output_file = "lib/" + proto_file.sub(/\.proto$/, "_pb.rb")
|
| genproto_output << output_file
|
| file output_file => input_file do |file_task|
|
| sh "../src/protoc -I../src --ruby_out=lib #{input_file}"
|
| @@ -44,11 +44,11 @@ if RUBY_PLATFORM == "java"
|
| raise ArgumentError, "maven needs to be installed"
|
| end
|
| task :clean do
|
| - system("mvn clean")
|
| + system("mvn --batch-mode clean")
|
| end
|
|
|
| task :compile do
|
| - system("mvn package")
|
| + system("mvn --batch-mode package")
|
| end
|
| else
|
| Rake::ExtensionTask.new("protobuf_c", spec) do |ext|
|
| @@ -80,10 +80,15 @@ end
|
|
|
| # Proto for tests.
|
| genproto_output << "tests/generated_code.rb"
|
| +genproto_output << "tests/test_import.rb"
|
| file "tests/generated_code.rb" => "tests/generated_code.proto" do |file_task|
|
| sh "../src/protoc --ruby_out=. tests/generated_code.proto"
|
| end
|
|
|
| +file "tests/test_import.rb" => "tests/test_import.proto" do |file_task|
|
| + sh "../src/protoc --ruby_out=. tests/test_import.proto"
|
| +end
|
| +
|
| task :genproto => genproto_output
|
|
|
| task :clean do
|
|
|