From c79c1563074246186be92f47ff6cc79b77ecf541 Mon Sep 17 00:00:00 2001 From: Srini Polavarapu Date: Fri, 8 Jun 2018 17:01:18 -0700 Subject: Regenrate projects --- gRPC-Core.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gRPC-Core.podspec') diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 5a111c2d3f..d9f15c2e0f 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -22,7 +22,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-Core' - version = '1.13.0-dev' + version = '1.14.0-dev' s.version = version s.summary = 'Core cross-platform gRPC library, written in C' s.homepage = 'https://grpc.io' -- cgit v1.2.3 From 9291e5d4da5721a28ad912d2994e0381ebf15e97 Mon Sep 17 00:00:00 2001 From: Muxi Yan Date: Tue, 12 Jun 2018 16:22:35 -0700 Subject: Update ObjC build hack --- gRPC-Core.podspec | 3 ++- templates/gRPC-Core.podspec.template | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'gRPC-Core.podspec') diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index a4d62a76c6..dbebd4ca70 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -1264,6 +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 '*.back*' -exec sed -E -i'.back' 's;#include "third_party/nanopb/(.*)";#include ;g' {} \\\; + find src/core/ -type f ! -path '*.grpc_back' -exec sed -E -i'.grpc_back' 's;#include "(pb(_.*)?\\.h)";#include ;g' {} \\\; + find src/core/ -type f -path '*.grpc_back' | xargs rm END_OF_COMMAND end diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template index a767a612a6..237389b7f4 100644 --- a/templates/gRPC-Core.podspec.template +++ b/templates/gRPC-Core.podspec.template @@ -220,6 +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 '*.back*' -exec sed -E -i'.back' 's;#include "third_party/nanopb/(.*)";#include ;g' {} \\\; + find src/core/ -type f ! -path '*.grpc_back' -exec sed -E -i'.grpc_back' 's;#include "(pb(_.*)?\\.h)";#include ;g' {} \\\; + find src/core/ -type f -path '*.grpc_back' | xargs rm END_OF_COMMAND end -- cgit v1.2.3 From 1f15b79782ac3792d3e6c26af4276fa0c39b00cf Mon Sep 17 00:00:00 2001 From: Muxi Yan Date: Tue, 12 Jun 2018 18:03:44 -0700 Subject: Polish nanopb hack --- gRPC-Core.podspec | 4 ++-- templates/gRPC-Core.podspec.template | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'gRPC-Core.podspec') 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 ;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 ;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 ;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 ;g' + find src/core/ -type f -path '*.grpc_back' -print0 | xargs -0 rm END_OF_COMMAND end -- cgit v1.2.3