diff options
author | Michael Lumish <mlumish@google.com> | 2015-06-24 10:55:33 -0700 |
---|---|---|
committer | Michael Lumish <mlumish@google.com> | 2015-06-24 10:55:33 -0700 |
commit | 4ea9c8e6daaeed82e948037dc4f0f58c6d3c736d (patch) | |
tree | 9cfd3630d5716a88e4beeef14b010622933c17eb /templates | |
parent | d9145d91f542e838827dfdd83978586e2686973f (diff) | |
parent | 9f903dad1493dc309e6d8aef4a065aaaee6c036b (diff) |
Merge pull request #2188 from ctiller/so-freaking-sick-of-irrelevant-merge-conflicts
Make it less likely a build.json change triggers a merge conflict
Diffstat (limited to 'templates')
-rw-r--r-- | templates/gRPC.podspec.template | 42 | ||||
-rw-r--r-- | templates/tools/doxygen/Doxyfile.include | 2 |
2 files changed, 20 insertions, 24 deletions
diff --git a/templates/gRPC.podspec.template b/templates/gRPC.podspec.template index b59b553717..02e90d7180 100644 --- a/templates/gRPC.podspec.template +++ b/templates/gRPC.podspec.template @@ -42,6 +42,22 @@ def fix_header_name(name): 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', [])) + return out; + +def grpc_private_headers(libs): + out = [] + for lib in libs: + if lib.name in ("grpc", "gpr"): + out.extend(lib.get('headers', [])) + return out %> Pod::Spec.new do |s| s.name = 'gRPC' @@ -70,29 +86,9 @@ Pod::Spec.new do |s| # Core cross-platform gRPC library, written in C. s.subspec 'C-Core' do |ss| - ss.source_files = \ -% for lib in libs: -% if lib.name in ("grpc", "gpr"): -% for hdr in lib.get("headers", []): -'${fix_header_name(hdr)}', \ -% endfor -% for hdr in lib.get("public_headers", []): -'${fix_header_name(hdr)}', \ -% endfor -% for src in lib.src: -'${src}', \ -% endfor -% endif -% endfor - - ss.private_header_files = \ -% for lib in libs: -% if lib.name in ("grpc", "gpr"): -% for hdr in lib.get("headers", []): -'${hdr}', \ -% endfor -% endif -% endfor + ss.source_files = ${(',\n' + 22*' ').join('\'%s\'' % f for f in grpc_files(libs))} + + ss.private_header_files = ${(',\n' + 30*' ').join('\'%s\'' % f for f in grpc_private_headers(libs))} ss.header_mappings_dir = '.' diff --git a/templates/tools/doxygen/Doxyfile.include b/templates/tools/doxygen/Doxyfile.include index 1391016348..2934ebe7d8 100644 --- a/templates/tools/doxygen/Doxyfile.include +++ b/templates/tools/doxygen/Doxyfile.include @@ -778,7 +778,7 @@ WARN_LOGFILE = # spaces. # Note: If this tag is empty the current directory is searched. -INPUT = ${' '.join( +INPUT = ${' \\\n'.join( itertools.chain.from_iterable( target.public_headers + ([] |