diff options
| author |  David Garcia Quintas <dgq@google.com> | 2018-06-12 18:39:35 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2018-06-12 18:39:35 -0700 |
| commit | 72fda21dadc9c6eb85892550e246eba928688184 (patch) | |
| tree | 76ebc2c82b26079172add8021f512560f6f8a590 | |
| parent | 4b256c5ceec69d27ae2ab684643cc9d965f45458 (diff) | |
| parent | 1f15b79782ac3792d3e6c26af4276fa0c39b00cf (diff) | |
Merge branch 'nanopb_build_cleanup' of github.com:dgquintas/grpc into nanopb_build_cleanup
| -rw-r--r-- | gRPC-Core.podspec | 4 | ||||
| -rw-r--r-- | templates/gRPC-Core.podspec.template | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index dbebd4ca70..a19286ccfb 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -1264,7 +1264,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 - find src/core/ -type f ! -path '*.grpc_back' -exec sed -E -i'.grpc_back' 's;#include "(pb(_.*)?\\.h)";#include <nanopb/\\1>;g' {} \\\; - find src/core/ -type f -path '*.grpc_back' | xargs rm + find src/core/ -type f ! -path '*.grpc_back' -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "(pb(_.*)?\\.h)";#include <nanopb/\\1>;g' + find src/core/ -type f -path '*.grpc_back' -print0 | xargs -0 rm END_OF_COMMAND end diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template index 237389b7f4..5098f351db 100644 --- a/templates/gRPC-Core.podspec.template +++ b/templates/gRPC-Core.podspec.template @@ -220,7 +220,7 @@ # TODO (mxyan): Instead of this hack, add include path "third_party" to C core's include path? s.prepare_command = <<-END_OF_COMMAND - find src/core/ -type f ! -path '*.grpc_back' -exec sed -E -i'.grpc_back' 's;#include "(pb(_.*)?\\.h)";#include <nanopb/\\1>;g' {} \\\; - find src/core/ -type f -path '*.grpc_back' | xargs rm + find src/core/ -type f ! -path '*.grpc_back' -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "(pb(_.*)?\\.h)";#include <nanopb/\\1>;g' + find src/core/ -type f -path '*.grpc_back' -print0 | xargs -0 rm END_OF_COMMAND end |