Revert "Revert "[objc] Turn on error exit in cocoapod pre-install (#27474)" (#27497)" (#27500)

This reverts commit 044253e5bd.
pull/27521/head
Denny C. Dai 3 years ago committed by GitHub
parent a85f8a166a
commit 251274022c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      gRPC-C++.podspec
  2. 1
      gRPC-Core.podspec
  3. 1
      src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec
  4. 1
      src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
  5. 1
      src/objective-c/!ProtoCompiler.podspec
  6. 1
      src/objective-c/BoringSSL-GRPC.podspec
  7. 1
      templates/gRPC-C++.podspec.template
  8. 1
      templates/gRPC-Core.podspec.template
  9. 1
      templates/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec.template
  10. 1
      templates/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec.template
  11. 1
      templates/src/objective-c/!ProtoCompiler.podspec.template
  12. 1
      templates/src/objective-c/BoringSSL-GRPC.podspec.template

1
gRPC-C++.podspec generated

@ -1531,6 +1531,7 @@ Pod::Spec.new do |s|
end
s.prepare_command = <<-END_OF_COMMAND
set -e
find src/core -type f \\( -path '*.h' -or -path '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include <openssl/(.*)>;#if COCOAPODS==1\\\n #include <openssl_grpc/\\1>\\\n#else\\\n #include <openssl/\\1>\\\n#endif;g'
find third_party/upb/ -type f \\( -name '*.h' -or -name '*.hpp' -or -name '*.c' -or -name '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "third_party/(.*)";#if COCOAPODS==1\\\n #include "third_party/upb/third_party/\\1"\\\n#else\\\n #include "third_party/\\1"\\\n#endif;g'
find src/core/ src/cpp/ third_party/upb/ -type f \\( -name '*.h' -or -name '*.hpp' -or -name '*.c' -or -name '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "upb/(.*)";#if COCOAPODS==1\\\n #include "third_party/upb/upb/\\1"\\\n#else\\\n #include "upb/\\1"\\\n#endif;g'

1
gRPC-Core.podspec generated

@ -2283,6 +2283,7 @@ Pod::Spec.new do |s|
# TODO (mxyan): Instead of this hack, add include path "third_party" to C core's include path?
s.prepare_command = <<-END_OF_COMMAND
set -e
find src/core -type f \\( -path '*.h' -or -path '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include <openssl/(.*)>;#if COCOAPODS==1\\\n #include <openssl_grpc/\\1>\\\n#else\\\n #include <openssl/\\1>\\\n#endif;g'
find third_party/upb/ -type f \\( -name '*.h' -or -name '*.hpp' -or -name '*.c' -or -name '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "third_party/(.*)";#if COCOAPODS==1\\\n #include "third_party/upb/third_party/\\1"\\\n#else\\\n #include "third_party/\\1"\\\n#endif;g'
find src/core/ src/cpp/ third_party/upb/ -type f \\( -name '*.h' -or -name '*.hpp' -or -name '*.c' -or -name '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "upb/(.*)";#if COCOAPODS==1\\\n #include "third_party/upb/upb/\\1"\\\n#else\\\n #include "upb/\\1"\\\n#endif;g'

@ -112,6 +112,7 @@ Pod::Spec.new do |s|
# present in this pod's directory. We use that knowledge to check for the existence of the file
# and, if absent, compile the plugin from the local sources.
s.prepare_command = <<-CMD
set -e
#{bazel} build //src/compiler:grpc_cpp_plugin
CMD
end

@ -121,6 +121,7 @@ Pod::Spec.new do |s|
# present in this pod's directory. We use that knowledge to check for the existence of the file
# and, if absent, compile the plugin from the local sources.
s.prepare_command = <<-CMD
set -e
if [ ! -f #{plugin} ]; then
#{bazel} build //src/compiler:grpc_objective_c_plugin
fi

@ -123,6 +123,7 @@ Pod::Spec.new do |s|
bazel = "#{repo_root}/tools/bazel"
s.prepare_command = <<-CMD
set -e
if [ ! -f bin/protoc ]; then
#{bazel} build @com_google_protobuf//:protoc
else

@ -152,6 +152,7 @@ Pod::Spec.new do |s|
end
s.prepare_command = <<-END_OF_COMMAND
set -e
# Add a module map and an umbrella header
mkdir -p src/include/openssl
cat > src/include/openssl/umbrella.h <<EOF

@ -201,6 +201,7 @@
end
s.prepare_command = <<-END_OF_COMMAND
set -e
find src/core -type f \\( -path '*.h' -or -path '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include <openssl/(.*)>;#if COCOAPODS==1\\\n #include <openssl_grpc/\\1>\\\n#else\\\n #include <openssl/\\1>\\\n#endif;g'
find third_party/upb/ -type f \\( -name '*.h' -or -name '*.hpp' -or -name '*.c' -or -name '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "third_party/(.*)";#if COCOAPODS==1\\\n #include "third_party/upb/third_party/\\1"\\\n#else\\\n #include "third_party/\\1"\\\n#endif;g'
find src/core/ src/cpp/ third_party/upb/ -type f \\( -name '*.h' -or -name '*.hpp' -or -name '*.c' -or -name '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "upb/(.*)";#if COCOAPODS==1\\\n #include "third_party/upb/upb/\\1"\\\n#else\\\n #include "upb/\\1"\\\n#endif;g'

@ -249,6 +249,7 @@
# TODO (mxyan): Instead of this hack, add include path "third_party" to C core's include path?
s.prepare_command = <<-END_OF_COMMAND
set -e
find src/core -type f \\( -path '*.h' -or -path '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include <openssl/(.*)>;#if COCOAPODS==1\\\n #include <openssl_grpc/\\1>\\\n#else\\\n #include <openssl/\\1>\\\n#endif;g'
find third_party/upb/ -type f \\( -name '*.h' -or -name '*.hpp' -or -name '*.c' -or -name '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "third_party/(.*)";#if COCOAPODS==1\\\n #include "third_party/upb/third_party/\\1"\\\n#else\\\n #include "third_party/\\1"\\\n#endif;g'
find src/core/ src/cpp/ third_party/upb/ -type f \\( -name '*.h' -or -name '*.hpp' -or -name '*.c' -or -name '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "upb/(.*)";#if COCOAPODS==1\\\n #include "third_party/upb/upb/\\1"\\\n#else\\\n #include "upb/\\1"\\\n#endif;g'

@ -114,6 +114,7 @@
# present in this pod's directory. We use that knowledge to check for the existence of the file
# and, if absent, compile the plugin from the local sources.
s.prepare_command = <<-CMD
set -e
#{bazel} build //src/compiler:grpc_cpp_plugin
CMD
end

@ -123,6 +123,7 @@
# present in this pod's directory. We use that knowledge to check for the existence of the file
# and, if absent, compile the plugin from the local sources.
s.prepare_command = <<-CMD
set -e
if [ ! -f #{plugin} ]; then
#{bazel} build //src/compiler:grpc_objective_c_plugin
fi

@ -125,6 +125,7 @@
bazel = "#{repo_root}/tools/bazel"
s.prepare_command = <<-CMD
set -e
if [ ! -f bin/protoc ]; then
#{bazel} build @com_google_protobuf//:protoc
else

@ -182,6 +182,7 @@
end
s.prepare_command = <<-END_OF_COMMAND
set -e
# Add a module map and an umbrella header
mkdir -p src/include/openssl
cat > src/include/openssl/umbrella.h <<EOF

Loading…
Cancel
Save