[cpp-sp] 01/01: CPPSP-46 Windows installers not enforcing architecture

[Codeberg]

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

codeberg pushed a commit to branch dev/CPPSP-46
in repository cpp-sp.

View the commit online:
https://codeberg.org/Shibboleth/cpp-sp/commit/65dde5ef30b44e6bba94d4419622917b53678444

commit 65dde5ef30b44e6bba94d4419622917b53678444
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Feb 21 15:56:31 2026 +0000

    CPPSP-46 Windows installers not enforcing architecture
    
    https://shibboleth.atlassian.net/browse/CPPSP-46
    
    Blind cut and paste from the documentation.
---
 msi/sp4.wxs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/msi/sp4.wxs b/msi/sp4.wxs
index 66fdf3ad..bdb7a034 100644
--- a/msi/sp4.wxs
+++ b/msi/sp4.wxs
@@ -19,7 +19,11 @@
         <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." AllowSameVersionUpgrades="yes" Schedule="afterInstallInitialize" />
         <MediaTemplate EmbedCab="yes" />
 
-        <Launch Condition="UCRTBASE_DLL" Message="C run time library not installed" />
+        <Launch Condition="UCRTBASE_DLL"
+		Message="C run time library not installed" />
+	<!-- The below is "too cute" (IMP is logical implies). See the notes for CPPSP-46 -->
+        <Launch Condition='"$(sys.BUILDARCH)" ~= "x64" IMP WIX_NATIVE_MACHINE = 34404'
+                Message="This package can run only on $(sys.BUILDARCH) machines!" />
 
         <!-- Properties used by the installer -->
 
@@ -55,6 +59,9 @@
         <!-- WIX_ACCOUNT_* -->
         <util:QueryWindowsWellKnownSIDs />
 
+        <!-- WIX_NATIVE_MACHINE -->
+        <util:QueryNativeMachine />
+
         <!-- Who will be running IIS/Apache?  If not supplied on the command line we default it to WIX_ACCOUNT_LOCALSERVICE
             <Property Id="WEBSERVER_USER" Value=""/>
         -->

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