[cpp-sp] 03/05: CPPSP-53 Replace Windows Installer with Bat and C program (for registry operations)

[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/94f88d2980bff367ceb5dc6a27d951aded634834

commit 94f88d2980bff367ceb5dc6a27d951aded634834
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Mar 18 20:05:36 2026 +0000

    CPPSP-53 Replace Windows Installer with Bat and C program (for registry operations)
    
    https://shibboleth.atlassian.net/browse/CPPSP-53
    
    Start to build kitting bat file
---
 Projects/vc22/.gitignore    |  2 ++
 Projects/vc22/build.bat     | 48 ++++++++++++++++++++++++++++++++++-----------
 Projects/vc22/install.bat   |  1 +
 WindowsInstall/doupdate.bat |  1 +
 WindowsInstall/setreg.bat   |  1 +
 WindowsInstall/update.bat   |  1 +
 6 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/Projects/vc22/.gitignore b/Projects/vc22/.gitignore
new file mode 100644
index 00000000..664903ab
--- /dev/null
+++ b/Projects/vc22/.gitignore
@@ -0,0 +1,2 @@
+kit
+kit.zip
\ No newline at end of file
diff --git a/Projects/vc22/build.bat b/Projects/vc22/build.bat
index 4eff5c6f..bed207c9 100644
--- a/Projects/vc22/build.bat
+++ b/Projects/vc22/build.bat
@@ -14,6 +14,15 @@ rem Clean
 del /s *.obj *.lib *.dll *.exe
 del /s *.obj *.lib *.dll *.exe
 
+if exist kit.zip (
+    del kit.zip
+)
+
+if exist kit {
+   rd /s /q kit
+}
+
+
 REM Build all the DLLS and the msiversion executable
 
 REM everything for x64
@@ -23,21 +32,38 @@ REM IIS only for Arm64 and x86
 msbuild -m /property:Platform=arm64;Configuration=release /MaxCPUCount Shibboleth.sln /t:iis
 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
-)
+REM Build Kit.
+
+mkdir kit
+copy ..\..\WindowsInstall\install.bat kit\
+
+mkdir kit\dist
+x64\Release\MsiVersion.exe > kit\dist\Version.txt
+echo 1 > kit\dist\InstallerVersion.txt
+
+mkdir kit\dist\bin
+copy ..\..\WindowsInstall\update.bat kit\dist\bin\
+
+mkdir kit\dist\lib
+copy x64\Release\iis_shib4.dll kit\dist\lib
+copy x64\Release\mod_shib4.so kit\dist\lib
+copy x64\Release\NativeLogMessages.dll kit\dist\lib
+copy ARM64\Release\iis_shib4.dll kit\dist\lib\iis_shib4_arm64.dll
+copy Release\iis_shib4.dll kit\dist\lib\iis_shib4_x86.dll
 
-echo MsiVersion derived to be 'MSIVERSION%'
+mkdir kit\dist\etc
+copy ..\..\configs\agent.ini kit\dist\etc
+copy ..\..\configs\handlers.ini kit\dist\etc
+copy ..\..\configs\iis-config.ini kit\dist\etc
+copy ..\..\configs\request-map.xml kit\dist\etc
+copy ..\..\WindowsInstall\shib.ico kit\dist
 
-cd ..\..\msi
+mkdir kit\dist\dist-bin\
+copy ..\..\WindowsInstall\doupdate.bat kit\dist-bin\bin\
+copy ..\..\WindowsInstall\setreg.bat kit\dist-bin\bin\
 
-REM Clean
 
-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\x64\;Platform=x64;RootDir=%BUILD_HOME_DIR%;MsiVersion=%MSIVERSION%;Configuration=Release
-move bin\x64\Release\Installer.msi %BUILD_HOME_DIR%\Projects\VC22\Agent.msi
+tar -a -c -f kit.zip kit
 
-:done
diff --git a/Projects/vc22/install.bat b/Projects/vc22/install.bat
new file mode 100644
index 00000000..0ff88ca2
--- /dev/null
+++ b/Projects/vc22/install.bat
@@ -0,0 +1 @@
+REM 
diff --git a/WindowsInstall/doupdate.bat b/WindowsInstall/doupdate.bat
new file mode 100644
index 00000000..0ff88ca2
--- /dev/null
+++ b/WindowsInstall/doupdate.bat
@@ -0,0 +1 @@
+REM 
diff --git a/WindowsInstall/setreg.bat b/WindowsInstall/setreg.bat
new file mode 100644
index 00000000..0ff88ca2
--- /dev/null
+++ b/WindowsInstall/setreg.bat
@@ -0,0 +1 @@
+REM 
diff --git a/WindowsInstall/update.bat b/WindowsInstall/update.bat
new file mode 100644
index 00000000..0ff88ca2
--- /dev/null
+++ b/WindowsInstall/update.bat
@@ -0,0 +1 @@
+REM 

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