diff options
| author |  David Garcia Quintas <dgq@google.com> | 2018-06-14 13:34:34 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2018-06-14 13:34:34 -0700 |
| commit | 39fbed3589aa0e240acfcbe4b04971c0f9472a21 (patch) | |
| tree | 93d4120cd3eefbe8dba64081cd5474972c93645e | |
| parent | 657a3eb98ba7481785fc3b5bad803f3d4a27e90d (diff) | |
| parent | 358c625ce52ac711ecbe5a4d42a1c0ba0dea2e7c (diff) | |
Merge branch 'nanopb_build_cleanup' of github.com:dgquintas/grpc into nanopb_build_cleanup
| -rw-r--r-- | gRPC-C++.podspec | 8 | ||||
| -rw-r--r-- | templates/gRPC-C++.podspec.template | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 262de72971..39117557fc 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -663,9 +663,9 @@ Pod::Spec.new do |s| end s.prepare_command = <<-END_OF_COMMAND - find src/cpp/ -type f -exec sed -E -i'.back' 's;#include "third_party/nanopb/(.*)";#include <nanopb/\\1>;g' {} \\\; - find src/cpp/ -name "*.back" -type f -delete - find src/core/ -regex ".*\.h" -type f -exec sed -E -i'.back' 's;#include "third_party/nanopb/(.*)";#include <nanopb/\\1>;g' {} \\\; - find src/core/ -name "*.back" -type f -delete + find src/cpp/ -type f ! -path '*.grpc_back' -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "(pb(_.*)?\\.h)";#include <nanopb/\\1>;g' + find src/cpp/ -type f -path '*.grpc_back' -print0 | xargs -0 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-C++.podspec.template b/templates/gRPC-C++.podspec.template index 12d5fc17d4..2853bb63ab 100644 --- a/templates/gRPC-C++.podspec.template +++ b/templates/gRPC-C++.podspec.template @@ -196,9 +196,9 @@ end s.prepare_command = <<-END_OF_COMMAND - find src/cpp/ -type f -exec sed -E -i'.back' 's;#include "third_party/nanopb/(.*)";#include <nanopb/\\1>;g' {} \\\; - find src/cpp/ -name "*.back" -type f -delete - find src/core/ -regex ".*\.h" -type f -exec sed -E -i'.back' 's;#include "third_party/nanopb/(.*)";#include <nanopb/\\1>;g' {} \\\; - find src/core/ -name "*.back" -type f -delete + find src/cpp/ -type f ! -path '*.grpc_back' -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include "(pb(_.*)?\\.h)";#include <nanopb/\\1>;g' + find src/cpp/ -type f -path '*.grpc_back' -print0 | xargs -0 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 |