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

Merge pull request #2297 from jcanizales/fix-build

Browse Source 
Fix build breakage of moving include/grpc/ into grpc/
pull/2306/head
Michael Lumish 10 years ago
parent d1dd3a68a2 951cd18309
commit 790d7b7881
2 changed files with 4 additions and 4 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. 4
      templates/gRPC.podspec.template

4
gRPC.podspec
Unescape View File

@ -494,9 +494,9 @@ Pod::Spec.new do |s|
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 src/objective-c/GRPCClient | 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 "$BAD_TIME" ];
then then
mv -f "include/$BAD_TIME" "include/$GOOD_TIME" mv -f "$BAD_TIME" "$GOOD_TIME"
fi fi
DIR_STRING="src/core/support" DIR_STRING="src/core/support"

4
templates/gRPC.podspec.template
Unescape View File

@ -111,9 +111,9 @@ Pod::Spec.new do |s|
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 src/objective-c/GRPCClient | 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 "$BAD_TIME" ];
then then
mv -f "include/$BAD_TIME" "include/$GOOD_TIME" mv -f "$BAD_TIME" "$GOOD_TIME"
fi fi
DIR_STRING="src/core/support" DIR_STRING="src/core/support"

Write Preview
Loading…
Cancel
Save