[cpp-sp] branch master updated: SSPCPP-743 Add Version information to messages.dll

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=69827073eb08963c29b4cacb25a12e36e72e4c2c

The following commit(s) were added to refs/heads/master by this push:
       new  6982707   SSPCPP-743 Add Version information to messages.dll
6982707 is described below

commit 69827073eb08963c29b4cacb25a12e36e72e4c2c
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Jul 15 15:38:01 2017 +0100

    SSPCPP-743 Add Version information to messages.dll
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-743
    
    Prototypes the mechanism to centralize versioning as needed for SSPCPP-744
---
 Projects/vc10/util/messages.vcxproj |   7 +++++++
 Projects/vc14/util/messages.vcxproj |  19 +++++++++++++++++++
 util/messageResource.rc             | Bin 52 -> 1490 bytes
 util/resourceCommon.rci             |  10 ++++++++++
 4 files changed, 36 insertions(+)

diff --git a/Projects/vc10/util/messages.vcxproj b/Projects/vc10/util/messages.vcxproj
index e128cc9..b6fb650 100644
--- a/Projects/vc10/util/messages.vcxproj
+++ b/Projects/vc10/util/messages.vcxproj
@@ -61,6 +61,9 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
+  <Import Project="..\..\..\..\BuildPath.props" />
+  <Import Project="$(ParentRoot)\Versions.props" />
+  <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <TargetExt>.dll</TargetExt>
     <LinkIncremental>false</LinkIncremental>
@@ -172,6 +175,10 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutputPath)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutputPath)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutputPath)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RC_FILE_VERSION=2,6,0;RC_PRODUCT_VERSION=2,6,0</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RC_FILE_VERSION=2,6,0;RC_PRODUCT_VERSION=2,6,0</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">RC_FILE_VERSION=2,6,0;RC_PRODUCT_VERSION=2,6,0</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">RC_FILE_VERSION=2,6,0;RC_PRODUCT_VERSION=2,6,0</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/Projects/vc14/util/messages.vcxproj b/Projects/vc14/util/messages.vcxproj
index 596bca1..39909da 100644
--- a/Projects/vc14/util/messages.vcxproj
+++ b/Projects/vc14/util/messages.vcxproj
@@ -66,6 +66,9 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
+  <Import Project="..\..\..\..\BuildPath.props" />
+  <Import Project="$(ParentRoot)\Versions.props" />
+  <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <TargetExt>.dll</TargetExt>
     <LinkIncremental>false</LinkIncremental>
@@ -108,6 +111,9 @@
     <ProjectReference>
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
     </ProjectReference>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -123,6 +129,9 @@
     <ProjectReference>
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
     </ProjectReference>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -142,6 +151,9 @@
     <ProjectReference>
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
     </ProjectReference>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
@@ -161,6 +173,9 @@
     <ProjectReference>
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
     </ProjectReference>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\..\util\message.mc">
@@ -181,6 +196,10 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutputPath)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutputPath)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutputPath)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RC_FILE_VERSION=2,6,0;RC_PRODUCT_VERSION=2,6,0</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RC_FILE_VERSION=2,6,0;RC_PRODUCT_VERSION=2,6,0</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">RC_FILE_VERSION=2,6,0;RC_PRODUCT_VERSION=2,6,0</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">RC_FILE_VERSION=2,6,0;RC_PRODUCT_VERSION=2,6,0</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/util/messageResource.rc b/util/messageResource.rc
index ba114f3..bb07da6 100644
Binary files a/util/messageResource.rc and b/util/messageResource.rc differ
diff --git a/util/resourceCommon.rci b/util/resourceCommon.rci
new file mode 100644
index 0000000..786f885
--- /dev/null
+++ b/util/resourceCommon.rci
@@ -0,0 +1,10 @@
+
+            VALUE "Comments", "\0"
+            VALUE "CompanyName", "Shibboleth Consortium\0"
+            VALUE "FileVersion", "2,6,0,0\0"
+            VALUE "LegalCopyright", "Copyright � 2016 UCAID\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "PrivateBuild", "\0"
+            VALUE "ProductName", "Shibboleth 2.6.0\0"
+            VALUE "ProductVersion", "2, 6, 0, 0\0"
+            VALUE "SpecialBuild", "\0"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.