From 221f5b25af6a95099803bd05162ce9020c64efa2 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Sun, 10 Nov 2019 09:27:33 -0800 Subject: [PATCH] Update by review --- grpc.gemspec | 14 -------------- package.xml | 15 --------------- templates/grpc.gemspec.template | 2 +- templates/package.xml.template | 6 +++--- .../grpcio/grpc_core_dependencies.py.template | 2 +- 5 files changed, 5 insertions(+), 34 deletions(-) diff --git a/grpc.gemspec b/grpc.gemspec index 88eaf447174..d3354b1de7e 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -56,41 +56,27 @@ Gem::Specification.new do |s| s.files += %w( include/grpc/grpc_security.h ) s.files += %w( include/grpc/grpc_security_constants.h ) s.files += %w( include/grpc/impl/codegen/atm.h ) - s.files += %w( include/grpc/impl/codegen/atm.h ) - s.files += %w( include/grpc/impl/codegen/atm_gcc_atomic.h ) s.files += %w( include/grpc/impl/codegen/atm_gcc_atomic.h ) s.files += %w( include/grpc/impl/codegen/atm_gcc_sync.h ) - s.files += %w( include/grpc/impl/codegen/atm_gcc_sync.h ) - s.files += %w( include/grpc/impl/codegen/atm_windows.h ) s.files += %w( include/grpc/impl/codegen/atm_windows.h ) s.files += %w( include/grpc/impl/codegen/byte_buffer.h ) s.files += %w( include/grpc/impl/codegen/byte_buffer_reader.h ) s.files += %w( include/grpc/impl/codegen/compression_types.h ) s.files += %w( include/grpc/impl/codegen/connectivity_state.h ) s.files += %w( include/grpc/impl/codegen/fork.h ) - s.files += %w( include/grpc/impl/codegen/fork.h ) - s.files += %w( include/grpc/impl/codegen/gpr_slice.h ) s.files += %w( include/grpc/impl/codegen/gpr_slice.h ) s.files += %w( include/grpc/impl/codegen/gpr_types.h ) - s.files += %w( include/grpc/impl/codegen/gpr_types.h ) s.files += %w( include/grpc/impl/codegen/grpc_types.h ) s.files += %w( include/grpc/impl/codegen/log.h ) - s.files += %w( include/grpc/impl/codegen/log.h ) - s.files += %w( include/grpc/impl/codegen/port_platform.h ) s.files += %w( include/grpc/impl/codegen/port_platform.h ) s.files += %w( include/grpc/impl/codegen/propagation_bits.h ) s.files += %w( include/grpc/impl/codegen/slice.h ) s.files += %w( include/grpc/impl/codegen/status.h ) s.files += %w( include/grpc/impl/codegen/sync.h ) - s.files += %w( include/grpc/impl/codegen/sync.h ) - s.files += %w( include/grpc/impl/codegen/sync_custom.h ) s.files += %w( include/grpc/impl/codegen/sync_custom.h ) s.files += %w( include/grpc/impl/codegen/sync_generic.h ) - s.files += %w( include/grpc/impl/codegen/sync_generic.h ) - s.files += %w( include/grpc/impl/codegen/sync_posix.h ) s.files += %w( include/grpc/impl/codegen/sync_posix.h ) s.files += %w( include/grpc/impl/codegen/sync_windows.h ) - s.files += %w( include/grpc/impl/codegen/sync_windows.h ) s.files += %w( include/grpc/load_reporting.h ) s.files += %w( include/grpc/slice.h ) s.files += %w( include/grpc/slice_buffer.h ) diff --git a/package.xml b/package.xml index f21670193c6..fc63e5772b2 100644 --- a/package.xml +++ b/package.xml @@ -29,7 +29,6 @@ - @@ -40,41 +39,27 @@ - - - - - - - - - - - - - - diff --git a/templates/grpc.gemspec.template b/templates/grpc.gemspec.template index d8e850a68d2..e1741c2b26a 100644 --- a/templates/grpc.gemspec.template +++ b/templates/grpc.gemspec.template @@ -53,7 +53,7 @@ if lib.name in ruby_gem.get('deps', []): for file in (lib.get('public_headers', []) + lib.headers + lib.src): files.append(file) - files = sorted(files) + files = sorted(set(files)) %> % for file in files: s.files += %w( ${file} ) diff --git a/templates/package.xml.template b/templates/package.xml.template index f59791dfc71..80adbb97d4c 100644 --- a/templates/package.xml.template +++ b/templates/package.xml.template @@ -30,7 +30,7 @@ - + \ <% srcs = [] for src in (php_config_m4.src + php_config_m4.headers): @@ -39,8 +39,8 @@ if lib.name in php_config_m4.get('deps', []): for src in (lib.get('public_headers', []) + lib.headers + lib.src): srcs.append(src) - srcs = sorted(srcs) - %> + srcs = sorted(set(srcs)) + %> % for src in srcs: % endfor diff --git a/templates/src/python/grpcio/grpc_core_dependencies.py.template b/templates/src/python/grpcio/grpc_core_dependencies.py.template index e1b1d36a9d5..a62b54e45b0 100644 --- a/templates/src/python/grpcio/grpc_core_dependencies.py.template +++ b/templates/src/python/grpcio/grpc_core_dependencies.py.template @@ -21,7 +21,7 @@ if lib.name in python_dependencies.transitive_deps: for src in lib.src: srcs.append(src) - srcs = sorted(srcs) + srcs = sorted(set(srcs)) %> CORE_SOURCE_FILES = [ % for src in srcs: