Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2195 from jcanizales/rewrite-grpcclient-includes

Browse Source 
Have Cocoapods rename includes in the core wrapper
pull/2188/head^2
Michael Lumish 10 years ago
parent 85bc52e38a 59bb9d7d56
commit 269575ac0e
3 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      gRPC.podspec
  2. 2
      src/objective-c/GRPCClient/GRPCCall.m
  3. 4
      templates/gRPC.podspec.template

4
gRPC.podspec
Unescape View File

@ -83,7 +83,7 @@ Pod::Spec.new do |s|
DIR_TIME="grpc/support" DIR_TIME="grpc/support"
BAD_TIME="$DIR_TIME/time.h" BAD_TIME="$DIR_TIME/time.h"
GOOD_TIME="$DIR_TIME/grpc_time.h" GOOD_TIME="$DIR_TIME/grpc_time.h"
grep -rl "$BAD_TIME" grpc src/core | xargs sed -i '' -e s@$BAD_TIME@$GOOD_TIME@g grep -rl "$BAD_TIME" grpc src/core src/objective-c/GRPCClient | xargs sed -i '' -e s@$BAD_TIME@$GOOD_TIME@g
if [ -f "include/$BAD_TIME" ]; if [ -f "include/$BAD_TIME" ];
then then
mv -f "include/$BAD_TIME" "include/$GOOD_TIME" mv -f "include/$BAD_TIME" "include/$GOOD_TIME"
@ -92,7 +92,7 @@ Pod::Spec.new do |s|
DIR_STRING="src/core/support" DIR_STRING="src/core/support"
BAD_STRING="$DIR_STRING/string.h" BAD_STRING="$DIR_STRING/string.h"
GOOD_STRING="$DIR_STRING/grpc_string.h" GOOD_STRING="$DIR_STRING/grpc_string.h"
grep -rl "$BAD_STRING" grpc src/core | xargs sed -i '' -e s@$BAD_STRING@$GOOD_STRING@g grep -rl "$BAD_STRING" grpc src/core src/objective-c/GRPCClient | xargs sed -i '' -e s@$BAD_STRING@$GOOD_STRING@g
if [ -f "$BAD_STRING" ]; if [ -f "$BAD_STRING" ];
then then
mv -f "$BAD_STRING" "$GOOD_STRING" mv -f "$BAD_STRING" "$GOOD_STRING"

2
src/objective-c/GRPCClient/GRPCCall.m
Unescape View File

@ -34,7 +34,7 @@
#import "GRPCCall.h" #import "GRPCCall.h"
#include <grpc/grpc.h> #include <grpc/grpc.h>
#include <grpc/support/grpc_time.h> #include <grpc/support/time.h>
#import "GRPCMethodName.h" #import "GRPCMethodName.h"
#import "private/GRPCChannel.h" #import "private/GRPCChannel.h"

4
templates/gRPC.podspec.template
Unescape View File

@ -114,7 +114,7 @@ Pod::Spec.new do |s|
DIR_TIME="grpc/support" DIR_TIME="grpc/support"
BAD_TIME="$DIR_TIME/time.h" BAD_TIME="$DIR_TIME/time.h"
GOOD_TIME="$DIR_TIME/grpc_time.h" GOOD_TIME="$DIR_TIME/grpc_time.h"
grep -rl "$BAD_TIME" grpc src/core | xargs sed -i '' -e s@$BAD_TIME@$GOOD_TIME@g grep -rl "$BAD_TIME" grpc src/core src/objective-c/GRPCClient | xargs sed -i '' -e s@$BAD_TIME@$GOOD_TIME@g
if [ -f "include/$BAD_TIME" ]; if [ -f "include/$BAD_TIME" ];
then then
mv -f "include/$BAD_TIME" "include/$GOOD_TIME" mv -f "include/$BAD_TIME" "include/$GOOD_TIME"
@ -123,7 +123,7 @@ Pod::Spec.new do |s|
DIR_STRING="src/core/support" DIR_STRING="src/core/support"
BAD_STRING="$DIR_STRING/string.h" BAD_STRING="$DIR_STRING/string.h"
GOOD_STRING="$DIR_STRING/grpc_string.h" GOOD_STRING="$DIR_STRING/grpc_string.h"
grep -rl "$BAD_STRING" grpc src/core | xargs sed -i '' -e s@$BAD_STRING@$GOOD_STRING@g grep -rl "$BAD_STRING" grpc src/core src/objective-c/GRPCClient | xargs sed -i '' -e s@$BAD_STRING@$GOOD_STRING@g
if [ -f "$BAD_STRING" ]; if [ -f "$BAD_STRING" ];
then then
mv -f "$BAD_STRING" "$GOOD_STRING" mv -f "$BAD_STRING" "$GOOD_STRING"

Write Preview
Loading…
Cancel
Save