[cpp-sp] 02/03: SSPCPP-976 Drop Win32/x86 out of process builds

[Rod Widdowson]

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

rdw pushed a commit to branch dev/SSPCPP-976
in repository cpp-sp.

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

commit 88f9ac8c5b45b68bf2e273afff324baae03c1828
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Jun 14 16:36:14 2023 +0100

    SSPCPP-976 Drop Win32/x86 out of process builds
    
    https://shibboleth.atlassian.net/browse/SSPCPP-976
    
    Stage 2, Remove the 32 bit MSMs we don't care about (santuario,
    curl, openssl) from the 64 bit msi
---
 msi/WiX/Installer.make            | 2 +-
 msi/WiX/ShibbolethSP-main-x64.wxs | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/msi/WiX/Installer.make b/msi/WiX/Installer.make
index bc3768d7..3ee5e6f0 100644
--- a/msi/WiX/Installer.make
+++ b/msi/WiX/Installer.make
@@ -86,7 +86,7 @@ ShibbolethSP-install-dlg.wixobj: ShibbolethSP-install-dlg.wxs
 	wixcop -indent:2 ShibbolethSP-install-dlg.wxs
 	candle ShibbolethSP-install-dlg.wxs -dBuildDebug=$(DebugInstaller)
 
-ShibbolethSP-main-x64.wixobj: ShibbolethSP-main-x64.wxs ShibbolethSP-properties.wxi ShibbolethSP-defs-x86.wxi MergeModules\Curl-x86.msm $(FCGI86) MergeModules\Log4Shib-x86.msm MergeModules\OpenSAML-x86.msm MergeModules\OpenSAML-schemas.msm MergeModules\OpenSSL-x86.msm MergeModules\Shibboleth-x86.msm MergeModules\Shibboleth-schemas.msm MergeModules\Xerces-x86.msm MergeModules\XmlSec-x86.msm MergeModules\Zlib-x86.msm MergeModules\Curl-x64.msm $(FCGI64) MergeModules\Log4Shib-x64.msm MergeMo [...]
+ShibbolethSP-main-x64.wixobj: ShibbolethSP-main-x64.wxs ShibbolethSP-properties.wxi ShibbolethSP-defs-x86.wxi $(FCGI86) MergeModules\Log4Shib-x86.msm MergeModules\OpenSAML-x86.msm MergeModules\OpenSAML-schemas.msm MergeModules\Shibboleth-x86.msm MergeModules\Shibboleth-schemas.msm MergeModules\Xerces-x86.msm MergeModules\Zlib-x86.msm MergeModules\Curl-x64.msm $(FCGI64) MergeModules\Log4Shib-x64.msm MergeModules\OpenSAML-x64.msm MergeModules\OpenSSL-x64.msm MergeModules\Shibboleth-x64.msm [...]
 	wixcop -indent:2 ShibbolethSP-main-x64.wxs
 	candle -dSPBuildDirectory=$(SolutionDir).. -dShibbolethVersion=$(ShibbolethVersion) -dShibbolethPatchVersion=$(ShibbolethPatchVersion) -dShibbolethId64=$(ShibbolethId64) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) -dMsVCVersion=$(MsVCVersion) ShibbolethSP-main-x64.wxs -dFCGI="$(FCGI64)" -dNSApi="$(NSAPI_DLLS)" -dCppMmDir="$(CppMmDir)" -dCppVCVersion=$(CppVCVersion) -dBuildDebug=$(DebugInstaller)
 
diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index f48102df..78c73c18 100644
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -46,19 +46,15 @@
       </Directory>
 
       <Directory Id="ProgramFilesFolder" Name="PFiles">
-        <!-- 32 bit merge modules -notionally go to "Program Files (x86)" -->
-        <Merge Id="CurlMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Curl-x86.msm" DiskId="1" />
         <?if $(var.FCGI) != "" ?>
         <Merge Id="FastCGIMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\FastCGI-x86.msm" DiskId="1" />
         <?endif ?>
         <Merge Id="Log4ShibMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Log4Shib-x86.msm" DiskId="1" />
         <Merge Id="OpenSAMLMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\OpenSAML-x86.msm" DiskId="1" />
         <Merge Id="OpenSAMLMergeModule_schemas" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\OpenSAML-schemas.msm" DiskId="1" />
-        <Merge Id="OpenSSLMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\OpenSSL-x86.msm" DiskId="1" />
         <Merge Id="ShibbolethMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Shibboleth-x86.msm" DiskId="1" />
         <Merge Id="ShibbolethMergeModule_schemas" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Shibboleth-schemas.msm" DiskId="1" />
         <Merge Id="XercesMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Xerces-x86.msm" DiskId="1" />
-        <Merge Id="XmlSecMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\XmlSec-x86.msm" DiskId="1" />
         <Merge Id="ZlibMergeModule_x86" Language="1033" SourceFile="$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Zlib-x86.msm" DiskId="1" />
         <?if $(var.BuildDebug) != "" ?>
         <Merge Id="Microsoft_DebugCRT_x86" Language="1033" SourceFile="$(var.CppMmDir)\Microsoft_$(var.CppVCVersion)_DebugCRT_x86.msm" DiskId="1" />
@@ -95,18 +91,15 @@
     </Directory><!--TARGETDIR-->
 
     <Feature Id="Shibboleth" Title="Shibboleth" Level="1" Display="hidden" ConfigurableDirectory="INSTALLDIR">
-      <MergeRef Id="CurlMergeModule_x86" />
       <?if $(var.FCGI) != "" ?>
       <MergeRef Id="FastCGIMergeModule_x86" />
       <?endif ?>
       <MergeRef Id="Log4ShibMergeModule_x86" />
       <MergeRef Id="OpenSAMLMergeModule_x86" />
       <MergeRef Id="OpenSAMLMergeModule_schemas" />
-      <MergeRef Id="OpenSSLMergeModule_x86" />
       <MergeRef Id="ShibbolethMergeModule_x86" />
       <MergeRef Id="ShibbolethMergeModule_schemas" />
       <MergeRef Id="XercesMergeModule_x86" />
-      <MergeRef Id="XmlSecMergeModule_x86" />
       <MergeRef Id="ZlibMergeModule_x86" />
 
       <?if $(var.BuildDebug) != "" ?>

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