[cpp-sp] 02/03: CPPSP-22 Pull in Windows event log DLL from log4shib
Rod Widdowson
rdw at steadingsoftware.com
Sat Oct 18 14:16:41 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=b713d5aa2f787d98f856e71369fc1c353fe45599
commit b713d5aa2f787d98f856e71369fc1c353fe45599
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Oct 18 15:05:29 2025 +0100
CPPSP-22 Pull in Windows event log DLL from log4shib
https://shibboleth.atlassian.net/browse/CPPSP-22
Strip the compiling of the message file from ShibSP and point it to
the head file created by the message DLL build.
---
Projects/vc22/shibsp.vcxproj | 65 ++++++++++--------------------------
Projects/vc22/shibsp.vcxproj.filters | 5 ---
2 files changed, 18 insertions(+), 52 deletions(-)
diff --git a/Projects/vc22/shibsp.vcxproj b/Projects/vc22/shibsp.vcxproj
index 37ac2db7..1f600b63 100644
--- a/Projects/vc22/shibsp.vcxproj
+++ b/Projects/vc22/shibsp.vcxproj
@@ -132,12 +132,12 @@
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|x64'">4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ClCompile Include="..\..\shibsp\logging\impl\WindowsLoggingService.cpp">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(intdir)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(intdir)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(intdir)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(intdir)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(intdir)</AdditionalIncludeDirectories>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(intdir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(OutDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(OutDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)</AdditionalIncludeDirectories>
</ClCompile>
<ClCompile Include="..\..\shibsp\platform\iis\ModuleConfig.cpp" />
<ClCompile Include="..\..\shibsp\remoting\impl\AbstractHTTPRemotingService.cpp" />
@@ -190,41 +190,6 @@
<ItemGroup>
<ResourceCompile Include="..\..\shibsp\shibsp.rc" />
</ItemGroup>
- <ItemGroup>
- <CustomBuild Include="..\..\shibsp\logging\impl\NativeEventLog.mc">
- <FileType>Document</FileType>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">if not exist $(IntDir) md $(IntDir)
-mc.exe -h $(IntDir) -r $(IntDir) $(ProjectDir)..\..\shibsp\logging\impl\%(Filename).mc
-rc.exe /D _UNICODE /D UNICODE /l"0x0409" /nologo /fo"$(IntDir)\%(Filename).res" $(IntDir)\%(Filename).rc</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">if not exist $(IntDir) md $(IntDir)
-mc.exe -h $(IntDir) -r $(IntDir) $(ProjectDir)..\..\shibsp\logging\impl\%(Filename).mc
-rc.exe /D _UNICODE /D UNICODE /l"0x0409" /nologo /fo"$(IntDir)\%(Filename).res" $(IntDir)\%(Filename).rc</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">if not exist $(IntDir) md $(IntDir)
-mc.exe -h $(IntDir) -r $(IntDir) $(ProjectDir)..\..\shibsp\logging\impl\%(Filename).mc
-rc.exe /D _UNICODE /D UNICODE /l"0x0409" /nologo /fo"$(IntDir)\%(Filename).res" $(IntDir)\%(Filename).rc</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">if not exist $(IntDir) md $(IntDir)
-mc.exe -h $(IntDir) -r $(IntDir) $(ProjectDir)..\..\shibsp\logging\impl\%(Filename).mc
-rc.exe /D _UNICODE /D UNICODE /l"0x0409" /nologo /fo"$(IntDir)\%(Filename).res" $(IntDir)\%(Filename).rc</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">if not exist $(IntDir) md $(IntDir)
-mc.exe -h $(IntDir) -r $(IntDir) $(ProjectDir)..\..\shibsp\logging\impl\%(Filename).mc
-rc.exe /D _UNICODE /D UNICODE /l"0x0409" /nologo /fo"$(IntDir)\%(Filename).res" $(IntDir)\%(Filename).rc</Command>
- <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">if not exist $(IntDir) md $(IntDir)
-mc.exe -h $(IntDir) -r $(IntDir) $(ProjectDir)..\..\shibsp\logging\impl\%(Filename).mc
-rc.exe /D _UNICODE /D UNICODE /l"0x0409" /nologo /fo"$(IntDir)\%(Filename).res" $(IntDir)\%(Filename).rc</Command>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename).rc;$(IntDir)%(Filename).h</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename).rc;$(IntDir)%(Filename).h</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(IntDir)%(Filename).rc;$(IntDir)%(Filename).h</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(IntDir)%(Filename).rc;$(IntDir)%(Filename).h</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(Filename).rc;$(IntDir)%(Filename).h</Outputs>
- <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename).rc;$(IntDir)%(Filename).h</Outputs>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">false</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
- </CustomBuild>
- </ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>17.0</VCProjectVersion>
<Keyword>Win32Proj</Keyword>
@@ -337,7 +302,8 @@ rc.exe /D _UNICODE /D UNICODE /l"0x0409" /nologo /fo"$(IntDir)\%(Filename).res"
<DisableSpecificWarnings>4275;4250</DisableSpecificWarnings>
</ClCompile>
<Lib>
- <AdditionalDependencies>$(IntDir)\NativeEventLog.res;</AdditionalDependencies>
+ <AdditionalDependencies>
+ </AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -353,7 +319,8 @@ rc.exe /D _UNICODE /D UNICODE /l"0x0409" /nologo /fo"$(IntDir)\%(Filename).res"
<DisableSpecificWarnings>4275;4250</DisableSpecificWarnings>
</ClCompile>
<Lib>
- <AdditionalDependencies>$(IntDir)\NativeEventLog.res;</AdditionalDependencies>
+ <AdditionalDependencies>
+ </AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -367,7 +334,8 @@ rc.exe /D _UNICODE /D UNICODE /l"0x0409" /nologo /fo"$(IntDir)\%(Filename).res"
<DisableSpecificWarnings>4275;4250</DisableSpecificWarnings>
</ClCompile>
<Lib>
- <AdditionalDependencies>$(IntDir)\NativeEventLog.res;</AdditionalDependencies>
+ <AdditionalDependencies>
+ </AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
@@ -381,7 +349,8 @@ rc.exe /D _UNICODE /D UNICODE /l"0x0409" /nologo /fo"$(IntDir)\%(Filename).res"
<DisableSpecificWarnings>4275;4250</DisableSpecificWarnings>
</ClCompile>
<Lib>
- <AdditionalDependencies>$(IntDir)\NativeEventLog.res;</AdditionalDependencies>
+ <AdditionalDependencies>
+ </AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -397,7 +366,8 @@ rc.exe /D _UNICODE /D UNICODE /l"0x0409" /nologo /fo"$(IntDir)\%(Filename).res"
<DisableSpecificWarnings>4275;4250</DisableSpecificWarnings>
</ClCompile>
<Lib>
- <AdditionalDependencies>$(IntDir)\NativeEventLog.res;</AdditionalDependencies>
+ <AdditionalDependencies>
+ </AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
@@ -413,7 +383,8 @@ rc.exe /D _UNICODE /D UNICODE /l"0x0409" /nologo /fo"$(IntDir)\%(Filename).res"
<DisableSpecificWarnings>4275;4250</DisableSpecificWarnings>
</ClCompile>
<Lib>
- <AdditionalDependencies>$(IntDir)\NativeEventLog.res;</AdditionalDependencies>
+ <AdditionalDependencies>
+ </AdditionalDependencies>
</Lib>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/Projects/vc22/shibsp.vcxproj.filters b/Projects/vc22/shibsp.vcxproj.filters
index 5403fe1d..12998717 100644
--- a/Projects/vc22/shibsp.vcxproj.filters
+++ b/Projects/vc22/shibsp.vcxproj.filters
@@ -395,9 +395,4 @@
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
- <ItemGroup>
- <CustomBuild Include="..\..\shibsp\logging\impl\NativeEventLog.mc">
- <Filter>Resource Files</Filter>
- </CustomBuild>
- </ItemGroup>
</Project>
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list