[cpp-sp] 01/02: Windows Build: Get the version information (for the resource) file from version.h
Rod Widdowson
rdw at steadingsoftware.com
Fri Jan 17 14:19:45 UTC 2025
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=863b0ecacc86ee755bd76d654e177a176d963738
commit 863b0ecacc86ee755bd76d654e177a176d963738
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Jan 17 14:10:24 2025 +0000
Windows Build: Get the version information (for the resource) file from version.h
---
Projects/vc22/Apache.vcxproj | 26 ++++++++++++++++----------
Projects/vc22/Apache.vcxproj.filters | 5 -----
Projects/vc22/iis.vcxproj | 13 ++++++++-----
Projects/vc22/iis.vcxproj.filters | 3 ---
apache/mod_shib_24.rc | 8 +++++---
apache/resource.h | 35 -----------------------------------
iis7_shib/iis7_shib.rc | 7 ++++---
iis7_shib/resource.h | 15 ---------------
shibsp/version.h | 4 ++++
9 files changed, 37 insertions(+), 79 deletions(-)
diff --git a/Projects/vc22/Apache.vcxproj b/Projects/vc22/Apache.vcxproj
index 1eb81914..042c6a3c 100644
--- a/Projects/vc22/Apache.vcxproj
+++ b/Projects/vc22/Apache.vcxproj
@@ -29,9 +29,6 @@
<ItemGroup>
<ClCompile Include="..\..\apache\mod_shib_24.cpp" />
</ItemGroup>
- <ItemGroup>
- <ClInclude Include="resource.h" />
- </ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\apache\mod_shib_24.rc" />
</ItemGroup>
@@ -147,7 +144,8 @@
<AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;libhttpd.lib;libapr-1.lib;libaprutil-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ResourceCompile>
- <PreprocessorDefinitions>RC_FILE_VERSION=3,0,0;RC_PRODUCT_VERSION=3,0,0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(ProjectDir)..\..\shibsp</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions />
</ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -171,7 +169,9 @@
<AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;libhttpd.lib;libapr-1.lib;libaprutil-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ResourceCompile>
- <PreprocessorDefinitions>RC_FILE_VERSION=3,0,0;RC_PRODUCT_VERSION=3,0,0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>
+ </PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(ProjectDir)..\..\shibsp</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -191,7 +191,9 @@
<AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;libhttpd.lib;libapr-1.lib;libaprutil-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ResourceCompile>
- <PreprocessorDefinitions>RC_FILE_VERSION=3,0,0;RC_PRODUCT_VERSION=3,0,0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>
+ </PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(ProjectDir)..\..\shibsp</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
@@ -211,7 +213,8 @@
<AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;libhttpd.lib;libapr-1.lib;libaprutil-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ResourceCompile>
- <PreprocessorDefinitions>RC_FILE_VERSION=3,0,0;RC_PRODUCT_VERSION=3,0,0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(ProjectDir)..\..\shibsp</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions />
</ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -235,7 +238,9 @@
<AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;libhttpd.lib;libapr-1.lib;libaprutil-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ResourceCompile>
- <PreprocessorDefinitions>RC_FILE_VERSION=3,0,0;RC_PRODUCT_VERSION=3,0,0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>
+ </PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(ProjectDir)..\..\shibsp</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
@@ -259,10 +264,11 @@
<AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;libhttpd.lib;libapr-1.lib;libaprutil-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ResourceCompile>
- <PreprocessorDefinitions>RC_FILE_VERSION=3,0,0;RC_PRODUCT_VERSION=3,0,0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(ProjectDir)..\..\shibsp</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions />
</ResourceCompile>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Projects/vc22/Apache.vcxproj.filters b/Projects/vc22/Apache.vcxproj.filters
index 06605706..4679849e 100644
--- a/Projects/vc22/Apache.vcxproj.filters
+++ b/Projects/vc22/Apache.vcxproj.filters
@@ -19,11 +19,6 @@
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
- <ItemGroup>
- <ClInclude Include="resource.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- </ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\apache\mod_shib_24.rc">
<Filter>Resource Files</Filter>
diff --git a/Projects/vc22/iis.vcxproj b/Projects/vc22/iis.vcxproj
index 9143329f..23f88f77 100644
--- a/Projects/vc22/iis.vcxproj
+++ b/Projects/vc22/iis.vcxproj
@@ -32,7 +32,6 @@
<ClInclude Include="..\..\iis7_shib\headers\IIS7_shib.hpp" />
<ClInclude Include="..\..\iis7_shib\headers\ShibHttpModule.hpp" />
<ClInclude Include="..\..\iis7_shib\headers\ShibUser.hpp" />
- <ClInclude Include="..\..\iis7_shib\resource.h" />
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>17.0</VCProjectVersion>
@@ -112,7 +111,8 @@
<AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ResourceCompile>
- <PreprocessorDefinitions>RC_FILE_VERSION=3,0,0;RC_PRODUCT_VERSION=3,0,0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(ProjectDir)..\..\shibsp</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -133,7 +133,8 @@
<AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ResourceCompile>
- <PreprocessorDefinitions>RC_FILE_VERSION=3,0,0;RC_PRODUCT_VERSION=3,0,0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(ProjectDir)..\..\shibsp</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -150,7 +151,8 @@
<AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ResourceCompile>
- <PreprocessorDefinitions>RC_FILE_VERSION=3,0,0;RC_PRODUCT_VERSION=3,0,0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(ProjectDir)..\..\shibsp</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -171,7 +173,8 @@
<AdditionalDependencies>$(SolutionDir)$(Platform)\$(Configuration)\shibsp.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ResourceCompile>
- <PreprocessorDefinitions>RC_FILE_VERSION=3,0,0;RC_PRODUCT_VERSION=3,0,0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(ProjectDir)..\..\shibsp</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/Projects/vc22/iis.vcxproj.filters b/Projects/vc22/iis.vcxproj.filters
index b85d1f86..5687c4b6 100644
--- a/Projects/vc22/iis.vcxproj.filters
+++ b/Projects/vc22/iis.vcxproj.filters
@@ -34,9 +34,6 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\..\iis7_shib\resource.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="..\..\iis7_shib\headers\IIS7_shib.hpp">
<Filter>Header Files</Filter>
</ClInclude>
diff --git a/apache/mod_shib_24.rc b/apache/mod_shib_24.rc
index d10f7c9d..d8923b1b 100644
--- a/apache/mod_shib_24.rc
+++ b/apache/mod_shib_24.rc
@@ -1,6 +1,7 @@
//Microsoft Developer Studio generated resource script.
//
-#include "resource.h"
+#define __shibsp_base_h__
+#include "version.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -28,8 +29,9 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION RC_FILE_VERSION ,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
diff --git a/apache/resource.h b/apache/resource.h
deleted file mode 100644
index 1c3c68d0..00000000
--- a/apache/resource.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Licensed to the University Corporation for Advanced Internet
- * Development, Inc. (UCAID) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for
- * additional information regarding copyright ownership.
- *
- * UCAID licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the
- * License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
- */
-
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by mod_shib_20.rc
-//
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 101
-#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1000
-#define _APS_NEXT_SYMED_VALUE 101
-#endif
-#endif
diff --git a/iis7_shib/iis7_shib.rc b/iis7_shib/iis7_shib.rc
index dca33d0f..9de83568 100644
--- a/iis7_shib/iis7_shib.rc
+++ b/iis7_shib/iis7_shib.rc
@@ -1,6 +1,7 @@
// Microsoft Visual C++ generated resource script.
//
-#include "resource.h"
+#define __shibsp_base_h__
+#include "version.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -51,8 +52,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
-FILEVERSION RC_FILE_VERSION, 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
diff --git a/iis7_shib/resource.h b/iis7_shib/resource.h
deleted file mode 100644
index bb32baa2..00000000
--- a/iis7_shib/resource.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by iis7_shib.rc
-//
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 101
-#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1000
-#define _APS_NEXT_SYMED_VALUE 101
-#endif
-#endif
diff --git a/shibsp/version.h b/shibsp/version.h
index 1e66fe80..f84ba914 100644
--- a/shibsp/version.h
+++ b/shibsp/version.h
@@ -38,6 +38,10 @@
#define SHIBSP_VERSION_MAJOR 4
#define SHIBSP_VERSION_MINOR 0
#define SHIBSP_VERSION_REVISION 0
+//
+// For Windows we define a patch version
+//
+#define SHIBSP_VERSION_PATCH 0
/** DO NOT MODIFY BELOW THIS LINE */
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list