[mapguide-commits] r10212 - sandbox/jng/installer_wix6

[svn_mapguide at osgeo.org]

Author: jng
Date: 2026-09-10 03:39:48 -0700 (Thu, 10 Sep 2026)
New Revision: 10212

Modified:
   sandbox/jng/installer_wix6/build.bat
Log:
Bail if FdoRegUtil.exe is not built and/or found at the expected place and ensure msi is copied to the correct location where the NSIS .nsi is expecting it from.

Modified: sandbox/jng/installer_wix6/build.bat
===================================================================
--- sandbox/jng/installer_wix6/build.bat	2026-09-10 10:17:52 UTC (rev 10211)
+++ sandbox/jng/installer_wix6/build.bat	2026-09-10 10:39:48 UTC (rev 10212)
@@ -197,6 +197,10 @@
 if not exist "%MG_SOURCE%\CS-Map" goto error_mg_csmap_not_found
 echo [prepare] Installer Pre-Requisites
 %MSBUILD% InstallerPreReq.sln /p:Platform=x64
+if not exist "%INSTALLER_FDO_REG_UTIL%\%TYPEBUILD%\FdoRegUtil.exe" (
+    echo [prepare] FdoRegUtil.exe not found in [%INSTALLER_FDO_REG_UTIL%\%TYPEBUILD%]
+    goto error
+)
 copy %INSTALLER_FDO_REG_UTIL%\%TYPEBUILD%\FdoRegUtil.exe %MG_SOURCE%\Server\FDO
 popd
 echo [prepare] Unpack Apache httpd
@@ -258,6 +262,10 @@
 %RUN_BUILD% InstallerWix.sln
 if "%errorlevel%"=="1" goto error
 if not exist "%INSTALLER_OUTPUT%" mkdir "%INSTALLER_OUTPUT%"
+echo [bootstrap]: Copying MSI
+if "%CONFIGURATION%"=="" SET CONFIGURATION=%TYPEBUILD:64=%
+copy /Y "%INSTALLER_DEV_INSTALLER%\bin\%PLATFORM_CLR%\%CONFIGURATION%\%CULTURE%\%INSTALLER_NAME%.msi" "%INSTALLER_OUTPUT%\%INSTALLER_NAME%.msi"
+if "%errorlevel%"=="1" goto error
 pushd "%INSTALLER_DEV_BOOTSTRAP%"
 echo [bootstrap]: Copying vcredist
 copy /Y vc_redist.%PLATFORM_CLR%.exe "%INSTALLER_OUTPUT%\vc_redist.%PLATFORM_CLR%.exe"