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. 3
      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. 29
      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 end
s.prepare_command = <<-END_OF_COMMAND 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 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 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' 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? # TODO (mxyan): Instead of this hack, add include path "third_party" to C core's include path?
s.prepare_command = <<-END_OF_COMMAND 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 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 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' 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 # 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. # and, if absent, compile the plugin from the local sources.
s.prepare_command = <<-CMD s.prepare_command = <<-CMD
set -e
#{bazel} build //src/compiler:grpc_cpp_plugin #{bazel} build //src/compiler:grpc_cpp_plugin
CMD CMD
end 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 # 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. # and, if absent, compile the plugin from the local sources.
s.prepare_command = <<-CMD s.prepare_command = <<-CMD
set -e
if [ ! -f #{plugin} ]; then if [ ! -f #{plugin} ]; then
#{bazel} build //src/compiler:grpc_objective_c_plugin #{bazel} build //src/compiler:grpc_objective_c_plugin
fi fi

@ -121,8 +121,9 @@ Pod::Spec.new do |s|
# and, if absent, build it from the local sources. # and, if absent, build it from the local sources.
repo_root = '../..' repo_root = '../..'
bazel = "#{repo_root}/tools/bazel" bazel = "#{repo_root}/tools/bazel"
s.prepare_command = <<-CMD s.prepare_command = <<-CMD
set -e
if [ ! -f bin/protoc ]; then if [ ! -f bin/protoc ]; then
#{bazel} build @com_google_protobuf//:protoc #{bazel} build @com_google_protobuf//:protoc
else else

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

@ -201,6 +201,7 @@
end end
s.prepare_command = <<-END_OF_COMMAND 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 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 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' 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? # TODO (mxyan): Instead of this hack, add include path "third_party" to C core's include path?
s.prepare_command = <<-END_OF_COMMAND 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 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 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' 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 # 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. # and, if absent, compile the plugin from the local sources.
s.prepare_command = <<-CMD s.prepare_command = <<-CMD
set -e
#{bazel} build //src/compiler:grpc_cpp_plugin #{bazel} build //src/compiler:grpc_cpp_plugin
CMD CMD
end end

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

@ -1,7 +1,7 @@
%YAML 1.2 %YAML 1.2
--- | --- |
# Proto Compiler CocoaPods podspec # Proto Compiler CocoaPods podspec
# Copyright 2016, Google Inc. # Copyright 2016, Google Inc.
# All rights reserved. # All rights reserved.
# #
@ -30,7 +30,7 @@
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Pod::Spec.new do |s| Pod::Spec.new do |s|
# This pod is only a utility that will be used by other pods _at install time_ (not at compile # This pod is only a utility that will be used by other pods _at install time_ (not at compile
# time). Other pods can access it in their `prepare_command` script, under <pods_root>/<pod name>. # time). Other pods can access it in their `prepare_command` script, under <pods_root>/<pod name>.
@ -52,21 +52,21 @@
:type => 'New BSD', :type => 'New BSD',
:text => <<-LICENSE :text => <<-LICENSE
This license applies to all parts of Protocol Buffers except the following: This license applies to all parts of Protocol Buffers except the following:
- Atomicops support for generic gcc, located in - Atomicops support for generic gcc, located in
src/google/protobuf/stubs/atomicops_internals_generic_gcc.h. src/google/protobuf/stubs/atomicops_internals_generic_gcc.h.
This file is copyrighted by Red Hat Inc. This file is copyrighted by Red Hat Inc.
- Atomicops support for AIX/POWER, located in - Atomicops support for AIX/POWER, located in
src/google/protobuf/stubs/atomicops_internals_power.h. src/google/protobuf/stubs/atomicops_internals_power.h.
This file is copyrighted by Bloomberg Finance LP. This file is copyrighted by Bloomberg Finance LP.
Copyright 2014, Google Inc. All rights reserved. Copyright 2014, Google Inc. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are modification, are permitted provided that the following conditions are
met: met:
* Redistributions of source code must retain the above copyright * Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer. notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above * Redistributions in binary form must reproduce the above
@ -76,7 +76,7 @@
* Neither the name of Google Inc. nor the names of its * Neither the name of Google Inc. nor the names of its
contributors may be used to endorse or promote products derived from contributors may be used to endorse or promote products derived from
this software without specific prior written permission. this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@ -88,7 +88,7 @@
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Code generated by the Protocol Buffer compiler is owned by the owner Code generated by the Protocol Buffer compiler is owned by the owner
of the input file used when generating it. This code is not of the input file used when generating it. This code is not
standalone and requires a support library to be linked with it. This standalone and requires a support library to be linked with it. This
@ -97,7 +97,7 @@
} }
# "The name and email addresses of the library maintainers, not the Podspec maintainer." # "The name and email addresses of the library maintainers, not the Podspec maintainer."
s.authors = { 'The Protocol Buffers contributors' => 'protobuf@googlegroups.com' } s.authors = { 'The Protocol Buffers contributors' => 'protobuf@googlegroups.com' }
repo = 'google/protobuf' repo = 'google/protobuf'
file = "protoc-#{v}-osx-x86_64.zip" file = "protoc-#{v}-osx-x86_64.zip"
s.source = { s.source = {
@ -105,10 +105,10 @@
# TODO(jcanizales): Add sha1 or sha256 # TODO(jcanizales): Add sha1 or sha256
# :sha1 => '??', # :sha1 => '??',
} }
s.preserve_paths = 'protoc', s.preserve_paths = 'protoc',
'google/**/*.proto' # Well-known protobuf types 'google/**/*.proto' # Well-known protobuf types
# Restrict the protobuf runtime version to the one supported by this version of protoc. # Restrict the protobuf runtime version to the one supported by this version of protoc.
s.dependency 'Protobuf', '~> 3.0' s.dependency 'Protobuf', '~> 3.0'
# For the Protobuf dependency not to complain: # For the Protobuf dependency not to complain:
@ -116,15 +116,16 @@
s.osx.deployment_target = '10.10' s.osx.deployment_target = '10.10'
s.tvos.deployment_target = '10.0' s.tvos.deployment_target = '10.0'
s.watchos.deployment_target = '4.0' s.watchos.deployment_target = '4.0'
# This is only for local development of protoc: If the Podfile brings this pod from a local # This is only for local development of protoc: If the Podfile brings this pod from a local
# directory using `:path`, CocoaPods won't download the zip file and so the compiler won't be # directory using `:path`, CocoaPods won't download the zip file and so the compiler won't be
# present in this pod's directory. We use that knowledge to check for the existence of the file # present in this pod's directory. We use that knowledge to check for the existence of the file
# and, if absent, build it from the local sources. # and, if absent, build it from the local sources.
repo_root = '../..' repo_root = '../..'
bazel = "#{repo_root}/tools/bazel" bazel = "#{repo_root}/tools/bazel"
s.prepare_command = <<-CMD s.prepare_command = <<-CMD
set -e
if [ ! -f bin/protoc ]; then if [ ! -f bin/protoc ]; then
#{bazel} build @com_google_protobuf//:protoc #{bazel} build @com_google_protobuf//:protoc
else else

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

Loading…
Cancel
Save