aboutsummaryrefslogtreecommitdiff
path: root/ruby/Rakefile
diff options
context:
space:
mode:
authorJisi Liu <jisi.liu@gmail.com>2016-07-26 12:29:03 -0700
committerJisi Liu <jisi.liu@gmail.com>2016-07-26 12:29:03 -0700
commit032fb914e205f6a4d59097c4e27a650eb5a21c7b (patch)
tree29ad5dbdb37192e46889041e97ad87ceba0299c2 /ruby/Rakefile
parent0973822d03992fd818e5424020e6c618f3f33649 (diff)
parentba52f2b6780fa5e6bee86cf7e8ee6f6ba617862c (diff)
downloadprotobuf-032fb914e205f6a4d59097c4e27a650eb5a21c7b.tar.gz
protobuf-032fb914e205f6a4d59097c4e27a650eb5a21c7b.tar.bz2
protobuf-032fb914e205f6a4d59097c4e27a650eb5a21c7b.zip
Merge branch 'master' of github.com:google/protobuf into 3.0.0-GA
Diffstat (limited to 'ruby/Rakefile')
-rw-r--r--ruby/Rakefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/ruby/Rakefile b/ruby/Rakefile
index fa29c315..ba1cf4cf 100644
--- a/ruby/Rakefile
+++ b/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}"
@@ -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