[cpp-sp] 06/06: 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/d62f568f77af93e8ceb1765769232a6b96565b75

commit d62f568f77af93e8ceb1765769232a6b96565b75
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Jan 26 16:04:09 2026 +0000

    CPPSP-28 Windows Installers for Sp4 Agents
    
    https://shibboleth.atlassian.net/browse/CPPSP-28
    
    Start to automate the build.
---
 Projects/vc22/build.bat | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 msi/installer.vcxproj   |  6 ++----
 msi/sp4.wxs             |  1 -
 3 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/Projects/vc22/build.bat b/Projects/vc22/build.bat
new file mode 100644
index 00000000..3b0f5c08
--- /dev/null
+++ b/Projects/vc22/build.bat
@@ -0,0 +1,48 @@
+setlocal
+
+IF "%DevEnvDir%" == "" (
+   Echo Visual Studio environment not loaded
+   goto :done
+)
+
+cd /d %~dp0../../
+set BUILD_HOME_DIR=%cd%
+
+cd projects/VC22
+
+rem Clean
+del /s *.obj *.lib *.dll *.exe
+del /s *.obj *.lib *.dll *.exe
+
+REM Build all the DLLS and the msiversion executable
+
+REM everything for x64
+msbuild -m /property:Platform=x64;Configuration=release /MaxCPUCount Shibboleth.sln /t:iis;NativeLogMessages;MsiVersion;Apache
+
+REM IIS & NativeLogMesage only for Arm and x86
+msbuild -m /property:Platform=arm64;Configuration=release /MaxCPUCount Shibboleth.sln /t:iis;NativeLogMessages
+
+REM IIS only for x86
+msbuild -m /property:Platform=x86;Configuration=release /MaxCPUCount Shibboleth.sln /t:iis
+
+FOR /F "delims= tokens=* USEBACKQ" %%F IN (`x64\release\MsiVersion.exe`) DO (
+   SET MSIVERSION=%%F
+)
+
+echo MsiVersion derived to be 'MSIVERSION%'
+
+cd ..\..\msi
+
+REM Clean
+
+dotnet clean installer.vcxproj /p:targetDir=%BUILD_HOME_DIR%\Projects\VC22\ARM64
+dotnet clean installer.vcxproj /p:targetDir=%BUILD_HOME_DIR%\Projects\VC22\x64
+
+REM and Build
+
+dotnet build installer.vcxproj /p:targetPath=%BUILD_HOME_DIR%\Projects\VC22\ARM64\;Platform=arm64;RootDir=%BUILD_HOME_DIR%;MsiVersion=%MSIVERSION%;Configuration=Release
+move bin\arm64\Release\Installer.msi %BUILD_HOME_DIR%\Projects\VC22\Agent-Arm64.msi
+dotnet build installer.vcxproj /p:targetPath=%BUILD_HOME_DIR%\Projects\VC22\x64\;Platform=x64;RootDir=%BUILD_HOME_DIR%;MsiVersion=%MSIVERSION%;Configuration=Release
+move bin\x64\Release\Installer.msi %BUILD_HOME_DIR%\Projects\VC22\Agent-x64.msi
+
+:done
diff --git a/msi/installer.vcxproj b/msi/installer.vcxproj
index d516dd73..c01ed134 100644
--- a/msi/installer.vcxproj
+++ b/msi/installer.vcxproj
@@ -10,10 +10,6 @@
      implied.  See the License for the specific language governing
      permissions and limitations under the License.
 
-NOTES:
-      dotnet clean installer.wixporoj
-      dotnet build installer.wixporoj
-
 -->
 
 <Project Sdk="WixToolset.Sdk/6.0.2">
@@ -26,6 +22,8 @@ NOTES:
         <InstallerPlatform>x64</InstallerPlatform>
         <MsiVersion>4.0.0.255</MsiVersion>
         <DefineConstants>msiVersion=$(MsiVersion)</DefineConstants>
+	<InstallerPlatform>$(Platform)</InstallerPlatform>
+	<DefineConstants>RootDir=$(RootDir);msiVersion=$(MsiVersion)</DefineConstants>
         <SuppressIces>ICE61</SuppressIces>
     </PropertyGroup>
 </Project>
diff --git a/msi/sp4.wxs b/msi/sp4.wxs
index 0e057530..390b0cb9 100644
--- a/msi/sp4.wxs
+++ b/msi/sp4.wxs
@@ -11,7 +11,6 @@
      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"
       xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">

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