From 0c8a3d804e557eecf7c0947a3d9a6410a7fbc998 Mon Sep 17 00:00:00 2001 From: Jorge Canizales Date: Tue, 13 Oct 2015 13:04:54 -0700 Subject: Undo moving include/ one dir up, to ease testing workflow. --- templates/gRPC.podspec.template | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) (limited to 'templates/gRPC.podspec.template') diff --git a/templates/gRPC.podspec.template b/templates/gRPC.podspec.template index c0887783e2..e396c411a6 100644 --- a/templates/gRPC.podspec.template +++ b/templates/gRPC.podspec.template @@ -36,26 +36,20 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. <%! - def fix_header_name(name): - split_name = name.split('/') - if split_name[0] == 'include': - split_name = split_name[1:] - return '/'.join(split_name) - def grpc_files(libs): out = [] for lib in libs: if lib.name in ("grpc", "gpr"): - out.extend(fix_header_name(h) for h in lib.get('headers', [])) - out.extend(fix_header_name(h) for h in lib.get('public_headers', [])) - out.extend(lib.get('src', [])) + out += lib.get('headers', []) + out += lib.get('public_headers', []) + out += lib.get('src', []) return out; def grpc_private_headers(libs): out = [] for lib in libs: if lib.name in ("grpc", "gpr"): - out.extend(lib.get('headers', [])) + out += lib.get('headers', []) return out %> Pod::Spec.new do |s| @@ -92,6 +86,8 @@ ss.private_header_files = ${(',\n' + 30*' ').join('\'%s\'' % f for f in grpc_private_headers(libs))} ss.header_mappings_dir = '.' + ss.xcconfig = { 'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/Headers/Private/gRPC" ' + + '"$(PODS_ROOT)/Headers/Private/gRPC/include"' } ss.requires_arc = false ss.libraries = 'z' @@ -100,11 +96,6 @@ # ss.compiler_flags = '-GCC_WARN_INHIBIT_ALL_WARNINGS', '-w' end - # Move contents of include/ up a level to avoid manually specifying include paths. - # This needs to be here (top-level) instead of in the C-Core subspec because Cocoapods doesn't run - # prepare_command's of subspecs. - s.prepare_command = 'cp -r "include/grpc" "."' - # Objective-C wrapper around the core gRPC library. s.subspec 'GRPCClient' do |ss| src_dir = "#{objc_dir}/GRPCClient" -- cgit v1.2.3