[cpp-sp] 02/02: Windows Build: Add the resource file into the shibps build

[Rod Widdowson]

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

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

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

commit 49b9439baa9b35a19464ff4de4f0c6a95c4a87f0
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Jan 17 14:16:52 2025 +0000

    Windows Build: Add the resource file into the shibps build
    
    Also collapse away those values which are already in resourceCommon.rci
---
 Projects/vc22/shibsp.vcxproj         |  5 ++++-
 Projects/vc22/shibsp.vcxproj.filters |  5 +++++
 shibsp/shibsp.rc                     | 20 ++++++--------------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Projects/vc22/shibsp.vcxproj b/Projects/vc22/shibsp.vcxproj
index 37b9da49..8d3c56b0 100644
--- a/Projects/vc22/shibsp.vcxproj
+++ b/Projects/vc22/shibsp.vcxproj
@@ -161,6 +161,9 @@
     <ClCompile Include="..\..\shibsp\util\URLEncoder.cpp" />
     <ClCompile Include="..\..\shibsp\version.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\shibsp\shibsp.rc" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>17.0</VCProjectVersion>
     <Keyword>Win32Proj</Keyword>
@@ -379,4 +382,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Projects/vc22/shibsp.vcxproj.filters b/Projects/vc22/shibsp.vcxproj.filters
index dbce2412..97f55aad 100644
--- a/Projects/vc22/shibsp.vcxproj.filters
+++ b/Projects/vc22/shibsp.vcxproj.filters
@@ -369,4 +369,9 @@
       <Filter>Source Files\Session</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\shibsp\shibsp.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/shibsp/shibsp.rc b/shibsp/shibsp.rc
index 2f5eaf83..874b1b3c 100644
--- a/shibsp/shibsp.rc
+++ b/shibsp/shibsp.rc
@@ -1,13 +1,14 @@
 //Microsoft Developer Studio generated resource script.
 //
-#include "resource.h"
+#define __shibsp_base_h__ 
+#include "version.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+#include "winres.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -29,8 +30,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #define RC_IS_SP 1
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION RC_FILE_VERSION_SP ,0
- PRODUCTVERSION RC_PRODUCT_VERSION ,0
+ FILEVERSION SHIBSP_VERSION_MAJOR, SHIBSP_VERSION_MINOR, SHIBSP_VERSION_REVISION, SHIBSP_VERSION_PATCH
+ PRODUCTVERSION SHIBSP_VERSION_MAJOR, SHIBSP_VERSION_MINOR, SHIBSP_VERSION_REVISION, SHIBSP_VERSION_PATCH
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -49,20 +50,11 @@ BEGIN
             VALUE "FileDescription", "Shibboleth SP Library\0"
 #ifdef _DEBUG
             VALUE "InternalName", "shibsp4_0D\0"
-#else
-            VALUE "InternalName", "shibsp4_0\0"
-#endif
-            VALUE "LegalCopyright", "Copyright 2001-2024 Various\0"
-            VALUE "LegalTrademarks", "\0"
-#ifdef _DEBUG
             VALUE "OriginalFilename", "shibsp4_0D.dll\0"
 #else
+            VALUE "InternalName", "shibsp4_0\0"
             VALUE "OriginalFilename", "shibsp4_0.dll\0"
 #endif
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Shibboleth 4.0.0\0"
-            VALUE "ProductVersion", "4, 0, 0, 0\0"
-            VALUE "SpecialBuild", "\0"
         END
     END
     BLOCK "VarFileInfo"

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