From 27a0627917179b85cbf2f77efecc72cde8f4eebf Mon Sep 17 00:00:00 2001 From: Jorge Canizales Date: Thu, 4 Jun 2015 14:13:20 -0700 Subject: [PATCH] Make podspecs work for nested dirs --- .../RemoteTestClient/RemoteTest.podspec | 8 +++++--- .../RouteGuideClient/RouteGuide.podspec | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/objective-c/generated_libraries/RemoteTestClient/RemoteTest.podspec b/src/objective-c/generated_libraries/RemoteTestClient/RemoteTest.podspec index db497323fff..0066313ff6c 100644 --- a/src/objective-c/generated_libraries/RemoteTestClient/RemoteTest.podspec +++ b/src/objective-c/generated_libraries/RemoteTestClient/RemoteTest.podspec @@ -7,16 +7,18 @@ Pod::Spec.new do |s| s.osx.deployment_target = "10.8" # Run protoc with the Objective-C and gRPC plugins to generate protocol messages and gRPC clients. - s.prepare_command = "protoc --objc_out=. --objcgrpc_out=. *.proto" + s.prepare_command = "protoc --objc_out=. --objcgrpc_out=. *.proto **/*.proto" s.subspec "Messages" do |ms| - ms.source_files = "*.pbobjc.{h,m}" + ms.source_files = "*.pbobjc.{h,m}", "**/*.pbobjc.{h,m}" + ms.header_mappings_dir = "." ms.requires_arc = false ms.dependency "Protobuf", "~> 3.0.0-alpha-3" end s.subspec "Services" do |ss| - ss.source_files = "*.pbrpc.{h,m}" + ss.source_files = "*.pbrpc.{h,m}", "**/*.pbrpc.{h,m}" + ss.header_mappings_dir = "." ss.requires_arc = true ss.dependency "gRPC", "~> 0.5" ss.dependency "#{s.name}/Messages" diff --git a/src/objective-c/generated_libraries/RouteGuideClient/RouteGuide.podspec b/src/objective-c/generated_libraries/RouteGuideClient/RouteGuide.podspec index 9df8e2337da..58ccb4873ee 100644 --- a/src/objective-c/generated_libraries/RouteGuideClient/RouteGuide.podspec +++ b/src/objective-c/generated_libraries/RouteGuideClient/RouteGuide.podspec @@ -7,16 +7,18 @@ Pod::Spec.new do |s| s.osx.deployment_target = "10.8" # Run protoc with the Objective-C and gRPC plugins to generate protocol messages and gRPC clients. - s.prepare_command = "protoc --objc_out=. --objcgrpc_out=. *.proto" + s.prepare_command = "protoc --objc_out=. --objcgrpc_out=. *.proto **/*.proto" s.subspec "Messages" do |ms| - ms.source_files = "*.pbobjc.{h,m}" + ms.source_files = "*.pbobjc.{h,m}", "**/*.pbobjc.{h,m}" + ms.header_mappings_dir = "." ms.requires_arc = false ms.dependency "Protobuf", "~> 3.0.0-alpha-3" end s.subspec "Services" do |ss| - ss.source_files = "*.pbrpc.{h,m}" + ss.source_files = "*.pbrpc.{h,m}", "**/*.pbrpc.{h,m}" + ss.header_mappings_dir = "." ss.requires_arc = true ss.dependency "gRPC", "~> 0.5" ss.dependency "#{s.name}/Messages"