Merge pull request #18669 from rmstar/9570

Objc tests should use installed version of protoc
pull/18842/head
rmstar 6 years ago committed by GitHub
commit d3308ec467
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 30
      src/objective-c/tests/RemoteTestClient/RemoteTest.podspec

@ -14,20 +14,34 @@ Pod::Spec.new do |s|
s.dependency "!ProtoCompiler-gRPCPlugin"
repo_root = '../../../..'
bin_dir = "#{repo_root}/bins/$CONFIG"
config = ENV['CONFIG'] || 'opt'
bin_dir = "#{repo_root}/bins/#{config}"
protoc = "#{bin_dir}/protobuf/protoc"
well_known_types_dir = "#{repo_root}/third_party/protobuf/src"
plugin = "#{bin_dir}/grpc_objective_c_plugin"
s.prepare_command = <<-CMD
#{protoc} \
--plugin=protoc-gen-grpc=#{plugin} \
--objc_out=. \
--grpc_out=. \
-I . \
-I #{well_known_types_dir} \
*.proto
if [ -f #{protoc} ]; then
#{protoc} \
--plugin=protoc-gen-grpc=#{plugin} \
--objc_out=. \
--grpc_out=. \
-I . \
-I #{well_known_types_dir} \
*.proto
else
# protoc was not found bin_dir, use installed version instead
(>&2 echo "\nWARNING: Using installed version of protoc. It might be incompatible with gRPC")
protoc \
--plugin=protoc-gen-grpc=#{plugin} \
--objc_out=. \
--grpc_out=. \
-I . \
-I #{well_known_types_dir} \
*.proto
fi
CMD
s.subspec "Messages" do |ms|

Loading…
Cancel
Save