[cpp-sp] branch main updated: CPPSP-28 Windows Installers for Sp4 Agents

[Codeberg]

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

codeberg pushed a commit to branch main
in repository cpp-sp.

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

The following commit(s) were added to refs/heads/main by this push:
     new fd33b0e9  CPPSP-28 Windows Installers for Sp4 Agents
fd33b0e9 is described below

commit fd33b0e96939650a7d9554747592bea463172117
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Jan 5 19:57:17 2026 +0000

     CPPSP-28 Windows Installers for Sp4 Agents
    
    https://shibboleth.atlassian.net/browse/CPPSP-28
    
    More installer progress.  All of C:\opt\shibboleth-sp\etc\shibboleth-sp
    and C:\opt\shibboleth-sp\lib\shibboleth-sp now populated
---
 msi/wix6/sp4.wxs | 41 +++++++++++++++++++++++++++++++++++++----
 1 file changed, 37 insertions(+), 4 deletions(-)

diff --git a/msi/wix6/sp4.wxs b/msi/wix6/sp4.wxs
index ec4e5a1f..f0af7f88 100644
--- a/msi/wix6/sp4.wxs
+++ b/msi/wix6/sp4.wxs
@@ -11,6 +11,7 @@
      permissions and limitations under the License.  -->
 
 <?define UpgradeUUID="20B2C0E2-E377-48D2-881A-3AA29BBFE9C0"?>
+<?define RootDir="V:\perforce\SP\cpp-sp\"?>
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <Package Name="Shibboleth SP V4 Windows Agent" Language="1033" Version="$(var.msiVersion)" Manufacturer="The Shibboleth Consortium" UpgradeCode="$(var.UpgradeUUID)" InstallerVersion="310">
@@ -56,18 +57,50 @@
                 <Directory Id="etc" Name="etc">
                     <Directory Id="etcShib" Name="shibboleth-sp"/>
                 </Directory>
+                <Directory Id="var" Name="var">
+                    <Directory Id="cache" Name="cache">
+                        <Directory Id="varCacheShib" Name="shibboleth-sp"/>
+                    </Directory>
+                </Directory>
+                <Directory Id="lib" Name="lib">
+                    <Directory Id="libShib" Name="shibboleth-sp"/>
+                </Directory>
             </Directory>
         </Directory>
 
         <Feature Id="SPV4" ConfigurableDirectory="INSTALLDIR">
-            <Component Id="SaveInstallDir" Directory = "etcShib" Bitness="always64">
+            <Component Id="SaveInstallDir" Directory = "etcShib" Bitness="always64" Guid="">
                 <RegistryValue Id="TargetDir64" Root="HKLM" Key="SOFTWARE\Shibboleth" Name="InstallDir" Value="[INSTALLDIR]" Type="string" KeyPath="yes" />
             </Component>
 
-            <Component Id="EtcFiles" Directory = "etcShib">
-                <File Id="agent.ini" KeyPath="yes" Checksum="yes" Source="V:\perforce\SP\cpp-sp\configs\agent.ini"/>
+            <Component Id="ConfigFiles" Directory = "etcShib" Guid="">
+                <File Id="agent.ini" KeyPath="yes" Checksum="yes" Source="$(var.RootDir)\configs\agent.ini"/>
+                <File Id="apache24.config.in" Checksum="yes" Source="$(var.RootDir)\configs\apache24.config.in"/>
+                <File Id="attrChecker.html" Checksum="yes" Source="$(var.RootDir)\configs\attrChecker.html"/>
+                <File Id="globalLogout.html" Checksum="yes" Source="$(var.RootDir)\configs\globalLogout.html"/>
+                <File Id="handlers.ini" Checksum="yes" Source="$(var.RootDir)\configs\handlers.ini"/>
+                <File Id="iis_config.ini" Checksum="yes" Source="$(var.RootDir)\configs\iis-config.ini"/>
+                <File Id="localLogout.html" Checksum="yes" Source="$(var.RootDir)\configs\localLogout.html"/>
+                <File Id="partialLogout.html" Checksum="yes" Source="$(var.RootDir)\configs\partialLogout.html"/>
+                <File Id="request_map.xml" Checksum="yes" Source="$(var.RootDir)\configs\request-map.xml"/>
+            </Component>
+
+	    <!-- For some reason the id/elif/endif thing isnt working -->
+            <Component Id="LibFiles" Directory = "libShib" Guid="">
+	    <?if $(sys.BUILDARCH) = "x64"?>
+                <File Id="IIS_x64" KeyPath="yes" Checksum="yes" Source="$(var.RootDir)\Projects\vc22\x64\Release\iis_shib4.dll"/>
+                <File Id="IIS_x86" Name="iid_shib4_x86.dll" Checksum="yes" Source="$(var.RootDir)\Projects\vc22\Release\iis_shib4.dll"/>
+                <File Id="Mod_shib"  Checksum="yes" Source="$(var.RootDir)\Projects\vc22\x64\Release\mod_shib4.so"/>
+            <?endif?>
+            <?if $(sys.BUILDARCH) = "arm"?>
+                <File Id="IIS_arm" KeyPath="yes" Checksum="yes" Source="$(var.RootDir)\Projects\vc22\ARM64\Release\iis_shib4.dll"/>
+            <?endif?>
+            <?if ($(sys.BUILDARCH) != "arm") and ($(sys.BUILDARCH) != "x64") ?>
+            <!-- We do not want to build pure x86 at this time.  Whine -->
+                <File Id="IIS_bogus" KeyPath="yes" Checksum="yes" Source="$(var.RootDir)\Projects\vc22\NO_SUCH_PATH\Release\iis_shib4.dll"/>
+            <?endif?>
             </Component>
-        </Feature>
+       </Feature>
 
         <CustomAction Id="InheritInstallDir" Property="INSTALLDIR" Value="[OLD_INSTALLDIR]" />
 

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