[cpp-sp] 03/03: SSPCPP-976 Drop Win32/x86 out of process builds
Rod Widdowson
rdw at steadingsoftware.com
Wed Jun 14 15:40:01 UTC 2023
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=07640095e21717291b1827cd84a0d393e9dcba18
commit 07640095e21717291b1827cd84a0d393e9dcba18
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Jun 14 16:38:03 2023 +0100
SSPCPP-976 Drop Win32/x86 out of process builds
https://shibboleth.atlassian.net/browse/SSPCPP-976
Stage 2, stop building the 32 bit msm we don't care about (curl, openssl,
santuario). Remove non lite dlls from the 32 bit merge modules we do build
(Shib and OpenSAML)
---
msi/WiX/MergeModules/MergeModules.make | 44 +++------------------------------
msi/WiX/MergeModules/OpenSAML-x86.wxs | 24 ------------------
msi/WiX/MergeModules/Shibboleth-x86.wxs | 8 ------
3 files changed, 3 insertions(+), 73 deletions(-)
diff --git a/msi/WiX/MergeModules/MergeModules.make b/msi/WiX/MergeModules/MergeModules.make
index eb3bf07a..d6d7f5a7 100644
--- a/msi/WiX/MergeModules/MergeModules.make
+++ b/msi/WiX/MergeModules/MergeModules.make
@@ -1,8 +1,8 @@
all: all32 all64
-all32: Curl-x86.msm Log4shib-x86.msm OpenSAML-x86.msm OpenSAML-schemas.msm\
- OpenSSL-x86.msm Shibboleth-x86.msm Shibboleth-schemas.msm Xerces-x86.msm\
- XmlSec-x86.msm Zlib-x86.msm
+all32: Log4shib-x86.msm OpenSAML-x86.msm OpenSAML-schemas.msm\
+ Shibboleth-x86.msm Shibboleth-schemas.msm Xerces-x86.msm\
+ Zlib-x86.msm
all64: Curl-x64.msm Log4shib-x64.msm OpenSAML-x64.msm OpenSAML-schemas.msm\
OpenSSL-x64.msm Shibboleth-x64.msm Shibboleth-schemas.msm Xerces-x64.msm\
@@ -34,17 +34,6 @@ Curl-x64.wixobj: Curl-x64.wxs
-dLibCurlGuid64=$(LibCurlGuid64) -dLibCurlGuid64d=$(LibCurlGuid64d)\
-dBuildDebug=$(DebugInstaller)
-Curl-x86.msm: Curl-x86.wixobj
- light Curl-x86.wixobj
- del ..\*32*.msi
-
-Curl-x86.wixobj: Curl-x86.wxs
- wixcop -indent:2 Curl-x86.wxs
- candle Curl-x86.wxs -dBuildDirectory=$(BuildSP) -dCurlVersion=$(CurlVersion)\
- -dShibbolethMsVersion=$(MsVCVersion) -dCurlFileVersion=$(CurlFileVersion)\
- -dLibCurlGuid32=$(LibCurlGuid32) -dLibCurlGuid32d=$(LibCurlGuid32d)\
- -dBuildDebug=$(DebugInstaller)
-
#
# FastCGI
#
@@ -138,21 +127,10 @@ OpenSAML-schemas.wixobj: OpenSAML-schemas.wxs
#
# OpenSSL
#
-OpenSSL-x86.msm: OpenSSL-x86.wixobj
- light OpenSSL-x86.wixobj
- del ..\*32*.msi
-
OpenSSL-x64.msm: OpenSSL-x64.wixobj
light OpenSSL-x64.wixobj
del ..\*64*.msi
-OpenSSL-x86.wixobj: OpenSSL-x86.wxs
- wixcop -indent:2 OpenSSL-x86.wxs
- candle OpenSSL-x86.wxs -dBuildDirectory=$(BuildSP) -dOpenSSLVersion=$(OpenSSLVersion) \
- -dOpenSSLFileVersion=$(OpenSSLFileVersion) -dLibEay32Component=$(LibEay32Component) -dSSlEay32Component=$(SSlEay32Component)\
- -dLibEay32Componentd=$(LibEay32Componentd) -dSSlEay32Componentd=$(SSlEay32Componentd) -dopenssl=$(openssl)\
- -dBuildDebug=$(DebugInstaller)
-
OpenSSL-x64.wixobj: OpenSSL-x64.wxs
wixcop -indent:2 OpenSSL-x64.wxs
candle OpenSSL-x64.wxs -dBuildDirectory=$(BuildSP) -dOpenSSLVersion=$(OpenSSLVersion) \
@@ -239,26 +217,10 @@ Xerces-x64.wixobj: Xerces-x64.wxs $(XercesDll64) Xerces-x86.wxs
#
# XmlSec
#
-XmlSec-x86.msm: XmlSec-x86.wixobj
- light XmlSec-x86.wixobj
- del ..\*32*.msi
-
XmlSec-x64.msm: XmlSec-x64.wixobj
light XmlSec-x64.wixobj
del ..\*64*.msi
-XmlSec-x86.wixobj: XmlSec-x86.wxs "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Release Minimal\xsec_$(XmlSecFileVersion).dll"\
- "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Release Minimal\c14n.exe"\
- "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Release Minimal\checksig.exe"\
- "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Release Minimal\cipher.exe"\
- "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Release Minimal\siginf.exe"\
- "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Release Minimal\templatesign.exe"\
- "$(BuildSP)\$(xmlsec)\Build\Win32\$(MsVCVersion)\Release Minimal\txfmout.exe"
- wixcop -indent:2 XmlSec-x86.wxs
- candle XmlSec-x86.wxs -dBuildDirectory=$(BuildSP) -dXmlSecVersion=$(XmlSecVersion) -dxmlsec=$(xmlsec) -dXmlSecFileVersion=$(XmlSecFileVersion)\
- -dXmlSec32Component=$(XmlSec32Component) -dXmlSec32Componentd=$(XmlSec32Componentd) -dShibbolethMsVersion=$(MsVCVersion)\
- -dBuildDebug=$(DebugInstaller)
-
XmlSec-x64.wixobj: XmlSec-x64.wxs "$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Release Minimal\xsec_$(XmlSecFileVersion).dll"\
"$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Release Minimal\c14n.exe"\
"$(BuildSP)\$(xmlsec)\Build\x64\$(MsVCVersion)\Release Minimal\checksig.exe"\
diff --git a/msi/WiX/MergeModules/OpenSAML-x86.wxs b/msi/WiX/MergeModules/OpenSAML-x86.wxs
index d14699d8..501f9728 100644
--- a/msi/WiX/MergeModules/OpenSAML-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-x86.wxs
@@ -25,36 +25,12 @@
<Directory Id="shibboleth" Name="Shibboleth">
<Directory Id="shibboleth_SP" Name="SP">
<Directory Id="lib" Name="lib" FileSource="$(var.SPBuildDirectory)\cpp-opensaml\Build\$(var.ShibbolethMsVersion)\Release\">
- <Component Id="saml.dll" Guid="$(var.SamlComponent32)">
- <File KeyPath="yes" Checksum="yes" Name="saml$(var.OpenSAMLFileVersion).dll" />
- <File KeyPath="no" Checksum="no" Name="saml$(var.OpenSAMLFileVersion).pdb" />
- </Component>
- <Component Id="samlsign.exe" Guid="{3DC7A431-9623-4283-BA07-444DB1C1F864}">
- <File KeyPath="yes" Checksum="yes" Name="samlsign.exe" />
- <File KeyPath="no" Checksum="no" Name="samlsign.pdb" />
- </Component>
- <Component Id="xmltooling.dll" Guid="$(var.XMLToolingComponent32)">
- <File KeyPath="yes" Checksum="yes" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\Release\xmltooling$(var.XmlToolingFileVersion).dll" />
- <File KeyPath="no" Checksum="no" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\Release\xmltooling$(var.XmlToolingFileVersion).pdb" />
- </Component>
<Component Id="xmltooling_lite.dll" Guid="$(var.XMLToolingLiteComponent32)">
<File KeyPath="yes" Checksum="yes" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll" />
<File KeyPath="no" Checksum="no" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\Release\xmltooling-lite$(var.XmlToolingFileVersion).pdb" />
</Component>
<?if $(var.BuildDebug) != "" ?>
<Directory Id="lib_debug" Name="debug" FileSource="$(var.SPBuildDirectory)\cpp-opensaml\Build\$(var.ShibbolethMsVersion)\Debug\">
- <Component Id="samlD.dll" Guid="$(var.SamlComponent32d)">
- <File KeyPath="yes" Checksum="yes" Name="saml$(var.OpenSAMLFileVersion)D.dll" />
- <File KeyPath="no" Checksum="no" Name="saml$(var.OpenSAMLFileVersion)D.pdb" />
- </Component>
- <Component Id="samlsign.exe_debug" Guid="{EFCAEBC5-242F-416C-8F87-B7DD49C1AE29}">
- <File KeyPath="yes" Checksum="yes" Id="samlsign.exe_debug" Name="samlsign.exe" />
- <File KeyPath="no" Checksum="no" Id="samlsign.pdb_debug" Name="samlsign.pdb" />
- </Component>
- <Component Id="xmltoolingD.dll" Guid="$(var.XMLToolingComponent32d)">
- <File KeyPath="yes" Checksum="yes" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll" />
- <File KeyPath="no" Checksum="no" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\Debug\xmltooling$(var.XmlToolingFileVersion)D.pdb" />
- </Component>
<Component Id="xmltooling_liteD.dll" Guid="$(var.XMLToolingLiteComponent32d)">
<File KeyPath="yes" Checksum="yes" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll" />
<File KeyPath="no" Checksum="no" Source="$(var.SPBuildDirectory)\cpp-xmltooling\Build\$(var.ShibbolethMsVersion)\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.pdb" />
diff --git a/msi/WiX/MergeModules/Shibboleth-x86.wxs b/msi/WiX/MergeModules/Shibboleth-x86.wxs
index ba7289f8..c1c490e6 100644
--- a/msi/WiX/MergeModules/Shibboleth-x86.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-x86.wxs
@@ -24,20 +24,12 @@
<Directory Id="shibboleth" Name="Shibboleth">
<Directory Id="shibboleth_sp" Name="SP">
<Directory Id="lib" Name="lib" FileSource="$(var.SPBuildDirectory)\Build\$(var.ShibbolethMsVersion)\Release">
- <Component Id="shibsp.dll" Guid="$(var.ShibDll32Component)">
- <File KeyPath="yes" Checksum="yes" Name="shibsp$(var.ShibbolethDllFileVersion).dll" />
- <File KeyPath="no" Checksum="no" Name="shibsp$(var.ShibbolethDllFileVersion).pdb" />
- </Component>
<Component Id="shibsp_lite.dll" Guid="$(var.ShibDllLite32Component)">
<File KeyPath="yes" Checksum="yes" Name="shibsp-lite$(var.ShibbolethDllFileVersion).dll" />
<File KeyPath="no" Checksum="no" Name="shibsp-lite$(var.ShibbolethDllFileVersion).pdb" />
</Component>
<?if $(var.BuildDebug) != "" ?>
<Directory Id="lib_debug" Name="debug" FileSource="$(var.SPBuildDirectory)\Build\$(var.ShibbolethMsVersion)\Debug">
- <Component Id="shibspD.dll" Guid="$(var.ShibDll32Componentd)">
- <File KeyPath="yes" Checksum="yes" Name="shibsp$(var.ShibbolethDllFileVersion)D.dll" />
- <File KeyPath="no" Checksum="no" Name="shibsp$(var.ShibbolethDllFileVersion)D.pdb" />
- </Component>
<Component Id="shibsp_liteD.dll" Guid="$(var.ShibDllLite32Componentd)">
<File KeyPath="yes" Checksum="yes" Name="shibsp-lite$(var.ShibbolethDllFileVersion)D.dll" />
<File KeyPath="no" Checksum="no" Name="shibsp-lite$(var.ShibbolethDllFileVersion)D.pdb" />
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list