[shibboleth-sp2] 45/82: SSPCPP-737 Centralize version information for SP DLLS
Etienne Dysli Metref
edm-guest at moszumanska.debian.org
Thu Nov 16 08:16:23 UTC 2017
This is an automated email from the git hooks/post-receive script.
edm-guest pushed a commit to branch master
in repository shibboleth-sp2.
commit 8e96aa9058c0d302d3bc41aee58aa2d75f1223c8
Author: Rod Widdowson <rdw at steadingsoftware.com>
Date: Sun Jul 16 10:09:14 2017 +0100
SSPCPP-737 Centralize version information for SP DLLS
https://issues.shibboleth.net/jira/browse/SSPCPP-737
FILEVERSION and PRODUCTVERSION collect the first three digits from a value in Versions.props
Patch version remains under the control of the rc file (to all -in-version patches)
Inside StringFileInfo everything except
FileDescription
InternalName
OriginalFilename
Is centralized to an include file (util/resourceCommon.rci)
---
Projects/vc10/adfs/adfs-lite.vcxproj | 4 +++-
Projects/vc10/adfs/adfs.vcxproj | 4 +++-
Projects/vc10/apache/mod_shib13.vcxproj | 4 +++-
Projects/vc10/apache/mod_shib20.vcxproj | 4 +++-
Projects/vc10/apache/mod_shib22.vcxproj | 4 +++-
Projects/vc10/apache/mod_shib24.vcxproj | 4 +++-
Projects/vc10/fastcgi/shibauthorizer.vcxproj | 4 +++-
Projects/vc10/fastcgi/shibresponder.vcxproj | 4 +++-
Projects/vc10/isapi_shib/isapi_shib.vcxproj | 8 +++++---
Projects/vc10/memcache-store/memcache-store.vcxproj | 4 +++-
Projects/vc10/nsapi_shib/nsapi_shib.vcxproj | 4 +++-
Projects/vc10/odbc-store/odbc-store.vcxproj | 4 +++-
Projects/vc10/plugins/plugins-lite.vcxproj | 8 +++++---
Projects/vc10/plugins/plugins.vcxproj | 8 +++++---
Projects/vc10/shibd/shibd.vcxproj | 4 +++-
Projects/vc10/shibsp/shibsp-lite.vcxproj | 4 +++-
Projects/vc10/shibsp/shibsp.vcxproj | 8 +++++---
Projects/vc10/util/mdquery.vcxproj | 4 +++-
Projects/vc10/util/resolvertest.vcxproj | 4 +++-
Projects/vc14/adfs/adfs-lite.vcxproj | 8 +++++---
Projects/vc14/adfs/adfs.vcxproj | 8 +++++---
Projects/vc14/apache/mod_shib13.vcxproj | 8 +++++---
Projects/vc14/apache/mod_shib20.vcxproj | 8 +++++---
Projects/vc14/apache/mod_shib22.vcxproj | 8 +++++---
Projects/vc14/apache/mod_shib24.vcxproj | 8 +++++---
Projects/vc14/fastcgi/shibauthorizer.vcxproj | 8 +++++---
Projects/vc14/fastcgi/shibresponder.vcxproj | 8 +++++---
Projects/vc14/iis7_shib/iis7_shib.vcxproj | 8 ++++----
Projects/vc14/isapi_shib/isapi_shib.vcxproj | 8 +++++---
Projects/vc14/memcache-store/memcache-store.vcxproj | 8 +++++---
Projects/vc14/nsapi_shib/nsapi_shib.vcxproj | 8 +++++---
Projects/vc14/odbc-store/odbc-store.vcxproj | 8 +++++---
Projects/vc14/plugins/plugins-lite.vcxproj | 8 +++++---
Projects/vc14/plugins/plugins.vcxproj | 8 +++++---
Projects/vc14/shibd/shibd.vcxproj | 8 +++++---
Projects/vc14/shibsp/shibsp-lite.vcxproj | 8 +++++---
Projects/vc14/shibsp/shibsp.vcxproj | 8 +++++---
Projects/vc14/util/mdquery.vcxproj | 8 +++++---
Projects/vc14/util/messages.vcxproj | 9 +++------
Projects/vc14/util/resolvertest.vcxproj | 8 +++++---
Projects/vc17/iis7_shib/iis7_shib.vcxproj | 4 ++--
adfs/adfs.rc | 13 +++----------
apache/mod_shib_13.rc | 14 +++-----------
apache/mod_shib_20.rc | 14 +++-----------
apache/mod_shib_22.rc | 14 +++-----------
apache/mod_shib_24.rc | 14 +++-----------
fastcgi/shibauthorizer.rc | 14 +++-----------
fastcgi/shibresponder.rc | 14 +++-----------
isapi_shib/isapi_shib.rc | 10 +++-------
memcache-store/memcache-store.rc | 10 +++-------
nsapi_shib/nsapi_shib.rc | 14 +++-----------
odbc-store/odbc-store.rc | 10 +++-------
plugins/plugins.rc | 14 +++-----------
shibd/shibd.rc | 14 +++-----------
shibsp/shibsp.rc | 9 ++++-----
util/mdquery.rc | 14 +++-----------
util/messageResource.rc | Bin 1490 -> 1490 bytes
util/resolvertest.rc | 14 +++-----------
util/resourceCommon.rci | 4 ++++
59 files changed, 222 insertions(+), 253 deletions(-)
diff --git a/Projects/vc10/adfs/adfs-lite.vcxproj b/Projects/vc10/adfs/adfs-lite.vcxproj
index 1885037..d8a207c 100644
--- a/Projects/vc10/adfs/adfs-lite.vcxproj
+++ b/Projects/vc10/adfs/adfs-lite.vcxproj
@@ -194,7 +194,9 @@
<ClCompile Include="..\..\..\adfs\adfs.cpp" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\adfs\adfs.rc" />
+ <ResourceCompile Include="..\..\..\adfs\adfs.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\adfs\Makefile.am" />
diff --git a/Projects/vc10/adfs/adfs.vcxproj b/Projects/vc10/adfs/adfs.vcxproj
index b4ef4b8..ff4f38b 100644
--- a/Projects/vc10/adfs/adfs.vcxproj
+++ b/Projects/vc10/adfs/adfs.vcxproj
@@ -186,7 +186,9 @@
<ClCompile Include="..\..\..\adfs\adfs.cpp" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\adfs\adfs.rc" />
+ <ResourceCompile Include="..\..\..\adfs\adfs.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\adfs\Makefile.am" />
diff --git a/Projects/vc10/apache/mod_shib13.vcxproj b/Projects/vc10/apache/mod_shib13.vcxproj
index 2f27c77..355503c 100644
--- a/Projects/vc10/apache/mod_shib13.vcxproj
+++ b/Projects/vc10/apache/mod_shib13.vcxproj
@@ -234,7 +234,9 @@
<ClCompile Include="..\..\..\apache\mod_shib_13.cpp" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\apache\mod_shib_13.rc" />
+ <ResourceCompile Include="..\..\..\apache\mod_shib_13.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\apache\resource.h" />
diff --git a/Projects/vc10/apache/mod_shib20.vcxproj b/Projects/vc10/apache/mod_shib20.vcxproj
index 0271950..56667f6 100644
--- a/Projects/vc10/apache/mod_shib20.vcxproj
+++ b/Projects/vc10/apache/mod_shib20.vcxproj
@@ -240,7 +240,9 @@
<ClCompile Include="..\..\..\apache\mod_shib_20.cpp" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\apache\mod_shib_20.rc" />
+ <ResourceCompile Include="..\..\..\apache\mod_shib_20.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\apache\resource.h" />
diff --git a/Projects/vc10/apache/mod_shib22.vcxproj b/Projects/vc10/apache/mod_shib22.vcxproj
index 8ad6165..a949395 100644
--- a/Projects/vc10/apache/mod_shib22.vcxproj
+++ b/Projects/vc10/apache/mod_shib22.vcxproj
@@ -248,7 +248,9 @@
<ClCompile Include="..\..\..\apache\mod_shib_22.cpp" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\apache\mod_shib_22.rc" />
+ <ResourceCompile Include="..\..\..\apache\mod_shib_22.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\apache\resource.h" />
diff --git a/Projects/vc10/apache/mod_shib24.vcxproj b/Projects/vc10/apache/mod_shib24.vcxproj
index dc15a15..f33c08d 100644
--- a/Projects/vc10/apache/mod_shib24.vcxproj
+++ b/Projects/vc10/apache/mod_shib24.vcxproj
@@ -212,7 +212,9 @@
<ClCompile Include="..\..\..\apache\mod_shib_24.cpp" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\apache\mod_shib_24.rc" />
+ <ResourceCompile Include="..\..\..\apache\mod_shib_24.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\apache\resource.h" />
diff --git a/Projects/vc10/fastcgi/shibauthorizer.vcxproj b/Projects/vc10/fastcgi/shibauthorizer.vcxproj
index b5809e0..5160ee9 100644
--- a/Projects/vc10/fastcgi/shibauthorizer.vcxproj
+++ b/Projects/vc10/fastcgi/shibauthorizer.vcxproj
@@ -219,7 +219,9 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\fastcgi\shibauthorizer.rc" />
+ <ResourceCompile Include="..\..\..\fastcgi\shibauthorizer.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\shibsp\shibsp-lite.vcxproj">
diff --git a/Projects/vc10/fastcgi/shibresponder.vcxproj b/Projects/vc10/fastcgi/shibresponder.vcxproj
index 7296329..045d248 100644
--- a/Projects/vc10/fastcgi/shibresponder.vcxproj
+++ b/Projects/vc10/fastcgi/shibresponder.vcxproj
@@ -220,7 +220,9 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\fastcgi\shibresponder.rc" />
+ <ResourceCompile Include="..\..\..\fastcgi\shibresponder.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\shibsp\shibsp-lite.vcxproj">
diff --git a/Projects/vc10/isapi_shib/isapi_shib.vcxproj b/Projects/vc10/isapi_shib/isapi_shib.vcxproj
index 8b487c9..2ae9a6e 100644
--- a/Projects/vc10/isapi_shib/isapi_shib.vcxproj
+++ b/Projects/vc10/isapi_shib/isapi_shib.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -225,7 +225,9 @@
<ClCompile Include="..\..\..\util\RegistrySignature.cpp" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\Isapi_Shib\isapi_shib.rc" />
+ <ResourceCompile Include="..\..\..\Isapi_Shib\isapi_shib.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\Isapi_Shib\resource.h" />
@@ -239,4 +241,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc10/memcache-store/memcache-store.vcxproj b/Projects/vc10/memcache-store/memcache-store.vcxproj
index 7c1fd30..403975b 100644
--- a/Projects/vc10/memcache-store/memcache-store.vcxproj
+++ b/Projects/vc10/memcache-store/memcache-store.vcxproj
@@ -182,7 +182,9 @@
<ClCompile Include="..\..\..\memcache-store\memcache-store.cpp" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\memcache-store\memcache-store.rc" />
+ <ResourceCompile Include="..\..\..\memcache-store\memcache-store.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\memcache-store\resource.h" />
diff --git a/Projects/vc10/nsapi_shib/nsapi_shib.vcxproj b/Projects/vc10/nsapi_shib/nsapi_shib.vcxproj
index e182ae0..d82d830 100644
--- a/Projects/vc10/nsapi_shib/nsapi_shib.vcxproj
+++ b/Projects/vc10/nsapi_shib/nsapi_shib.vcxproj
@@ -224,7 +224,9 @@
<ClCompile Include="..\..\..\nsapi_shib\nsapi_shib.cpp" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\nsapi_shib\nsapi_shib.rc" />
+ <ResourceCompile Include="..\..\..\nsapi_shib\nsapi_shib.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\nsapi_shib\resource.h" />
diff --git a/Projects/vc10/odbc-store/odbc-store.vcxproj b/Projects/vc10/odbc-store/odbc-store.vcxproj
index 9c54825..e499165 100644
--- a/Projects/vc10/odbc-store/odbc-store.vcxproj
+++ b/Projects/vc10/odbc-store/odbc-store.vcxproj
@@ -183,7 +183,9 @@
<ClCompile Include="..\..\..\odbc-store\odbc-store.cpp" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\odbc-store\odbc-store.rc" />
+ <ResourceCompile Include="..\..\..\odbc-store\odbc-store.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\odbc-store\resource.h" />
diff --git a/Projects/vc10/plugins/plugins-lite.vcxproj b/Projects/vc10/plugins/plugins-lite.vcxproj
index 18cc3c5..8ec3d26 100644
--- a/Projects/vc10/plugins/plugins-lite.vcxproj
+++ b/Projects/vc10/plugins/plugins-lite.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -194,7 +194,9 @@
<None Include="..\..\..\plugins\Makefile.am" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\plugins\plugins.rc" />
+ <ResourceCompile Include="..\..\..\plugins\plugins.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\shibsp\shibsp-lite.vcxproj">
@@ -205,4 +207,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc10/plugins/plugins.vcxproj b/Projects/vc10/plugins/plugins.vcxproj
index 76b5798..faf11da 100644
--- a/Projects/vc10/plugins/plugins.vcxproj
+++ b/Projects/vc10/plugins/plugins.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -196,7 +196,9 @@
<None Include="..\..\..\plugins\Makefile.am" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\plugins\plugins.rc" />
+ <ResourceCompile Include="..\..\..\plugins\plugins.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\shibsp\shibsp.vcxproj">
@@ -207,4 +209,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc10/shibd/shibd.vcxproj b/Projects/vc10/shibd/shibd.vcxproj
index e6275aa..cd41835 100644
--- a/Projects/vc10/shibd/shibd.vcxproj
+++ b/Projects/vc10/shibd/shibd.vcxproj
@@ -214,7 +214,9 @@
<ClCompile Include="..\..\..\shibd\shibd_win32.cpp" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\shibd\shibd.rc" />
+ <ResourceCompile Include="..\..\..\shibd\shibd.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Projects\VC10\shibsp\shibsp.vcxproj">
diff --git a/Projects/vc10/shibsp/shibsp-lite.vcxproj b/Projects/vc10/shibsp/shibsp-lite.vcxproj
index 807d3d9..39f43e5 100644
--- a/Projects/vc10/shibsp/shibsp-lite.vcxproj
+++ b/Projects/vc10/shibsp/shibsp-lite.vcxproj
@@ -294,7 +294,9 @@
<ClInclude Include="..\..\..\shibsp\lite\SAMLConstants.h" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\shibsp\shibsp.rc" />
+ <ResourceCompile Include="..\..\..\shibsp\shibsp.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION_SP=$(SPFileVersionSP);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\shibsp\Makefile.am" />
diff --git a/Projects/vc10/shibsp/shibsp.vcxproj b/Projects/vc10/shibsp/shibsp.vcxproj
index 16ac9cd..5531272 100644
--- a/Projects/vc10/shibsp/shibsp.vcxproj
+++ b/Projects/vc10/shibsp/shibsp.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -355,7 +355,9 @@
<ClInclude Include="..\..\..\shibsp\metadata\MetadataProviderCriteria.h" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\shibsp\shibsp.rc" />
+ <ResourceCompile Include="..\..\..\shibsp\shibsp.rc">
+ <PreprocessorDefinitions>RC_FILE_VERSION_SP=$(SPFileVersionSP);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\shibsp\Makefile.am" />
@@ -365,4 +367,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc10/util/mdquery.vcxproj b/Projects/vc10/util/mdquery.vcxproj
index ebb2a38..da8695a 100644
--- a/Projects/vc10/util/mdquery.vcxproj
+++ b/Projects/vc10/util/mdquery.vcxproj
@@ -210,7 +210,9 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\util\mdquery.rc" />
+ <ResourceCompile Include="..\..\..\util\mdquery.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\util\resource.h" />
diff --git a/Projects/vc10/util/resolvertest.vcxproj b/Projects/vc10/util/resolvertest.vcxproj
index 97f195f..15df94e 100644
--- a/Projects/vc10/util/resolvertest.vcxproj
+++ b/Projects/vc10/util/resolvertest.vcxproj
@@ -213,7 +213,9 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\util\resolvertest.rc" />
+ <ResourceCompile Include="..\..\..\util\resolvertest.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\util\resource.h" />
diff --git a/Projects/vc14/adfs/adfs-lite.vcxproj b/Projects/vc14/adfs/adfs-lite.vcxproj
index 978e311..4899dd5 100644
--- a/Projects/vc14/adfs/adfs-lite.vcxproj
+++ b/Projects/vc14/adfs/adfs-lite.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -203,7 +203,9 @@
<ClCompile Include="..\..\..\adfs\adfs.cpp" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\adfs\adfs.rc" />
+ <ResourceCompile Include="..\..\..\adfs\adfs.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\adfs\Makefile.am" />
@@ -220,4 +222,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc14/adfs/adfs.vcxproj b/Projects/vc14/adfs/adfs.vcxproj
index 47a9e1a..114d50e 100644
--- a/Projects/vc14/adfs/adfs.vcxproj
+++ b/Projects/vc14/adfs/adfs.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -201,7 +201,9 @@
<ClCompile Include="..\..\..\adfs\adfs.cpp" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\adfs\adfs.rc" />
+ <ResourceCompile Include="..\..\..\adfs\adfs.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\adfs\Makefile.am" />
@@ -218,4 +220,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc14/apache/mod_shib13.vcxproj b/Projects/vc14/apache/mod_shib13.vcxproj
index 6aed438..a665244 100644
--- a/Projects/vc14/apache/mod_shib13.vcxproj
+++ b/Projects/vc14/apache/mod_shib13.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -242,7 +242,9 @@
<ClCompile Include="..\..\..\apache\mod_shib_13.cpp" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\apache\mod_shib_13.rc" />
+ <ResourceCompile Include="..\..\..\apache\mod_shib_13.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\apache\resource.h" />
@@ -256,4 +258,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc14/apache/mod_shib20.vcxproj b/Projects/vc14/apache/mod_shib20.vcxproj
index feaf8ed..a469209 100644
--- a/Projects/vc14/apache/mod_shib20.vcxproj
+++ b/Projects/vc14/apache/mod_shib20.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -248,7 +248,9 @@
<ClCompile Include="..\..\..\apache\mod_shib_20.cpp" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\apache\mod_shib_20.rc" />
+ <ResourceCompile Include="..\..\..\apache\mod_shib_20.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\apache\resource.h" />
@@ -262,4 +264,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc14/apache/mod_shib22.vcxproj b/Projects/vc14/apache/mod_shib22.vcxproj
index e75b4ce..e9b72ed 100644
--- a/Projects/vc14/apache/mod_shib22.vcxproj
+++ b/Projects/vc14/apache/mod_shib22.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -256,7 +256,9 @@
<ClCompile Include="..\..\..\apache\mod_shib_22.cpp" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\apache\mod_shib_22.rc" />
+ <ResourceCompile Include="..\..\..\apache\mod_shib_22.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\apache\resource.h" />
@@ -270,4 +272,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc14/apache/mod_shib24.vcxproj b/Projects/vc14/apache/mod_shib24.vcxproj
index 18175bb..dcb8cd9 100644
--- a/Projects/vc14/apache/mod_shib24.vcxproj
+++ b/Projects/vc14/apache/mod_shib24.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -221,7 +221,9 @@
<ClCompile Include="..\..\..\apache\mod_shib_24.cpp" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\apache\mod_shib_24.rc" />
+ <ResourceCompile Include="..\..\..\apache\mod_shib_24.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\apache\resource.h" />
@@ -235,4 +237,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc14/fastcgi/shibauthorizer.vcxproj b/Projects/vc14/fastcgi/shibauthorizer.vcxproj
index 5c0a9b6..9d1aadf 100644
--- a/Projects/vc14/fastcgi/shibauthorizer.vcxproj
+++ b/Projects/vc14/fastcgi/shibauthorizer.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -227,7 +227,9 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\fastcgi\shibauthorizer.rc" />
+ <ResourceCompile Include="..\..\..\fastcgi\shibauthorizer.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\shibsp\shibsp-lite.vcxproj">
@@ -238,4 +240,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc14/fastcgi/shibresponder.vcxproj b/Projects/vc14/fastcgi/shibresponder.vcxproj
index b9a0b66..9dc6025 100644
--- a/Projects/vc14/fastcgi/shibresponder.vcxproj
+++ b/Projects/vc14/fastcgi/shibresponder.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -228,7 +228,9 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\fastcgi\shibresponder.rc" />
+ <ResourceCompile Include="..\..\..\fastcgi\shibresponder.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\shibsp\shibsp-lite.vcxproj">
@@ -239,4 +241,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc14/iis7_shib/iis7_shib.vcxproj b/Projects/vc14/iis7_shib/iis7_shib.vcxproj
index a6289e9..c57ee38 100644
--- a/Projects/vc14/iis7_shib/iis7_shib.vcxproj
+++ b/Projects/vc14/iis7_shib/iis7_shib.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -205,8 +205,8 @@
<ClCompile Include="..\..\..\util\RegistrySignature.cpp" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\Iis7_Shib\iis7_shib.rc">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+ <ResourceCompile Include="..\..\..\Iis7_Shib\iis7_shib.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
@@ -225,4 +225,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc14/isapi_shib/isapi_shib.vcxproj b/Projects/vc14/isapi_shib/isapi_shib.vcxproj
index 724d98c..ff0ff37 100644
--- a/Projects/vc14/isapi_shib/isapi_shib.vcxproj
+++ b/Projects/vc14/isapi_shib/isapi_shib.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -239,7 +239,9 @@
<ClCompile Include="..\..\..\util\RegistrySignature.cpp" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\Isapi_Shib\isapi_shib.rc" />
+ <ResourceCompile Include="..\..\..\Isapi_Shib\isapi_shib.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\Isapi_Shib\resource.h" />
@@ -253,4 +255,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc14/memcache-store/memcache-store.vcxproj b/Projects/vc14/memcache-store/memcache-store.vcxproj
index d8ccbe3..19d4d2d 100644
--- a/Projects/vc14/memcache-store/memcache-store.vcxproj
+++ b/Projects/vc14/memcache-store/memcache-store.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -192,7 +192,9 @@
<ClCompile Include="..\..\..\memcache-store\memcache-store.cpp" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\memcache-store\memcache-store.rc" />
+ <ResourceCompile Include="..\..\..\memcache-store\memcache-store.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\memcache-store\resource.h" />
@@ -206,4 +208,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc14/nsapi_shib/nsapi_shib.vcxproj b/Projects/vc14/nsapi_shib/nsapi_shib.vcxproj
index 54b4a7c..a81f365 100644
--- a/Projects/vc14/nsapi_shib/nsapi_shib.vcxproj
+++ b/Projects/vc14/nsapi_shib/nsapi_shib.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -231,7 +231,9 @@
<ClCompile Include="..\..\..\nsapi_shib\nsapi_shib.cpp" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\nsapi_shib\nsapi_shib.rc" />
+ <ResourceCompile Include="..\..\..\nsapi_shib\nsapi_shib.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\nsapi_shib\resource.h" />
@@ -245,4 +247,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc14/odbc-store/odbc-store.vcxproj b/Projects/vc14/odbc-store/odbc-store.vcxproj
index e638412..7a3e5a3 100644
--- a/Projects/vc14/odbc-store/odbc-store.vcxproj
+++ b/Projects/vc14/odbc-store/odbc-store.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -196,7 +196,9 @@
<ClCompile Include="..\..\..\odbc-store\odbc-store.cpp" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\odbc-store\odbc-store.rc" />
+ <ResourceCompile Include="..\..\..\odbc-store\odbc-store.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\odbc-store\resource.h" />
@@ -204,4 +206,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc14/plugins/plugins-lite.vcxproj b/Projects/vc14/plugins/plugins-lite.vcxproj
index c20a527..83b580b 100644
--- a/Projects/vc14/plugins/plugins-lite.vcxproj
+++ b/Projects/vc14/plugins/plugins-lite.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -203,7 +203,9 @@
<None Include="..\..\..\plugins\Makefile.am" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\plugins\plugins.rc" />
+ <ResourceCompile Include="..\..\..\plugins\plugins.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\shibsp\shibsp-lite.vcxproj">
@@ -214,4 +216,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc14/plugins/plugins.vcxproj b/Projects/vc14/plugins/plugins.vcxproj
index 00af7a6..f4d3bcf 100644
--- a/Projects/vc14/plugins/plugins.vcxproj
+++ b/Projects/vc14/plugins/plugins.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -211,7 +211,9 @@
<None Include="..\..\..\plugins\Makefile.am" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\plugins\plugins.rc" />
+ <ResourceCompile Include="..\..\..\plugins\plugins.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\shibsp\shibsp.vcxproj">
@@ -222,4 +224,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc14/shibd/shibd.vcxproj b/Projects/vc14/shibd/shibd.vcxproj
index af3a667..ee3e56c 100644
--- a/Projects/vc14/shibd/shibd.vcxproj
+++ b/Projects/vc14/shibd/shibd.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -225,7 +225,9 @@
<ClCompile Include="..\..\..\shibd\shibd_win32.cpp" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\shibd\shibd.rc" />
+ <ResourceCompile Include="..\..\..\shibd\shibd.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Projects\VC14\shibsp\shibsp.vcxproj">
@@ -236,4 +238,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc14/shibsp/shibsp-lite.vcxproj b/Projects/vc14/shibsp/shibsp-lite.vcxproj
index 985cfbf..4fb3ab0 100644
--- a/Projects/vc14/shibsp/shibsp-lite.vcxproj
+++ b/Projects/vc14/shibsp/shibsp-lite.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -302,7 +302,9 @@
<ClInclude Include="..\..\..\shibsp\lite\SAMLConstants.h" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\shibsp\shibsp.rc" />
+ <ResourceCompile Include="..\..\..\shibsp\shibsp.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION_SP=$(SPFileVersionSP);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\shibsp\Makefile.am" />
@@ -312,4 +314,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc14/shibsp/shibsp.vcxproj b/Projects/vc14/shibsp/shibsp.vcxproj
index 43115d7..5bb9c8e 100644
--- a/Projects/vc14/shibsp/shibsp.vcxproj
+++ b/Projects/vc14/shibsp/shibsp.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -370,7 +370,9 @@
<ClInclude Include="..\..\..\shibsp\metadata\MetadataProviderCriteria.h" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\shibsp\shibsp.rc" />
+ <ResourceCompile Include="..\..\..\shibsp\shibsp.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION_SP=$(SPFileVersionSP);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\shibsp\Makefile.am" />
@@ -380,4 +382,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc14/util/mdquery.vcxproj b/Projects/vc14/util/mdquery.vcxproj
index 2bf6afe..db2d948 100644
--- a/Projects/vc14/util/mdquery.vcxproj
+++ b/Projects/vc14/util/mdquery.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -220,7 +220,9 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\util\mdquery.rc" />
+ <ResourceCompile Include="..\..\..\util\mdquery.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\util\resource.h" />
@@ -228,4 +230,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc14/util/messages.vcxproj b/Projects/vc14/util/messages.vcxproj
index 39909da..ca6a7d2 100644
--- a/Projects/vc14/util/messages.vcxproj
+++ b/Projects/vc14/util/messages.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -196,13 +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>
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
</ResourceCompile>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc14/util/resolvertest.vcxproj b/Projects/vc14/util/resolvertest.vcxproj
index 94b5e30..758449a 100644
--- a/Projects/vc14/util/resolvertest.vcxproj
+++ b/Projects/vc14/util/resolvertest.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -226,7 +226,9 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\util\resolvertest.rc" />
+ <ResourceCompile Include="..\..\..\util\resolvertest.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\util\resource.h" />
@@ -234,4 +236,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc17/iis7_shib/iis7_shib.vcxproj b/Projects/vc17/iis7_shib/iis7_shib.vcxproj
index edff911..0dc12bf 100644
--- a/Projects/vc17/iis7_shib/iis7_shib.vcxproj
+++ b/Projects/vc17/iis7_shib/iis7_shib.vcxproj
@@ -207,8 +207,8 @@
<ClCompile Include="..\..\..\iis7_shib\ShibUser.cpp" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="..\..\..\Iis7_Shib\iis7_shib.rc">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+ <ResourceCompile Include="..\..\..\Iis7_Shib\iis7_shib.rc" >
+ <PreprocessorDefinitions>RC_FILE_VERSION=$(SPFileVersion);RC_PRODUCT_VERSION=$(SPProductVersion)</PreprocessorDefinitions>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
diff --git a/adfs/adfs.rc b/adfs/adfs.rc
index 5ec2c03..52a1556 100644
--- a/adfs/adfs.rc
+++ b/adfs/adfs.rc
@@ -54,8 +54,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,6,0,0
- PRODUCTVERSION 2,6,0,0
+ FILEVERSION RC_FILE_VERSION ,0
+ PRODUCTVERSION RC_PRODUCT_VERSION ,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -70,8 +70,7 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "Comments", "\0"
- VALUE "CompanyName", "Shibboleth Consortium\0"
+#include "..\util\resourceCommon.rci"
VALUE "FileDescription", "Shibboleth ADFSv1 Plugin\0"
VALUE "FileVersion", "2, 6, 0, 0\0"
#ifdef SHIBSP_LITE
@@ -79,17 +78,11 @@ BEGIN
#else
VALUE "InternalName", "adfs\0"
#endif
- VALUE "LegalCopyright", "Copyright � 2016 UCAID\0"
- VALUE "LegalTrademarks", "\0"
#ifdef SHIBSP_LITE
VALUE "OriginalFilename", "adfs-lite.so\0"
#else
VALUE "OriginalFilename", "adfs.so\0"
#endif
- VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.6.0\0"
- VALUE "ProductVersion", "2, 6, 0, 0\0"
- VALUE "SpecialBuild", "\0"
END
END
BLOCK "VarFileInfo"
diff --git a/apache/mod_shib_13.rc b/apache/mod_shib_13.rc
index 2f13146..6cf50ce 100644
--- a/apache/mod_shib_13.rc
+++ b/apache/mod_shib_13.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,6,0,0
- PRODUCTVERSION 2,6,0,0
+ FILEVERSION RC_FILE_VERSION ,0
+ PRODUCTVERSION RC_PRODUCT_VERSION ,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -44,18 +44,10 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "Comments", "\0"
- VALUE "CompanyName", "Shibboleth Consortium\0"
+#include "..\util\resourceCommon.rci"
VALUE "FileDescription", "Shibboleth Apache 1.3 Module\0"
- VALUE "FileVersion", "2, 6, 0, 0\0"
VALUE "InternalName", "mod_shib_13\0"
- VALUE "LegalCopyright", "Copyright � 2016 UCAID\0"
- VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "mod_shib_13.so\0"
- VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.6.0\0"
- VALUE "ProductVersion", "2, 6, 0, 0\0"
- VALUE "SpecialBuild", "\0"
END
END
BLOCK "VarFileInfo"
diff --git a/apache/mod_shib_20.rc b/apache/mod_shib_20.rc
index c27420e..a2a5777 100644
--- a/apache/mod_shib_20.rc
+++ b/apache/mod_shib_20.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,6,0,0
- PRODUCTVERSION 2,6,0,0
+ FILEVERSION RC_FILE_VERSION ,0
+ PRODUCTVERSION RC_PRODUCT_VERSION ,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -44,18 +44,10 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "Comments", "\0"
- VALUE "CompanyName", "Shibboleth Consortium\0"
+#include "..\util\resourceCommon.rci"
VALUE "FileDescription", "Shibboleth Apache 2.0 Module\0"
- VALUE "FileVersion", "2, 6, 0, 0\0"
VALUE "InternalName", "mod_shib_20\0"
- VALUE "LegalCopyright", "Copyright � 2016 UCAID\0"
- VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "mod_shib_20.so\0"
- VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.6.0\0"
- VALUE "ProductVersion", "2, 6, 0, 0\0"
- VALUE "SpecialBuild", "\0"
END
END
BLOCK "VarFileInfo"
diff --git a/apache/mod_shib_22.rc b/apache/mod_shib_22.rc
index a8e9123..8981d03 100644
--- a/apache/mod_shib_22.rc
+++ b/apache/mod_shib_22.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,6,0,0
- PRODUCTVERSION 2,6,0,0
+ FILEVERSION RC_FILE_VERSION ,0
+ PRODUCTVERSION RC_PRODUCT_VERSION ,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -44,18 +44,10 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "Comments", "\0"
- VALUE "CompanyName", "Shibboleth Consortium\0"
+#include "..\util\resourceCommon.rci"
VALUE "FileDescription", "Shibboleth Apache 2.2 Module\0"
- VALUE "FileVersion", "2, 6, 0, 0\0"
VALUE "InternalName", "mod_shib_22\0"
- VALUE "LegalCopyright", "Copyright � 2016 UCAID\0"
- VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "mod_shib_22.so\0"
- VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.6.0\0"
- VALUE "ProductVersion", "2, 6, 0, 0\0"
- VALUE "SpecialBuild", "\0"
END
END
BLOCK "VarFileInfo"
diff --git a/apache/mod_shib_24.rc b/apache/mod_shib_24.rc
index 45f293c..b7c90e9 100644
--- a/apache/mod_shib_24.rc
+++ b/apache/mod_shib_24.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,6,0,0
- PRODUCTVERSION 2,6,0,0
+ FILEVERSION RC_FILE_VERSION ,0
+ PRODUCTVERSION RC_PRODUCT_VERSION ,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -44,18 +44,10 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "Comments", "\0"
- VALUE "CompanyName", "Shibboleth Consortium\0"
+#include "..\util\resourceCommon.rci"
VALUE "FileDescription", "Shibboleth Apache 2.4 Module\0"
- VALUE "FileVersion", "2, 6, 0, 0\0"
VALUE "InternalName", "mod_shib_24\0"
- VALUE "LegalCopyright", "Copyright � 2016 UCAID\0"
- VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "mod_shib_24.so\0"
- VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.6.0\0"
- VALUE "ProductVersion", "2, 6, 0, 0\0"
- VALUE "SpecialBuild", "\0"
END
END
BLOCK "VarFileInfo"
diff --git a/fastcgi/shibauthorizer.rc b/fastcgi/shibauthorizer.rc
index 381cfbf..56ed5fb 100644
--- a/fastcgi/shibauthorizer.rc
+++ b/fastcgi/shibauthorizer.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,6,0,0
- PRODUCTVERSION 2,6,0,0
+ FILEVERSION RC_FILE_VERSION ,0
+ PRODUCTVERSION RC_PRODUCT_VERSION ,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -44,18 +44,10 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "Comments", "\0"
- VALUE "CompanyName", "Shibboleth Consortium\0"
+#include "..\util\resourceCommon.rci"
VALUE "FileDescription", "Shibboleth FastCGI Authorizer\0"
- VALUE "FileVersion", "2, 6, 0, 0\0"
VALUE "InternalName", "shibauthorizer\0"
- VALUE "LegalCopyright", "Copyright � 2016 UCAID\0"
- VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "shibauthorizer.exe\0"
- VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.6.0\0"
- VALUE "ProductVersion", "2, 6, 0, 0\0"
- VALUE "SpecialBuild", "\0"
END
END
BLOCK "VarFileInfo"
diff --git a/fastcgi/shibresponder.rc b/fastcgi/shibresponder.rc
index 87c7c53..e318340 100644
--- a/fastcgi/shibresponder.rc
+++ b/fastcgi/shibresponder.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,6,0,0
- PRODUCTVERSION 2,6,0,0
+ FILEVERSION RC_FILE_VERSION ,0
+ PRODUCTVERSION RC_PRODUCT_VERSION ,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -44,18 +44,10 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "Comments", "\0"
- VALUE "CompanyName", "Shibboleth Consortium\0"
+#include "..\util\resourceCommon.rci"
VALUE "FileDescription", "Shibboleth FastCGI Responder\0"
- VALUE "FileVersion", "2, 6, 0, 0\0"
VALUE "InternalName", "shibresponder\0"
- VALUE "LegalCopyright", "Copyright � 2016 UCAID\0"
- VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "shibresponder.exe\0"
- VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.6.0\0"
- VALUE "ProductVersion", "2, 6, 0, 0\0"
- VALUE "SpecialBuild", "\0"
END
END
BLOCK "VarFileInfo"
diff --git a/isapi_shib/isapi_shib.rc b/isapi_shib/isapi_shib.rc
index 41b19c5..cbad15b 100644
--- a/isapi_shib/isapi_shib.rc
+++ b/isapi_shib/isapi_shib.rc
@@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,6,0,1
- PRODUCTVERSION 2,6,0,1
+ FILEVERSION RC_FILE_VERSION ,1
+ PRODUCTVERSION RC_PRODUCT_VERSION,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -41,14 +41,10 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "CompanyName", "Shibboleth Consortium"
+#include "..\util\resourceCommon.rci"
VALUE "FileDescription", "Shibboleth ISAPI Filter / Extension"
- VALUE "FileVersion", "2.6.0.1"
VALUE "InternalName", "isapi_shib"
- VALUE "LegalCopyright", "Copyright � 2016 UCAID"
VALUE "OriginalFilename", "isapi_shib.dll"
- VALUE "ProductName", "Shibboleth 2.6.0"
- VALUE "ProductVersion", "2.6.0.1"
END
END
BLOCK "VarFileInfo"
diff --git a/memcache-store/memcache-store.rc b/memcache-store/memcache-store.rc
index c94feb4..506d7b1 100644
--- a/memcache-store/memcache-store.rc
+++ b/memcache-store/memcache-store.rc
@@ -53,8 +53,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,6,0,0
- PRODUCTVERSION 2,6,0,0
+ FILEVERSION RC_FILE_VERSION ,0
+ PRODUCTVERSION RC_PRODUCT_VERSION ,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -69,14 +69,10 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "CompanyName", "Shibboleth Consortium\0"
+#include "..\util\resourceCommon.rci"
VALUE "FileDescription", "Shibboleth Memcache Storage Service Plugin\0"
- VALUE "FileVersion", "2, 6, 0, 0\0"
VALUE "InternalName", "memcache-store\0"
- VALUE "LegalCopyright", "Copyright � 2016 UCAID\0"
VALUE "OriginalFilename", "memcache-store.so\0"
- VALUE "ProductName", "Shibboleth 2.6.0\0"
- VALUE "ProductVersion", "2, 6, 0, 0\0"
END
END
BLOCK "VarFileInfo"
diff --git a/nsapi_shib/nsapi_shib.rc b/nsapi_shib/nsapi_shib.rc
index e8e3440..e3aaee3 100644
--- a/nsapi_shib/nsapi_shib.rc
+++ b/nsapi_shib/nsapi_shib.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,6,0,0
- PRODUCTVERSION 2,6,0,0
+ FILEVERSION RC_FILE_VERSION ,0
+ PRODUCTVERSION RC_PRODUCT_VERSION ,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -44,18 +44,10 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "Comments", "\0"
- VALUE "CompanyName", "Shibboleth Consortium\0"
+#include "..\util\resourceCommon.rci"
VALUE "FileDescription", "Shibboleth NSAPI Extension\0"
- VALUE "FileVersion", "2, 6, 0, 0\0"
VALUE "InternalName", "nsapi_shib\0"
- VALUE "LegalCopyright", "Copyright � 2016 UCAID\0"
- VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "nsapi_shib.dll\0"
- VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.6.0\0"
- VALUE "ProductVersion", "2, 6, 0, 0\0"
- VALUE "SpecialBuild", "\0"
END
END
BLOCK "VarFileInfo"
diff --git a/odbc-store/odbc-store.rc b/odbc-store/odbc-store.rc
index 17d5645..c080114 100644
--- a/odbc-store/odbc-store.rc
+++ b/odbc-store/odbc-store.rc
@@ -53,8 +53,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,6,0,0
- PRODUCTVERSION 2,6,0,0
+ FILEVERSION RC_FILE_VERSION ,0
+ PRODUCTVERSION RC_PRODUCT_VERSION ,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -69,14 +69,10 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "CompanyName", "Shibboleth Consortium\0"
+#include "..\util\resourceCommon.rci"
VALUE "FileDescription", "Shibboleth ODBC Storage Service Plugin\0"
- VALUE "FileVersion", "2, 6, 0, 0\0"
VALUE "InternalName", "odbc-store\0"
- VALUE "LegalCopyright", "Copyright � 2016 UCAID\0"
VALUE "OriginalFilename", "odbc-store.so\0"
- VALUE "ProductName", "Shibboleth 2.6.0\0"
- VALUE "ProductVersion", "2, 6, 0, 0\0"
END
END
BLOCK "VarFileInfo"
diff --git a/plugins/plugins.rc b/plugins/plugins.rc
index dca2b33..2e579b8 100644
--- a/plugins/plugins.rc
+++ b/plugins/plugins.rc
@@ -54,8 +54,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,6,0,0
- PRODUCTVERSION 2,6,0,0
+ FILEVERSION RC_FILE_VERSION ,0
+ PRODUCTVERSION RC_PRODUCT_VERSION ,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -70,26 +70,18 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "Comments", "\0"
- VALUE "CompanyName", "Shibboleth Consortium\0"
+#include "..\util\resourceCommon.rci"
VALUE "FileDescription", "Shibboleth SP Plugins\0"
- VALUE "FileVersion", "2, 6, 0, 0\0"
#ifdef SHIBSP_LITE
VALUE "InternalName", "plugins-lite\0"
#else
VALUE "InternalName", "plugins\0"
#endif
- VALUE "LegalCopyright", "Copyright � 2016 UCAID\0"
- VALUE "LegalTrademarks", "\0"
#ifdef SHIBSP_LITE
VALUE "OriginalFilename", "plugins-lite.so\0"
#else
VALUE "OriginalFilename", "plugins.so\0"
#endif
- VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.6.0\0"
- VALUE "ProductVersion", "2, 6, 0, 0\0"
- VALUE "SpecialBuild", "\0"
END
END
BLOCK "VarFileInfo"
diff --git a/shibd/shibd.rc b/shibd/shibd.rc
index 6c66a78..3265088 100644
--- a/shibd/shibd.rc
+++ b/shibd/shibd.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,6,0,0
- PRODUCTVERSION 2,6,0,0
+ FILEVERSION RC_FILE_VERSION ,0
+ PRODUCTVERSION RC_PRODUCT_VERSION ,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -44,18 +44,10 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "Comments", "\0"
- VALUE "CompanyName", "Shibboleth Consortium\0"
+#include "..\util\resourceCommon.rci"
VALUE "FileDescription", "Shibboleth Daemon Service\0"
- VALUE "FileVersion", "2, 6, 0, 0\0"
VALUE "InternalName", "shibd\0"
- VALUE "LegalCopyright", "Copyright � 2016 UCAID\0"
- VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "shibd.exe\0"
- VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.6.0\0"
- VALUE "ProductVersion", "2, 6, 0, 0\0"
- VALUE "SpecialBuild", "\0"
END
END
BLOCK "VarFileInfo"
diff --git a/shibsp/shibsp.rc b/shibsp/shibsp.rc
index 5199fc7..ad4e5f3 100644
--- a/shibsp/shibsp.rc
+++ b/shibsp/shibsp.rc
@@ -26,10 +26,11 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
// Version
//
+#define RC_IS_SP 1
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,6,0,0
- PRODUCTVERSION 2,6,0,0
+ FILEVERSION RC_FILE_VERSION_SP ,0
+ PRODUCTVERSION RC_PRODUCT_VERSION ,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -44,14 +45,12 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "Comments", "\0"
- VALUE "CompanyName", "Shibboleth Consortium\0"
+#include "..\util\resourceCommon.rci"
#ifdef SHIBSP_LITE
VALUE "FileDescription", "Shibboleth SP Lite Library\0"
#else
VALUE "FileDescription", "Shibboleth SP Library\0"
#endif
- VALUE "FileVersion", "1, 6, 0, 0\0"
#ifdef SHIBSP_LITE
#ifdef _DEBUG
VALUE "InternalName", "shibsp-lite1_6D\0"
diff --git a/util/mdquery.rc b/util/mdquery.rc
index 8c4a595..8e50d5c 100644
--- a/util/mdquery.rc
+++ b/util/mdquery.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,6,0,0
- PRODUCTVERSION 2,6,0,0
+ FILEVERSION RC_FILE_VERSION ,0
+ PRODUCTVERSION RC_PRODUCT_VERSION ,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -44,18 +44,10 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "Comments", "\0"
- VALUE "CompanyName", "Shibboleth Consortium\0"
+#include "..\util\resourceCommon.rci"
VALUE "FileDescription", "Metadata Query Utility\0"
- VALUE "FileVersion", "2, 6, 0, 0\0"
VALUE "InternalName", "mdquery\0"
- VALUE "LegalCopyright", "Copyright � 2016 UCAID\0"
- VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "mdquery.exe\0"
- VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.6.0\0"
- VALUE "ProductVersion", "2, 6, 0, 0\0"
- VALUE "SpecialBuild", "\0"
END
END
BLOCK "VarFileInfo"
diff --git a/util/messageResource.rc b/util/messageResource.rc
index bb07da6..5c07679 100644
Binary files a/util/messageResource.rc and b/util/messageResource.rc differ
diff --git a/util/resolvertest.rc b/util/resolvertest.rc
index a13849d..251e85e 100644
--- a/util/resolvertest.rc
+++ b/util/resolvertest.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,6,0,0
- PRODUCTVERSION 2,6,0,0
+ FILEVERSION RC_FILE_VERSION ,0
+ PRODUCTVERSION RC_PRODUCT_VERSION ,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -44,18 +44,10 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "Comments", "\0"
- VALUE "CompanyName", "Shibboleth Consortium\0"
+#include "..\util\resourceCommon.rci"
VALUE "FileDescription", "Attribute Resolver Utility\0"
- VALUE "FileVersion", "2, 6, 0, 0\0"
VALUE "InternalName", "resolvertest\0"
- VALUE "LegalCopyright", "Copyright � 2016 UCAID\0"
- VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "resolvertest.exe\0"
- VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.6.0\0"
- VALUE "ProductVersion", "2, 6, 0, 0\0"
- VALUE "SpecialBuild", "\0"
END
END
BLOCK "VarFileInfo"
diff --git a/util/resourceCommon.rci b/util/resourceCommon.rci
index 786f885..b088a7d 100644
--- a/util/resourceCommon.rci
+++ b/util/resourceCommon.rci
@@ -1,7 +1,11 @@
VALUE "Comments", "\0"
VALUE "CompanyName", "Shibboleth Consortium\0"
+#ifdef RC_IS_SP
+ VALUE "FileVersion", "1,6,0,0\0"
+#else
VALUE "FileVersion", "2,6,0,0\0"
+#endif
VALUE "LegalCopyright", "Copyright � 2016 UCAID\0"
VALUE "LegalTrademarks", "\0"
VALUE "PrivateBuild", "\0"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git
More information about the Pkg-shibboleth-devel
mailing list