[geode-native] branch release/1.8 updated: GEODE-5251: parameterize assembly info (#384)

[igodwin]

This is an automated email from the ASF dual-hosted git repository.

igodwin pushed a commit to branch release/1.8
in repository https://gitbox.apache.org/repos/asf/geode-native.git


The following commit(s) were added to refs/heads/release/1.8 by this push:
     new af0d98e  GEODE-5251: parameterize assembly info (#384)
af0d98e is described below

commit af0d98e10270cbec38bbe0cbd3b48e8c166429e2
Author: Blake Bender <ekalbred...@hotmail.com>
AuthorDate: Thu Nov 8 10:47:57 2018 -0800

    GEODE-5251: parameterize assembly info (#384)
    
    * We could already change the name(s) of the librarie(s) etc via cmake 
variables, but the assembly info in the .net DLL wasn't changing.  Now it can 
be changed based on the same cmake variables.
---
 CMakeLists.txt                        | 5 +++--
 clicache/src/impl/AssemblyInfo.cpp.in | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f50ecb..ecd902d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,8 @@ set(BUILD_BITS 64 CACHE STRING "Build for 64 (Geode default) 
or 32 bit.")
 
 set(PRODUCT_VENDOR "Apache" CACHE STRING "Product vendor")
 set(PRODUCT_VENDOR_NAME "The Apache Software Foundation" CACHE STRING "Product 
vendor full legal name")
-set(PRODUCT_NAME "Geode Native" CACHE STRING "Product name")
+set(PRODUCT_BASE_NAME "Geode" CACHE STRING "Product base name")
+set(PRODUCT_NAME "${PRODUCT_BASE_NAME} Native" CACHE STRING "Product name")
 set(PRODUCT_VERSION "0.0.42-build.0" CACHE STRING "Product version")
 set(PRODUCT_PACKAGE_NAME "apache-geode-native" CACHE STRING "Product package 
name")
 set(PRODUCT_BUILDDATE "1970-01-01" CACHE STRING "Product build date")
@@ -52,7 +53,7 @@ set(PRODUCT_SOURCE_REPOSITORY "<unspecified>" CACHE STRING 
"Product source branc
 set(PRODUCT_BITS "${BUILD_BITS}bit")
 
 set(PRODUCT_LIB_NAME "apache-geode" CACHE STRING "Binary name")
-set(PRODUCT_DLL_NAME "Apache.Geode" CACHE STRING ".Net Binary name")
+set(PRODUCT_DLL_NAME "${PRODUCT_VENDOR}.${PRODUCT_BASE_NAME}" CACHE STRING 
".Net Binary name")
 
 if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
   if (CMAKE_SYSTEM_PROCESSOR STREQUAL "sparc")
diff --git a/clicache/src/impl/AssemblyInfo.cpp.in 
b/clicache/src/impl/AssemblyInfo.cpp.in
index ce9735e..4d80e02 100644
--- a/clicache/src/impl/AssemblyInfo.cpp.in
+++ b/clicache/src/impl/AssemblyInfo.cpp.in
@@ -26,11 +26,11 @@ using namespace System::Security::Permissions;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 //
-[assembly:AssemblyTitleAttribute("Geode.NETCache")];
-[assembly:AssemblyDescriptionAttribute("Geode Native Client .NET Cache")];
+[assembly:AssemblyTitleAttribute("@PRODUCT_BASE_NAME@.NETCache")];
+[assembly:AssemblyDescriptionAttribute("@PRODUCT_NAME@ Client .NET Cache")];
 [assembly:AssemblyConfigurationAttribute("")];
-[assembly:AssemblyCompanyAttribute("Apache Software Foundation")];
-[assembly:AssemblyProductAttribute("Geode.NETCache")];
+[assembly:AssemblyCompanyAttribute("@PRODUCT_VENDOR_NAME@")];
+[assembly:AssemblyProductAttribute("@PRODUCT_BASE_NAME@.NETCache")];
 [assembly:AssemblyCopyrightAttribute("Licensed to the Apache Software 
Foundation (ASF) under one or more contributor license agreements.  See the 
NOTICE file distributed with this work for additional information regarding 
copyright ownership.")];
 [assembly:AssemblyTrademarkAttribute("All Rights Reserved")];
 [assembly:AssemblyCultureAttribute("")];