From 8ab45383432f2bb520febc25422c328e062418ed Mon Sep 17 00:00:00 2001 From: Jan Tattermusch <jtattermusch@google.com> Date: Fri, 10 Apr 2015 18:24:28 -0700 Subject: [PATCH] introduced packages.include --- templates/vsprojects/grpc/packages.config.template | 9 ++------- .../grpc_csharp_ext/packages.config.template | 9 ++------- .../grpc_unsecure/packages.config.template | 7 ++----- templates/vsprojects/packages.include | 13 +++++++++++++ templates/vsprojects/vcxproj_defs.include | 1 + 5 files changed, 20 insertions(+), 19 deletions(-) create mode 100644 templates/vsprojects/packages.include diff --git a/templates/vsprojects/grpc/packages.config.template b/templates/vsprojects/grpc/packages.config.template index 04baa39080..66ac90eb08 100644 --- a/templates/vsprojects/grpc/packages.config.template +++ b/templates/vsprojects/grpc/packages.config.template @@ -1,7 +1,2 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="openssl" version="1.0.2.1" targetFramework="Native" /> - <package id="openssl.redist" version="1.0.2.1" targetFramework="Native" /> - <package id="zlib" version="1.2.8.7" targetFramework="Native" /> - <package id="zlib.redist" version="1.2.8.7" targetFramework="Native" /> -</packages> \ No newline at end of file +<%namespace file="../packages.include" import="gen_packages_config"/>\ +${gen_packages_config(['openssl','zlib'])} \ No newline at end of file diff --git a/templates/vsprojects/grpc_csharp_ext/packages.config.template b/templates/vsprojects/grpc_csharp_ext/packages.config.template index 04baa39080..4953b6451c 100644 --- a/templates/vsprojects/grpc_csharp_ext/packages.config.template +++ b/templates/vsprojects/grpc_csharp_ext/packages.config.template @@ -1,7 +1,2 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="openssl" version="1.0.2.1" targetFramework="Native" /> - <package id="openssl.redist" version="1.0.2.1" targetFramework="Native" /> - <package id="zlib" version="1.2.8.7" targetFramework="Native" /> - <package id="zlib.redist" version="1.2.8.7" targetFramework="Native" /> -</packages> \ No newline at end of file +<%namespace file="../packages.include" import="gen_packages_config"/>\ +${gen_packages_config(['openssl','zlib'])} \ No newline at end of file diff --git a/templates/vsprojects/grpc_unsecure/packages.config.template b/templates/vsprojects/grpc_unsecure/packages.config.template index b0829dd294..1337b5df2b 100644 --- a/templates/vsprojects/grpc_unsecure/packages.config.template +++ b/templates/vsprojects/grpc_unsecure/packages.config.template @@ -1,5 +1,2 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="zlib" version="1.2.8.7" targetFramework="Native" /> - <package id="zlib.redist" version="1.2.8.7" targetFramework="Native" /> -</packages> \ No newline at end of file +<%namespace file="../packages.include" import="gen_packages_config"/>\ +${gen_packages_config(['zlib'])} \ No newline at end of file diff --git a/templates/vsprojects/packages.include b/templates/vsprojects/packages.include new file mode 100644 index 0000000000..a288784607 --- /dev/null +++ b/templates/vsprojects/packages.include @@ -0,0 +1,13 @@ +<%def name="gen_packages_config(packages)">\ +<?xml version="1.0" encoding="utf-8"?> +<packages> + % if 'openssl' in packages: + <package id="openssl" version="1.0.2.1" targetFramework="Native" /> + <package id="openssl.redist" version="1.0.2.1" targetFramework="Native" /> + % endif + % if 'zlib' in packages: + <package id="zlib" version="1.2.8.7" targetFramework="Native" /> + <package id="zlib.redist" version="1.2.8.7" targetFramework="Native" /> + % endif +</packages> +</%def>\ \ No newline at end of file diff --git a/templates/vsprojects/vcxproj_defs.include b/templates/vsprojects/vcxproj_defs.include index 94ffbdbb72..12680d407c 100644 --- a/templates/vsprojects/vcxproj_defs.include +++ b/templates/vsprojects/vcxproj_defs.include @@ -1,3 +1,4 @@ +<%namespace file="packages.include" import="gen_packages_config"/>\ <%def name="get_repo_root()">..\..</%def>\ <%def name="to_windows_path(path)">${path.replace('/','\\')}</%def>\ <%def name="get_subsystem(is_library)">${'Windows' if is_library else 'Console'}</%def>\ -- GitLab