From svn_mapguide at osgeo.org Sat Mar 14 03:57:54 2026 From: svn_mapguide at osgeo.org (svn_mapguide at osgeo.org) Date: Sat, 14 Mar 2026 03:57:54 -0700 Subject: [mapguide-commits] r10205 - in branches/4.0/MgDev: . Bindings Message-ID: <20260314105754.5D1881AFF9F@trac.osgeo.org> Author: jng Date: 2026-03-14 03:57:53 -0700 (Sat, 14 Mar 2026) New Revision: 10205 Modified: branches/4.0/MgDev/Bindings/setup_linux_native_libs.cmd branches/4.0/MgDev/updateversion.vbs Log: Fix ups from a fresh env install Modified: branches/4.0/MgDev/Bindings/setup_linux_native_libs.cmd =================================================================== --- branches/4.0/MgDev/Bindings/setup_linux_native_libs.cmd 2025-10-27 10:17:55 UTC (rev 10204) +++ branches/4.0/MgDev/Bindings/setup_linux_native_libs.cmd 2026-03-14 10:57:53 UTC (rev 10205) @@ -1,8 +1,10 @@ SET TARBALL=%1 SET SOVER=4.0.0 +if "%TARBALL%"=="" goto :NoTarball +if not exist "%TARBALL%" goto :NoTarball rem You may see "errors" around symlink files being extracted. That's okay because we don't need these symlink files. Our SWIG rem glue library is already an unversioned .so file that has dependencies to versioned .so files and not their symlinked copies -7z x %TARBALL% -so | 7z x -aoa -si -ttar -o"%~p0\linux-x64" +"%CD%\..\BuildTools\WebTools\7-Zip\7z.exe" x %TARBALL% -so | "%CD%\..\BuildTools\WebTools\7-Zip\7z.exe" 7z x -aoa -si -ttar -o"%~p0\linux-x64" rem Foundation setup copy /Y /L "%~p0\linux-x64\lib64\libFoundationUnmanagedApi.so" "%~p0\src\Managed\DotNet\OSGeo.MapGuide.Foundation\runtimes\linux-x64\native" copy /Y /L "%~p0\linux-x64\lib64\libMgFoundation-%SOVER%.so" "%~p0\src\Managed\DotNet\OSGeo.MapGuide.Foundation\runtimes\linux-x64\native" @@ -24,4 +26,8 @@ copy /Y /L "%~p0\linux-x64\lib64\libMgWebApp-%SOVER%.so" "%~p0\src\Managed\DotNet\OSGeo.MapGuide.Web\runtimes\linux-x64\native" copy /Y /L "%~p0\linux-x64\lib64\libMgWebSupport-%SOVER%.so" "%~p0\src\Managed\DotNet\OSGeo.MapGuide.Web\runtimes\linux-x64\native" copy /Y /L "%~p0\linux-x64\lib64\libMgHttpHandler-%SOVER%.so" "%~p0\src\Managed\DotNet\OSGeo.MapGuide.Web\runtimes\linux-x64\native" -copy /Y /L "%~p0\linux-x64\lib64\liblib_json.so" "%~p0\src\Managed\DotNet\OSGeo.MapGuide.Web\runtimes\linux-x64\native" \ No newline at end of file +copy /Y /L "%~p0\linux-x64\lib64\liblib_json.so" "%~p0\src\Managed\DotNet\OSGeo.MapGuide.Web\runtimes\linux-x64\native" +goto :Done +:NoTarball +echo No linux native libs tarball specified or tarball does not exist. +:Done \ No newline at end of file Modified: branches/4.0/MgDev/updateversion.vbs =================================================================== --- branches/4.0/MgDev/updateversion.vbs 2025-10-27 10:17:55 UTC (rev 10204) +++ branches/4.0/MgDev/updateversion.vbs 2026-03-14 10:57:53 UTC (rev 10205) @@ -267,7 +267,6 @@ "/Server/src/Services/Site/ServerSiteService.rc", _ "/Server/src/Services/Tile/ServerTileService.rc", _ "/Server/src/UnitTesting/UnitTesting.rc", _ - "/UnitTest/Common/FoundationTest/DotNetUnmanagedApi/DotNetUnmanagedApi.rc", _ "/Web/src/ApacheAgent/ApacheAgent.rc", _ "/Web/src/CgiAgent/CgiAgent.rc", _ "/Web/src/DevHttpServer/DevHttpServer.rc", _ @@ -286,6 +285,7 @@ ' Update the version number in the user-defined RC files Dim sFile For Each sFile In aRcFiles + WScript.Echo "Stamping: ." & sFile FixRcFile "." & sFile , oVersion Next From svn_mapguide at osgeo.org Sat Mar 14 05:27:16 2026 From: svn_mapguide at osgeo.org (svn_mapguide at osgeo.org) Date: Sat, 14 Mar 2026 05:27:16 -0700 Subject: [mapguide-commits] r10206 - branches/4.0/MgDev/Doc Message-ID: <20260314122716.E908B1B0037@trac.osgeo.org> Author: jng Date: 2026-03-14 05:27:15 -0700 (Sat, 14 Mar 2026) New Revision: 10206 Modified: branches/4.0/MgDev/Doc/build.bat Log: Fix javadoc detection Modified: branches/4.0/MgDev/Doc/build.bat =================================================================== --- branches/4.0/MgDev/Doc/build.bat 2026-03-14 10:57:53 UTC (rev 10205) +++ branches/4.0/MgDev/Doc/build.bat 2026-03-14 12:27:15 UTC (rev 10206) @@ -1,6 +1,6 @@ @echo off REM TODO: Move to setenviroment64.bat once this is fully fleshed out -SET LABEL=4.0 RC1 +SET LABEL=4.0 pushd dotnet_api docfx metadata docfx build --metadata _appTitle="MapGuide .net API reference (%LABEL%)" @@ -10,7 +10,19 @@ REM for the affected classes will still be generated, these errors are mostly about malformed tags that are a by-product REM of being transferred from the C++ doxygen fragments REM TODO: These errors will go away by fixing the comments in question at the C++ source -javadoc -d ..\..\..\..\Doc\landing\_site\java_api org.osgeo.mapguide -overview ..\..\..\..\Doc\java_api\overview.html -windowtitle "MapGuide Java API reference (%LABEL%)" +set "JAVADOC_EXE=" +where javadoc >nul 2>nul +if not errorlevel 1 ( + set "JAVADOC_EXE=javadoc" +) else if defined JAVA_HOME if exist "%JAVA_HOME%\bin\javadoc.exe" ( + set "JAVADOC_EXE=%JAVA_HOME%\bin\javadoc.exe" +) + +if defined JAVADOC_EXE ( + "%JAVADOC_EXE%" -d ..\..\..\..\Doc\landing\_site\java_api org.osgeo.mapguide -overview ..\..\..\..\Doc\java_api\overview.html -windowtitle "MapGuide Java API reference (%LABEL%)" +) else ( + echo WARNING: javadoc not found in PATH or JAVA_HOME. Skipping Java API documentation generation. +) popd pushd mdpreprocess dotnet run -- ..\landing\topics From svn_mapguide at osgeo.org Sat Mar 14 10:20:41 2026 From: svn_mapguide at osgeo.org (svn_mapguide at osgeo.org) Date: Sat, 14 Mar 2026 10:20:41 -0700 Subject: [mapguide-commits] r10207 - sandbox/jng Message-ID: <20260314172041.5DDDD1B129F@trac.osgeo.org> Author: jng Date: 2026-03-14 10:20:40 -0700 (Sat, 14 Mar 2026) New Revision: 10207 Added: sandbox/jng/installer_wix6/ Log: Sandbox to migrate Windows Installer to Wix Toolset 6.x From svn_mapguide at osgeo.org Sat Mar 14 10:26:43 2026 From: svn_mapguide at osgeo.org (svn_mapguide at osgeo.org) Date: Sat, 14 Mar 2026 10:26:43 -0700 Subject: [mapguide-commits] r10208 - in sandbox/jng/installer_wix6: . Custom/apache_actions FdoRegUtil Installers/MapGuide Installers/MapGuide/Lang Libraries/CS Map Libraries/CS Map/Lang Libraries/MapGuide Server Libraries/MapGuide Server/Lang Libraries/MapGuide Web Extensions Libraries/MapGuide Web Extensions/Lang Message-ID: <20260314172644.0B4E91AFDF0@trac.osgeo.org> Author: jng Date: 2026-03-14 10:26:43 -0700 (Sat, 14 Mar 2026) New Revision: 10208 Added: sandbox/jng/installer_wix6/Libraries/CS Map/HarvestFiles.wxs sandbox/jng/installer_wix6/Libraries/MapGuide Server/HarvestFiles.wxs sandbox/jng/installer_wix6/Libraries/MapGuide Web Extensions/HarvestFiles.wxs Modified: sandbox/jng/installer_wix6/ sandbox/jng/installer_wix6/Custom/apache_actions/apache_actions.vcxproj sandbox/jng/installer_wix6/FdoRegUtil/FdoRegUtil.vcxproj sandbox/jng/installer_wix6/InstallerPreReq.sln sandbox/jng/installer_wix6/InstallerWix.sln sandbox/jng/installer_wix6/Installers/MapGuide/Lang/MapGuide_en-US.wxl sandbox/jng/installer_wix6/Installers/MapGuide/MapGuide.wixproj sandbox/jng/installer_wix6/Installers/MapGuide/MapGuide.wxs sandbox/jng/installer_wix6/Libraries/CS Map/CS Map.wixproj sandbox/jng/installer_wix6/Libraries/CS Map/CSMap.wxs sandbox/jng/installer_wix6/Libraries/CS Map/Lang/CSMap_en-US.wxl sandbox/jng/installer_wix6/Libraries/MapGuide Server/FDO.wxs sandbox/jng/installer_wix6/Libraries/MapGuide Server/InstallService.wxs sandbox/jng/installer_wix6/Libraries/MapGuide Server/Lang/MapGuideServer_en-US.wxl sandbox/jng/installer_wix6/Libraries/MapGuide Server/MapGuide Server.wixproj sandbox/jng/installer_wix6/Libraries/MapGuide Server/MapGuideServer.wxs sandbox/jng/installer_wix6/Libraries/MapGuide Web Extensions/Apache.wxs sandbox/jng/installer_wix6/Libraries/MapGuide Web Extensions/IIS7.wxs sandbox/jng/installer_wix6/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_en-US.wxl sandbox/jng/installer_wix6/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj sandbox/jng/installer_wix6/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs sandbox/jng/installer_wix6/Libraries/MapGuide Web Extensions/Shortcuts.wxs sandbox/jng/installer_wix6/build.bat Log: Initial migration to Wix Toolset 6.x. Drop 32-bit/x86 configurations and targets in the process. Wix 6.x also supports native file harvesting with wildcard support. So using a tool like Paraffin should no longer be required. Once further testing confirms our installer still works, we will remove Paraffin. Index: sandbox/jng/installer_wix6 =================================================================== --- sandbox/jng/installer_wix6 2026-03-14 17:20:40 UTC (rev 10207) +++ sandbox/jng/installer_wix6 2026-03-14 17:26:43 UTC (rev 10208) Property changes on: sandbox/jng/installer_wix6 ___________________________________________________________________ Modified: svn:ignore ## -3,3 +3,4 ## *.ncb *.cache ipch +.vs Modified: sandbox/jng/installer_wix6/Custom/apache_actions/apache_actions.vcxproj =================================================================== --- sandbox/jng/installer_wix6/Custom/apache_actions/apache_actions.vcxproj 2026-03-14 17:20:40 UTC (rev 10207) +++ sandbox/jng/installer_wix6/Custom/apache_actions/apache_actions.vcxproj 2026-03-14 17:26:43 UTC (rev 10208) @@ -1,18 +1,10 @@ ? - - Debug - Win32 - Debug x64 - - Release - Win32 - Release x64 @@ -25,20 +17,11 @@ 10.0 - - DynamicLibrary - MultiByte - v142 - DynamicLibrary MultiByte v142 - - DynamicLibrary - v142 - DynamicLibrary v142 @@ -46,18 +29,10 @@ - - - - - - - - @@ -65,13 +40,7 @@ <_ProjectFileVersion>10.0.40219.1 - .\bin$(PlatformToolsetVersion)_$(Platform)\ - .\Release$(PlatformToolsetVersion)_$(Platform)\ - false false - .\Debug$(PlatformToolsetVersion)_$(Platform)\ - .\Debug$(PlatformToolsetVersion)_$(Platform)\ - true true @@ -82,54 +51,6 @@ .\Debug$(PlatformToolsetVersion)_$(Platform)\ .\Debug$(PlatformToolsetVersion)_$(Platform)\ - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\../bin/apache_actions.tlb - - - - - MaxSpeed - OnlyExplicitInline - WIN32;NDEBUG;_WINDOWS;APACHE_ACTIONS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreaded - true - Use - stdafx.h - .\Release$(PlatformToolsetVersion)_$(Platform)\apache_actions.pch - - - .\Release$(PlatformToolsetVersion)_$(Platform)\ - .\Release$(PlatformToolsetVersion)_$(Platform)\ - Level3 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - msi.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll - true - .\apache_actions.def - .\bin$(PlatformToolsetVersion)_$(Platform)\apache_actions.pdb - false - - - .\bin$(PlatformToolsetVersion)_$(Platform)\apache_actions.lib - MachineX86 - - - true - .\../bin/apache_actions.bsc - - NDEBUG;%(PreprocessorDefinitions) @@ -176,54 +97,6 @@ .\../bin/apache_actions.bsc - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/apache_actions.tlb - - - - - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;APACHE_ACTIONS_EXPORTS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - Use - stdafx.h - .\Debug$(PlatformToolsetVersion)_$(Platform)\apache_actions.pch - .\Debug$(PlatformToolsetVersion)_$(Platform)\ - .\Debug$(PlatformToolsetVersion)_$(Platform)\ - .\Debug$(PlatformToolsetVersion)_$(Platform)\ - Level3 - true - EditAndContinue - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - odbc32.lib;odbccp32.lib;msi.lib;%(AdditionalDependencies) - .\Debug$(PlatformToolsetVersion)_$(Platform)\apache_actions.dll - true - .\apache_actions.def - true - .\Debug$(PlatformToolsetVersion)_$(Platform)\apache_actions.pdb - false - - - .\Debug$(PlatformToolsetVersion)_$(Platform)\apache_actions.lib - MachineX86 - - - true - .\Debug/apache_actions.bsc - - _DEBUG;%(PreprocessorDefinitions) @@ -271,17 +144,12 @@ - %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) - %(PreprocessorDefinitions) %(PreprocessorDefinitions) - Create Create Modified: sandbox/jng/installer_wix6/FdoRegUtil/FdoRegUtil.vcxproj =================================================================== --- sandbox/jng/installer_wix6/FdoRegUtil/FdoRegUtil.vcxproj 2026-03-14 17:20:40 UTC (rev 10207) +++ sandbox/jng/installer_wix6/FdoRegUtil/FdoRegUtil.vcxproj 2026-03-14 17:26:43 UTC (rev 10208) @@ -1,18 +1,10 @@ ? - - Debug - Win32 - Debug x64 - - Release - Win32 - Release x64 @@ -21,21 +13,10 @@ {F671A5C4-A796-4CF4-A71F-97B0265B4FBE} FdoRegUtil - Win32Proj + ConsoleApplication 10.0 - - Application - Unicode - true - v142 - - - Application - Unicode - v142 - Application Unicode @@ -50,12 +31,6 @@ - - - - - - @@ -65,39 +40,13 @@ <_ProjectFileVersion>10.0.40219.1 - .\Debug\ - .\Debug\ - true .\Debug64\ .\Debug64\ true - .\Release\ - .\Release\ - false .\Release64\ .\Release64\ false - - - Disabled - ..\..\MgDev\Oem\Fdo\Inc;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - Level3 - EditAndContinue - - - FDO.lib;FDOCommon.lib;%(AdditionalDependencies) - ..\..\MgDev\Oem\Fdo\Lib;%(AdditionalLibraryDirectories) - true - Console - MachineX86 - - X64 @@ -121,28 +70,6 @@ MachineX64 - - - MaxSpeed - true - ..\..\MgDev\Oem\Fdo\Inc;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Use - Level3 - ProgramDatabase - - - FDO.lib;FDOCommon.lib;%(AdditionalDependencies) - ..\..\MgDev\Oem\Fdo\Lib;%(AdditionalLibraryDirectories) - true - Console - true - true - MachineX86 - - X64 @@ -171,9 +98,7 @@ - Create Create - Create Create Modified: sandbox/jng/installer_wix6/InstallerPreReq.sln =================================================================== --- sandbox/jng/installer_wix6/InstallerPreReq.sln 2026-03-14 17:20:40 UTC (rev 10207) +++ sandbox/jng/installer_wix6/InstallerPreReq.sln 2026-03-14 17:26:43 UTC (rev 10208) @@ -8,26 +8,16 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {03FD713E-15EB-453E-AFDF-21F8DB45C11E}.Debug|Win32.ActiveCfg = Debug|Win32 - {03FD713E-15EB-453E-AFDF-21F8DB45C11E}.Debug|Win32.Build.0 = Debug|Win32 - {03FD713E-15EB-453E-AFDF-21F8DB45C11E}.Debug|x64.ActiveCfg = Debug|Win32 - {03FD713E-15EB-453E-AFDF-21F8DB45C11E}.Debug|x64.Build.0 = Debug|Win32 - {03FD713E-15EB-453E-AFDF-21F8DB45C11E}.Release|Win32.ActiveCfg = Release|Win32 - {03FD713E-15EB-453E-AFDF-21F8DB45C11E}.Release|Win32.Build.0 = Release|Win32 + {03FD713E-15EB-453E-AFDF-21F8DB45C11E}.Debug|x64.ActiveCfg = Debug|x64 + {03FD713E-15EB-453E-AFDF-21F8DB45C11E}.Debug|x64.Build.0 = Debug|x64 {03FD713E-15EB-453E-AFDF-21F8DB45C11E}.Release|x64.ActiveCfg = Release|x64 {03FD713E-15EB-453E-AFDF-21F8DB45C11E}.Release|x64.Build.0 = Release|x64 - {F671A5C4-A796-4CF4-A71F-97B0265B4FBE}.Debug|Win32.ActiveCfg = Debug|Win32 - {F671A5C4-A796-4CF4-A71F-97B0265B4FBE}.Debug|Win32.Build.0 = Debug|Win32 {F671A5C4-A796-4CF4-A71F-97B0265B4FBE}.Debug|x64.ActiveCfg = Debug|x64 {F671A5C4-A796-4CF4-A71F-97B0265B4FBE}.Debug|x64.Build.0 = Debug|x64 - {F671A5C4-A796-4CF4-A71F-97B0265B4FBE}.Release|Win32.ActiveCfg = Release|Win32 - {F671A5C4-A796-4CF4-A71F-97B0265B4FBE}.Release|Win32.Build.0 = Release|Win32 {F671A5C4-A796-4CF4-A71F-97B0265B4FBE}.Release|x64.ActiveCfg = Release|x64 {F671A5C4-A796-4CF4-A71F-97B0265B4FBE}.Release|x64.Build.0 = Release|x64 EndGlobalSection Modified: sandbox/jng/installer_wix6/InstallerWix.sln =================================================================== --- sandbox/jng/installer_wix6/InstallerWix.sln 2026-03-14 17:20:40 UTC (rev 10207) +++ sandbox/jng/installer_wix6/InstallerWix.sln 2026-03-14 17:26:43 UTC (rev 10208) @@ -11,39 +11,25 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 Release|x64 = Release|x64 - Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {01313DB9-2AAF-4791-9B81-69BCE3194531}.Debug|x64.ActiveCfg = Debug|x86 - {01313DB9-2AAF-4791-9B81-69BCE3194531}.Debug|x86.ActiveCfg = Debug|x86 - {01313DB9-2AAF-4791-9B81-69BCE3194531}.Debug|x86.Build.0 = Debug|x86 - {01313DB9-2AAF-4791-9B81-69BCE3194531}.Release|x64.ActiveCfg = Release|x86 - {01313DB9-2AAF-4791-9B81-69BCE3194531}.Release|x64.Build.0 = Release|x86 - {01313DB9-2AAF-4791-9B81-69BCE3194531}.Release|x86.ActiveCfg = Release|x86 - {01313DB9-2AAF-4791-9B81-69BCE3194531}.Release|x86.Build.0 = Release|x86 - {715E2D88-E822-4A9A-A5A2-DBB71CD9B320}.Debug|x64.ActiveCfg = Debug|x86 - {715E2D88-E822-4A9A-A5A2-DBB71CD9B320}.Debug|x86.ActiveCfg = Debug|x86 - {715E2D88-E822-4A9A-A5A2-DBB71CD9B320}.Debug|x86.Build.0 = Debug|x86 - {715E2D88-E822-4A9A-A5A2-DBB71CD9B320}.Release|x64.ActiveCfg = Release|x86 - {715E2D88-E822-4A9A-A5A2-DBB71CD9B320}.Release|x64.Build.0 = Release|x86 - {715E2D88-E822-4A9A-A5A2-DBB71CD9B320}.Release|x86.ActiveCfg = Release|x86 - {715E2D88-E822-4A9A-A5A2-DBB71CD9B320}.Release|x86.Build.0 = Release|x86 - {D41D53C4-433E-47B5-B663-E79B5569EE22}.Debug|x64.ActiveCfg = Debug|x86 - {D41D53C4-433E-47B5-B663-E79B5569EE22}.Debug|x86.ActiveCfg = Debug|x86 - {D41D53C4-433E-47B5-B663-E79B5569EE22}.Debug|x86.Build.0 = Debug|x86 - {D41D53C4-433E-47B5-B663-E79B5569EE22}.Release|x64.ActiveCfg = Release|x86 - {D41D53C4-433E-47B5-B663-E79B5569EE22}.Release|x64.Build.0 = Release|x86 - {D41D53C4-433E-47B5-B663-E79B5569EE22}.Release|x86.ActiveCfg = Release|x86 - {D41D53C4-433E-47B5-B663-E79B5569EE22}.Release|x86.Build.0 = Release|x86 - {12C62F60-6F52-4112-84AB-0FA8ED44EE77}.Debug|x64.ActiveCfg = Debug|x86 - {12C62F60-6F52-4112-84AB-0FA8ED44EE77}.Debug|x86.ActiveCfg = Debug|x86 - {12C62F60-6F52-4112-84AB-0FA8ED44EE77}.Debug|x86.Build.0 = Debug|x86 - {12C62F60-6F52-4112-84AB-0FA8ED44EE77}.Release|x64.ActiveCfg = Release|x86 - {12C62F60-6F52-4112-84AB-0FA8ED44EE77}.Release|x64.Build.0 = Release|x86 - {12C62F60-6F52-4112-84AB-0FA8ED44EE77}.Release|x86.ActiveCfg = Release|x86 - {12C62F60-6F52-4112-84AB-0FA8ED44EE77}.Release|x86.Build.0 = Release|x86 + {01313DB9-2AAF-4791-9B81-69BCE3194531}.Debug|x64.ActiveCfg = Debug|x64 + {01313DB9-2AAF-4791-9B81-69BCE3194531}.Debug|x64.Build.0 = Debug|x64 + {01313DB9-2AAF-4791-9B81-69BCE3194531}.Release|x64.ActiveCfg = Release|x64 + {01313DB9-2AAF-4791-9B81-69BCE3194531}.Release|x64.Build.0 = Release|x64 + {715E2D88-E822-4A9A-A5A2-DBB71CD9B320}.Debug|x64.ActiveCfg = Debug|x64 + {715E2D88-E822-4A9A-A5A2-DBB71CD9B320}.Debug|x64.Build.0 = Debug|x64 + {715E2D88-E822-4A9A-A5A2-DBB71CD9B320}.Release|x64.ActiveCfg = Release|x64 + {715E2D88-E822-4A9A-A5A2-DBB71CD9B320}.Release|x64.Build.0 = Release|x64 + {D41D53C4-433E-47B5-B663-E79B5569EE22}.Debug|x64.ActiveCfg = Debug|x64 + {D41D53C4-433E-47B5-B663-E79B5569EE22}.Debug|x64.Build.0 = Debug|x64 + {D41D53C4-433E-47B5-B663-E79B5569EE22}.Release|x64.ActiveCfg = Release|x64 + {D41D53C4-433E-47B5-B663-E79B5569EE22}.Release|x64.Build.0 = Release|x64 + {12C62F60-6F52-4112-84AB-0FA8ED44EE77}.Debug|x64.ActiveCfg = Debug|x64 + {12C62F60-6F52-4112-84AB-0FA8ED44EE77}.Debug|x64.Build.0 = Debug|x64 + {12C62F60-6F52-4112-84AB-0FA8ED44EE77}.Release|x64.ActiveCfg = Release|x64 + {12C62F60-6F52-4112-84AB-0FA8ED44EE77}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Modified: sandbox/jng/installer_wix6/Installers/MapGuide/Lang/MapGuide_en-US.wxl =================================================================== --- sandbox/jng/installer_wix6/Installers/MapGuide/Lang/MapGuide_en-US.wxl 2026-03-14 17:20:40 UTC (rev 10207) +++ sandbox/jng/installer_wix6/Installers/MapGuide/Lang/MapGuide_en-US.wxl 2026-03-14 17:26:43 UTC (rev 10208) @@ -1,149 +1,148 @@ - - +? - 1033 - MapGuide Open Source 2.4 - Open Source Geospatial Foundation + + + - [ProductName] Setup + - MapGuide - MapGuide Install Location + + - Next - Back - Cancel + + + - Disabled Features - Some features will not be available - IIS is not installed, so it will not be available as an installation choice. - The .NET Framework 4.0 was not found, so the .NET Web Extensions for IIS will not be available - If you want to use these features, click on cancel and correct the problem before proceeding with installation + + + + + - FastCGI is required - FastCGI needs to be installed - MapGuide IIS Configuration requires FastCGI to be installed on this system - You can follow the link below for more information on how to enable FastCGI - http://www.iis.net/fastcgi/configuration - You can ignore this message if FastCGI for IIS is already enabled. Otherwise you must cancel this installation and enable FastCGI first + + + + + + - Server Port Configuration - Set up the listening ports for MapGuide Server - MapGuide Server will be installed using the following port numbers. The Server and Web Tier configuration files will be set to use the specified port numbers below. - Admin Connection Port - Client Connection Port - Site Connection Port + + + + + + - Select configuration type - Select the type of web server configuration you want - Bundled Configuration - IIS Configuration - Manual Configuration - Install and configure Apache, PHP, and Tomcat. - Install PHP and auto-configure IIS. - Manually install and configure MapGuide. + + + + + + + + - Bundled Configuration Settings - Set up the development environment - Web Server Port Number - Development Environment - Virtual Directory Name + + + + + - IIS Configuration Settings - Set up the development environment - Development Environment - Virtual Directory Name + + + + - IIS 6.0 Configuration - Configure IIS 6.0 Settings - Install Web Extensions to the following website - Create an application pool - An application pool allows MapGuide applications to be isolated from other applications running on the web server + + + + + - IIS not found - IIS not found - IIS could not be found on your system. Please go back and choose a different web configuration or install IIS. + + + - Server IP address - Enter the MapGuide Server site server IP address. - Enter the MapGuide Server site server IP address: - The site server IP address defaults to localhost (127.0.0.1) + + + + - Setting values for httpd.conf - Setting values for php.ini - Installing Apache Service - Installing Tomcat Service - Installing MapGuide Service - Removing MapGuide Service - Removing Apache Service - Removing Tomcat Service + + + + + + + + - Unlocking site handler config - Creating IIS application pool - Creating FastCgi application mapping - Setting Application Pool properties - Creating mapguide virtual dir - Applying compatibility settings for selection XML to work - Creating PHP handler mapping - Creating mapagent virtual dir - Setting access policy for mapagent virtual dir - Creating handler mapping for mapagent virtual dir - Enabling mapagent ISAPI extension - Assigning application pool to mapguide virtual dir - Assigning application pool to mapagent virtual dir - Unlocking http errors config - Unlocking http errors config for web site - Unlocking http errors config for mapguide virtual dir - Resetting 401 handler - Adding JSON mime type - Creating mapviewerajax virtual dir to point to mapviewerphp - Setting default document for mapviewerajax virtual dir - Setting application pool for mapviewerajax - Creating mapviewerajax virtual dir to point to mapviewernet - Setting default document for mapviewerajax virtual dir - Setting application pool for mapviewerajax - Creating mapviewernet virtual dir - Setting default document for mapviewernet virtual dir - Setting application pool for mapviewernet virtual dir - Creating dotnetviewersample virtual dir - Setting default document for dotnetviewersample virtual dir - Setting application pool for dotnetviewersample virtual dir - Creating dotnetsamples virtual dir - Setting default document for dotnetsamples virtual dir - Setting application pool for dotnetsamples virtual dir - Clearing mapagent restrictions - Removing mapviewerajax virtual dir - Removing mapagent virtual dir - Removing mapguide virtual dir - Deleting application pool - Registering ASP.net - Registering FDO Provider: OSGeo.ArcSDE - Registering FDO Provider: OSGeo.SDF - Registering FDO Provider: OSGeo.SHP - Registering FDO Provider: OSGeo.WFS - Registering FDO Provider: OSGeo.WMS - Registering FDO Provider: OSGeo.ODBC - Registering FDO Provider: OSGeo.MySQL - Registering FDO Provider: OSGeo.Gdal - Registering FDO Provider: OSGeo.OGR - Registering FDO Provider: OSGeo.PostgreSQL - Registering FDO Provider: King.Oracle - Registering FDO Provider: OSGeo.SQLServerSpatial - Registering FDO Provider: OSGeo.SQLite - Un-registering FDO Provider: OSGeo.ArcSDE - Un-registering FDO Provider: OSGeo.SDF - Un-registering FDO Provider: OSGeo.SHP - Un-registering FDO Provider: OSGeo.WFS - Un-registering FDO Provider: OSGeo.WMS - Un-registering FDO Provider: OSGeo.ODBC - Un-registering FDO Provider: OSGeo.MySQL - Un-registering FDO Provider: OSGeo.Gdal - Un-registering FDO Provider: OSGeo.OGR - Un-registering FDO Provider: OSGeo.PostgreSQL - Un-registering FDO Provider: King.Oracle - Un-registering FDO Provider: OSGeo.SQLServerSpatial - Un-registering FDO Provider: OSGeo.SQLite + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Modified: sandbox/jng/installer_wix6/Installers/MapGuide/MapGuide.wixproj =================================================================== --- sandbox/jng/installer_wix6/Installers/MapGuide/MapGuide.wixproj 2026-03-14 17:20:40 UTC (rev 10207) +++ sandbox/jng/installer_wix6/Installers/MapGuide/MapGuide.wixproj 2026-03-14 17:26:43 UTC (rev 10208) @@ -1,48 +1,30 @@ ? - + - Debug - x86 - 3.0 - {12c62f60-6f52-4112-84ab-0fa8ed44ee77} - 2.0 - MapGuideOpenSource + Debug + x64 + false + MapGuideOpenSource Package - $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets MapGuide - en-US - MapGuide Open Source 2.1.0 Ux - 2.1.0.0 - Software\OSGeo\MapGuide - $(MSBuildProjectDirectory)\..\..\..\MgDev\$(Configuration) + en-US + MapGuide Open Source 2.1.0 Ux + 2.1.0.0 + Software\OSGeo\MapGuide + $(MSBuildProjectDirectory)\..\..\..\MgDev\$(Configuration) + $([System.String]::Copy('$(MgSource)').Replace('"', '')) - - bin\$(Configuration)\ - obj\$(Configuration)\ - Debug;MgTitle=$(MgTitle);MgVersion=$(MgVersion);MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform);Have_ArcSde=$(Have_ArcSde) + + Debug;MgTitle=$(MgTitle);MgVersion=$(MgVersion);MgRegKey=$(MgRegKey);MgSource=$(MgSourceSanitized);MgPlatform=$(Platform);Have_ArcSde=$(Have_ArcSde) $(MgCulture) ICE47 - - - ..\..\Output\ - obj\$(Configuration)\ - False - True - MgTitle=$(MgTitle);MgVersion=$(MgVersion);MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform);Have_ArcSde=$(Have_ArcSde) - $(MgCulture) - ICE47 - - - Debug;MgTitle=$(MgTitle);MgVersion=$(MgVersion);MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform);Have_ArcSde=$(Have_ArcSde) - $(MgCulture) - ICE47 bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ - + False True - MgTitle=$(MgTitle);MgVersion=$(MgVersion);MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform);Have_ArcSde=$(Have_ArcSde) + MgTitle=$(MgTitle);MgVersion=$(MgVersion);MgRegKey=$(MgRegKey);MgSource=$(MgSourceSanitized);MgPlatform=$(Platform);Have_ArcSde=$(Have_ArcSde) $(MgCulture) ICE47 bin\$(Platform)\$(Configuration)\ @@ -57,10 +39,6 @@ - - - - CS Map {01313db9-2aaf-4791-9b81-69bce3194531} @@ -81,30 +59,9 @@ - - $(WixExtDir)\WixUtilExtension.dll - WixUtilExtension - - - $(WixExtDir)\WixUIExtension.dll - WixUIExtension - - - $(WixExtDir)\WixNetFxExtension.dll - WixNetFxExtension - - - $(WixExtDir)\WixIIsExtension.dll - WixIIsExtension - + + + + - - \ No newline at end of file Modified: sandbox/jng/installer_wix6/Installers/MapGuide/MapGuide.wxs =================================================================== --- sandbox/jng/installer_wix6/Installers/MapGuide/MapGuide.wxs 2026-03-14 17:20:40 UTC (rev 10207) +++ sandbox/jng/installer_wix6/Installers/MapGuide/MapGuide.wxs 2026-03-14 17:26:43 UTC (rev 10208) @@ -1,48 +1,19 @@ - - + - - - - - - - + + + + + - - - - - + - + @@ -50,13 +21,7 @@ - + @@ -77,22 +42,10 @@ --> - + - + @@ -100,50 +53,22 @@ - 1 - - + - - - - + - - - - - - - - - - - - - - - - - - - - + + + - + @@ -197,12 +122,8 @@ - - NOT IISVERSIONMAJOR="#0" - - - NETFRAMEWORK40FULL - + + @@ -444,38 +365,38 @@ - 1 - "1"]]> + + - 1 + - 1 - LicenseAccepted="1" - LicenseAccepted="1" AND (IISVERSIONMAJOR="#0" OR (NOT NETFRAMEWORK40FULL)) + + + - 1 - 1 - 1 + + + - NOT IISVERSIONMAJOR="#0" - IISVERSIONMAJOR="#0" - 1 - 1 + + + + - 1 + - 1 + - 1 - 1 - 1 + + + - (MGWEB_CONFIG="APACHE") OR (MGWEB_CONFIG="IIS" AND NOT NETFRAMEWORK40FULL) - MGWEB_CONFIG="APACHE" - MGWEB_CONFIG="IIS" + + + - MGWEB_CONFIG="IIS" - MGWEB_CONFIG="IIS" - MGWEB_CONFIG="IIS" - MGWEB_CONFIG="IIS" - MGWEB_CONFIG="IIS" - MGWEB_CONFIG="IIS" - MGWEB_CONFIG="IIS" - MGWEB_CONFIG="MANUAL" - 1 - 1 + + + + + + + + + + - MGWEB_CONFIG="IIS" AND NETFRAMEWORK40FULL - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND (NOT NETFRAMEWORK40FULL) - 1 - 1 + + + + - 1 + - 1 + - 1 - 1 - 1 - 1 + + + + - MGWEB_CONFIG="APACHE" - MGWEB_CONFIG="APACHE" - MGWEB_CONFIG="APACHE" - MGWEB_CONFIG="APACHE" - MGWEB_CONFIG="MANUAL" - 1 - 1 + + + + + + + - 1 + - APACHE_API_TYPE="JAVA" - APACHE_API_TYPE="JAVA" - APACHE_API_TYPE="JAVA" - APACHE_API_TYPE="JAVA" - APACHE_API_TYPE="JAVA" - APACHE_API_TYPE="JAVA" - APACHE_API_TYPE="JAVA" - APACHE_API_TYPE="JAVA" + + + + + + + + - APACHE_API_TYPE="PHP" - APACHE_API_TYPE="PHP" - APACHE_API_TYPE="PHP" - APACHE_API_TYPE="PHP" - APACHE_API_TYPE="PHP" - APACHE_API_TYPE="PHP" - APACHE_API_TYPE="PHP" - APACHE_API_TYPE="PHP" + + + + + + + + - IISVERSIONMAJOR="#0" - IISVERSIONMAJOR="#0" - NOT IISVERSIONMAJOR="#0" - NOT IISVERSIONMAJOR="#0" - 1 + + + + + - (NOT IISVERSIONMAJOR="#0") + - IIS_API_TYPE="PHP" - IIS_API_TYPE="PHP" - IIS_API_TYPE="PHP" - IIS_API_TYPE="PHP" + + + + - IIS_API_TYPE="DOTNET" - IIS_API_TYPE="DOTNET" - IIS_API_TYPE="DOTNET" - IIS_API_TYPE="DOTNET" + + + + - 1 - 1 - 1 + + + - 1 - NETFRAMEWORK40FULL - NOT NETFRAMEWORK40FULL - NOT NETFRAMEWORK40FULL - 1 + + + + + - 1 - (NOT IISVERSIONMAJOR="#0") AND MGWEB_CONFIG="IIS" - MGWEB_CONFIG="APACHE" - (NOT IISVERSIONMAJOR="#0") AND ( (IISVERSIONMAJOR="#5" AND (NOT NETFRAMEWORK40FULL)) OR (MGWEB_CONFIG="MANUAL" )) - (NOT IISVERSIONMAJOR="#0") AND ( (IISVERSIONMAJOR="#5" AND (NOT NETFRAMEWORK40FULL) AND MGWEB_CONFIG="IIS" ) OR (MGWEB_CONFIG="MANUAL" )) - IISVERSIONMAJOR="#0" - IISVERSIONMAJOR="#0" AND MGWEB_CONFIG="MANUAL" - 1 + + + + + + + + - 1 - 1 - 1 - "1"]]> - - 1 - 1 + + + + + + + - Installed - NOT Installed - 1 + + + - NOT Installed OR WixUI_InstallMode = "Change" - Installed + + - 1 + - 1 - 1 - 1 - 1 + + + + - 1 + - !(loc.UpdateApacheConfig) - !(loc.UpdatePhpIni) - !(loc.InstallApacheServiceCA) - !(loc.InstallTomcatServiceCA) - !(loc.MgServerInstallCA) - !(loc.MgServerUninstallCA) - !(loc.RemoveApacheServiceCA) - !(loc.RemoveTomcatServiceCA) - !(loc.MapGuideIIS7_I_UnlockSiteHandlers) - !(loc.MapGuideIIS7_I_CreateMapGuideApp) - !(loc.MapGuideIIS7_I_SelectXmlCompat) - !(loc.MapGuideIIS7_I_CreatePhpScriptMapping) - !(loc.MapGuideIIS7_I_CreateMapAgentApp) - !(loc.MapGuideIIS7_I_SetMapAgentHandlerAccess) - !(loc.MapGuideIIS7_I_CreateMapAgentScriptHandling) - !(loc.MapGuideIIS7_I_EnableMapAgentExtension) - !(loc.MapGuideIIS7_I_AssignMapGuideAppPool) - !(loc.MapGuideIIS7_I_AssignMapAgentAppPool) - !(loc.MapGuideIIS7_I_UnlockHttpErrorsMain) - !(loc.MapGuideIIS7_I_UnlockHttpErrorsWebSite) - !(loc.MapGuideIIS7_I_UnlockHttpErrorsMapGuide) - !(loc.MapGuideIIS7_I_Reset401Handler) - !(loc.MapGuideIIS7_I_AddJsonMime) - !(loc.MapGuideIIS7_I_CreateViewerPhp) - !(loc.MapGuideIIS7_I_SetViewerDocPhp) - !(loc.MapGuideIIS7_I_AssignViewerAppPoolPhp) - !(loc.MapGuideIIS7_I_CreateViewerNet) - !(loc.MapGuideIIS7_I_SetViewerDocNet) - !(loc.MapGuideIIS7_I_AssignViewerAppPoolNet) - !(loc.MapGuideIIS7_I_CreateMapViewerNet) - !(loc.MapGuideIIS7_I_SetMapViewerDocNet) - !(loc.MapGuideIIS7_I_AssignMapViewerAppPoolNet) - !(loc.MapGuideIIS7_I_CreateViewerSampleNet) - !(loc.MapGuideIIS7_I_SetViewerDocViewerSampleNet) - !(loc.MapGuideIIS7_I_AssignViewerAppPoolViewerSampleNet) - !(loc.MapGuideIIS7_I_CreateViewerDevGuideSamplesNet) - !(loc.MapGuideIIS7_I_SetViewerDocDevGuideSamplesNet) - !(loc.MapGuideIIS7_I_AssignViewerAppPoolDevGuideSamplesNet) - !(loc.MapGuideIIS7_U_ClearMapAgentRestriction) - !(loc.MapGuideIIS7_U_RemoveViewer) - !(loc.MapGuideIIS7_U_RemoveMapAgent) - !(loc.MapGuideIIS7_U_RemoveMapGuide) - !(loc.MapGuideIIS7_U_DeleteAppPool) - !(loc.AspNetRegIIS) - !(loc.FdoRegArcSde) - !(loc.FdoRegSdf) - !(loc.FdoRegShp) - !(loc.FdoRegWfs) - !(loc.FdoRegWms) - !(loc.FdoRegOdbc) - !(loc.FdoRegMySql) - !(loc.FdoRegGdal) - !(loc.FdoRegOgr) - !(loc.FdoRegPostgreSql) - !(loc.FdoRegOracle) - !(loc.FdoRegSqlServer) - !(loc.FdoRegSlt) - !(loc.FdoUnRegArcSde) - !(loc.FdoUnRegSdf) - !(loc.FdoUnRegShp) - !(loc.FdoUnRegWfs) - !(loc.FdoUnRegWms) - !(loc.FdoUnRegOdbc) - !(loc.FdoUnRegMySql) - !(loc.FdoUnRegGdal) - !(loc.FdoUnRegOgr) - !(loc.FdoUnRegPostgreSql) - !(loc.FdoUnRegOracle) - !(loc.FdoUnRegSqlServer) - !(loc.FdoUnRegSlt) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -707,210 +628,198 @@ - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 + + + + - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - + + + + + - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 + + + + + + + + + + + + + + + - MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 + + + - MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 + + + - MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 + + + - MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 AND &WebExtDotNetViewerSampleFeature>2 - MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 AND &WebExtDotNetViewerSampleFeature>2 - MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 AND &WebExtDotNetViewerSampleFeature>2 + + + - MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 AND &WebExtDotNetDevGuideSamplesFeature>2 - MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 AND &WebExtDotNetDevGuideSamplesFeature>2 - MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 AND &WebExtDotNetDevGuideSamplesFeature>2 + + + - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 + + + - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - + + + + + - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 + + + + + + + + + + + + + + + - MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND IIS_API_TYPE="PHP" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 + + + - MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 - MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 + + + - MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 AND &WebExtMapViewerASPXFeature>2 - MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 AND &WebExtMapViewerASPXFeature>2 - MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 AND &WebExtMapViewerASPXFeature>2 + + + - MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 AND &WebExtDotNetViewerSampleFeature>2 - MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 AND &WebExtDotNetViewerSampleFeature>2 - MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 AND &WebExtDotNetViewerSampleFeature>2 + + + - MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 AND &WebExtDotNetDevGuideSamplesFeature>2 - MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 AND &WebExtDotNetDevGuideSamplesFeature>2 - MGWEB_CONFIG="IIS" AND IIS_API_TYPE="DOTNET" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature>2 AND &WebExtDotNetDevGuideSamplesFeature>2 + + + - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature=2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature=2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature=2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature=2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature=2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature=2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature=2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature=2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature=2 + + + + + + + + + - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature=2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature=2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature=2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature=2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature=2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature=2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature=2 - MGWEB_CONFIG="IIS" AND (NOT IISVERSIONMAJOR="#0") AND &WebExtensionsFeature=2 + + + + + + + + - &FdoArcSdeProviderFeature>2 - &FdoSdfProviderFeature>2 - &FdoShpProviderFeature>2 - &FdoWfsProviderFeature>2 - &FdoWmsProviderFeature>2 - &FdoOdbcProviderFeature>2 - &FdoMySqlProviderFeature>2 - &FdoGdalProviderFeature>2 - &FdoOgrProviderFeature>2 - &FdoPostgreSqlProviderFeature>2 - &FdoKingOracleProviderFeature>2 - &FdoSqlServerSpatialProviderFeature>2 - &FdoSltProviderFeature>2 + + + + + + + + + + + + + - &FdoArcSdeProviderFeature>2 - &FdoSdfProviderFeature>2 - &FdoShpProviderFeature>2 - &FdoWfsProviderFeature>2 - &FdoWmsProviderFeature>2 - &FdoOdbcProviderFeature>2 - &FdoMySqlProviderFeature>2 - &FdoGdalProviderFeature>2 - &FdoOgrProviderFeature>2 - &FdoPostgreSqlProviderFeature>2 - &FdoKingOracleProviderFeature>2 - &FdoSqlServerSpatialProviderFeature>2 - &FdoSltProviderFeature>2 + + + + + + + + + + + + + - &FdoArcSdeProviderFeature=2 - &FdoSdfProviderFeature=2 - &FdoShpProviderFeature=2 - &FdoWfsProviderFeature=2 - &FdoWmsProviderFeature=2 - &FdoOdbcProviderFeature=2 - &FdoMySqlProviderFeature=2 - &FdoGdalProviderFeature=2 - &FdoOgrProviderFeature=2 - &FdoPostgreSqlProviderFeature=2 - &FdoKingOracleProviderFeature=2 - &FdoSqlServerSpatialProviderFeature=2 - &FdoSltProviderFeature=2 + + + + + + + + + + + + + - &FdoArcSdeProviderFeature=2 - &FdoSdfProviderFeature=2 - &FdoShpProviderFeature=2 - &FdoWfsProviderFeature=2 - &FdoWmsProviderFeature=2 - &FdoOdbcProviderFeature=2 - &FdoMySqlProviderFeature=2 - &FdoGdalProviderFeature=2 - &FdoOgrProviderFeature=2 - &FdoPostgreSqlProviderFeature=2 - &FdoKingOracleProviderFeature=2 - &FdoSqlServerSpatialProviderFeature=2 - &FdoSltProviderFeature=2 + + + + + + + + + + + + + - &WebExtPhpFeature>2 AND &WebExtApacheFeature>2 - &WebExtPhpFeature>2 AND &WebExtApacheFeature>2 - &WebExtPhpFeature>2 - &WebExtPhpFeature>2 - MGWEB_CONFIG="APACHE" AND &WebExtApacheFeature>2 - MGWEB_CONFIG="APACHE" AND &WebExtApacheFeature>2 + + + + + + - &ServerFeature>2 - &ServerFeature=2 - MGWEB_CONFIG="APACHE" AND &WebExtApacheFeature=2 + + + - + + + + + + + + + + + + + + + + + + + + + Modified: sandbox/jng/installer_wix6/Libraries/CS Map/CS Map.wixproj =================================================================== --- sandbox/jng/installer_wix6/Libraries/CS Map/CS Map.wixproj 2026-03-14 17:20:40 UTC (rev 10207) +++ sandbox/jng/installer_wix6/Libraries/CS Map/CS Map.wixproj 2026-03-14 17:26:43 UTC (rev 10208) @@ -1,55 +1,28 @@ ? - + - Debug - x86 - 3.0 - {01313db9-2aaf-4791-9b81-69bce3194531} - 2.0 + Debug + x64 + false CS Map Library - $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets - SOFTWARE\OSGeo\MapGuide - $(MSBuildProjectDirectory)\..\..\..\MgDev\$(Configuration) + SOFTWARE\OSGeo\MapGuide + $(MSBuildProjectDirectory)\..\..\..\MgDev\$(Configuration) + $([System.String]::Copy('$(MgSource)').Replace('"', '')) - - bin\$(Configuration)\ - obj\$(Configuration)\ - Debug;MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform) - - - bin\$(Configuration)\ - obj\$(Configuration)\ - MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform) - - - Debug;MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform) + + Debug;MgRegKey=$(MgRegKey);MgSource=$(MgSourceSanitized);MgPlatform=$(Platform) bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ - - MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform) + + MgRegKey=$(MgRegKey);MgSource=$(MgSourceSanitized);MgPlatform=$(Platform) bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ - + - - - - - - - - \ No newline at end of file Modified: sandbox/jng/installer_wix6/Libraries/CS Map/CSMap.wxs =================================================================== --- sandbox/jng/installer_wix6/Libraries/CS Map/CSMap.wxs 2026-03-14 17:20:40 UTC (rev 10207) +++ sandbox/jng/installer_wix6/Libraries/CS Map/CSMap.wxs 2026-03-14 17:26:43 UTC (rev 10208) @@ -1,37 +1,25 @@ - - + - + - - + + - + - + + - - + + - - - + + + Added: sandbox/jng/installer_wix6/Libraries/CS Map/HarvestFiles.wxs =================================================================== --- sandbox/jng/installer_wix6/Libraries/CS Map/HarvestFiles.wxs (rev 0) +++ sandbox/jng/installer_wix6/Libraries/CS Map/HarvestFiles.wxs 2026-03-14 17:26:43 UTC (rev 10208) @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file Modified: sandbox/jng/installer_wix6/Libraries/CS Map/Lang/CSMap_en-US.wxl =================================================================== --- sandbox/jng/installer_wix6/Libraries/CS Map/Lang/CSMap_en-US.wxl 2026-03-14 17:20:40 UTC (rev 10207) +++ sandbox/jng/installer_wix6/Libraries/CS Map/Lang/CSMap_en-US.wxl 2026-03-14 17:26:43 UTC (rev 10208) @@ -1,5 +1,4 @@ - - - CS-Map - CS-Map Open Source is a required component for MapGuide Server and Web Extensions. +? + + \ No newline at end of file Modified: sandbox/jng/installer_wix6/Libraries/MapGuide Server/FDO.wxs =================================================================== --- sandbox/jng/installer_wix6/Libraries/MapGuide Server/FDO.wxs 2026-03-14 17:20:40 UTC (rev 10207) +++ sandbox/jng/installer_wix6/Libraries/MapGuide Server/FDO.wxs 2026-03-14 17:26:43 UTC (rev 10208) @@ -1,17 +1,23 @@ - - + - + - - + + - + + + + + + + + - + @@ -19,24 +25,24 @@ - + - + - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -52,41 +58,35 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - + - + - + - + @@ -106,43 +106,43 @@ - + - + - + - + - + - + - + - + - + @@ -153,32 +153,32 @@ - + - + - + - + - + - + @@ -185,8 +185,8 @@ - - + + @@ -193,11 +193,11 @@ - + - + Added: sandbox/jng/installer_wix6/Libraries/MapGuide Server/HarvestFiles.wxs =================================================================== --- sandbox/jng/installer_wix6/Libraries/MapGuide Server/HarvestFiles.wxs (rev 0) +++ sandbox/jng/installer_wix6/Libraries/MapGuide Server/HarvestFiles.wxs 2026-03-14 17:26:43 UTC (rev 10208) @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Modified: sandbox/jng/installer_wix6/Libraries/MapGuide Server/InstallService.wxs =================================================================== --- sandbox/jng/installer_wix6/Libraries/MapGuide Server/InstallService.wxs 2026-03-14 17:20:40 UTC (rev 10207) +++ sandbox/jng/installer_wix6/Libraries/MapGuide Server/InstallService.wxs 2026-03-14 17:26:43 UTC (rev 10208) @@ -1,5 +1,4 @@ - - +? - + - + Modified: sandbox/jng/installer_wix6/Libraries/MapGuide Server/Lang/MapGuideServer_en-US.wxl =================================================================== --- sandbox/jng/installer_wix6/Libraries/MapGuide Server/Lang/MapGuideServer_en-US.wxl 2026-03-14 17:20:40 UTC (rev 10207) +++ sandbox/jng/installer_wix6/Libraries/MapGuide Server/Lang/MapGuideServer_en-US.wxl 2026-03-14 17:26:43 UTC (rev 10208) @@ -1,51 +1,50 @@ - - - Server - MapGuide Server provides geographic analysis and rendering services. - Log Files - You may choose a location to place the server logfiles. - Packages - You may choose a location where the server will access Packages (*.mgp). - Repositories - You may choose a parent location for the server repositories. - Library - You may choose a location for the Library repository. - Session - You may choose a location for the Session repository. - Site - You may choose a location for the Site repository. - TileCache - You may choose a location for the Tile Cache repository. - Temp Directory - You may choose a location where MapGuide will store temporary files. +? + + + + + + + + + + + + + + + + + + - FDO (Feature Data Objects) allows abstract access to many different data sources. - ArcSDE Provider - Read/write access to an ESRI ArcSDE-based data store, using Oracle and SQL Server. (Requires external ArcSDE dlls) - GDAL Provider - FDO Raster Provider for GDAL - Oracle Provider - Read/write access to spatial and attribute data in an Oracle Spatial. (requires Oracle Instant Client libraries) - MySQL Provider - FDO Provider for MySQL (requires libmysql.dll) - ODBC Provider - FDO Provider for ODBC - OGR Provider - FDO Access to OGR Data Sources - PostGIS Provider - Read/write access to spatial and attribute data in a PostGIS database. (requires libpq.dll) - PostgreSQL/PostGIS Provider - Read/write access to PostgreSQL/PostGIS-based data store. Supports spatial data types and spatial query operations. - SDF Provider - Read/write access to Autodesk's spatial database format, a file-based personal geodatabase that supports multiple features/attributes, spatial indexing, and file-locking. - SHP Provider - Read/write access to spatial and attribute data in an ESRI SHP file. - SQLite Provider - The SQLite Provider - MS SQL Server Spatial Provider - Read/Write access to feature data in a MS SQL Server spatially enabled data store. Supports geospatial and non-geospatial data and schema. - WFS Provider - Read access to OGC WFS-based data store. - WMS Provider - Read access to OGC WMS-based data store. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Modified: sandbox/jng/installer_wix6/Libraries/MapGuide Server/MapGuide Server.wixproj =================================================================== --- sandbox/jng/installer_wix6/Libraries/MapGuide Server/MapGuide Server.wixproj 2026-03-14 17:20:40 UTC (rev 10207) +++ sandbox/jng/installer_wix6/Libraries/MapGuide Server/MapGuide Server.wixproj 2026-03-14 17:26:43 UTC (rev 10208) @@ -1,71 +1,37 @@ ? - + - Debug - x86 - 3.0 - {715e2d88-e822-4a9a-a5a2-dbb71cd9b320} - 2.0 + Debug + x64 + false MapGuideServer Library - $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets MapGuide Server - SOFTWARE\OSGeo\MapGuide - $(MSBuildProjectDirectory)\..\..\..\MgDev\$(Configuration) + SOFTWARE\OSGeo\MapGuide + $(MSBuildProjectDirectory)\..\..\..\MgDev\$(Configuration) + $([System.String]::Copy('$(MgSource)').Replace('"', '')) - - bin\$(Configuration)\ - obj\$(Configuration)\ - Debug;MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform);Have_ArcSde=$(Have_ArcSde) + + Debug;MgRegKey=$(MgRegKey);MgSource=$(MgSourceSanitized);MgPlatform=$(Platform);Have_ArcSde=$(Have_ArcSde) True - - - bin\$(Configuration)\ - obj\$(Configuration)\ - MgCulture=$(MgCulture);MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform);Have_ArcSde=$(Have_ArcSde) - - - Debug;MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform);Have_ArcSde=$(Have_ArcSde) - True bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ - - MgCulture=$(MgCulture);MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform);Have_ArcSde=$(Have_ArcSde) + + MgCulture=$(MgCulture);MgRegKey=$(MgRegKey);MgSource=$(MgSourceSanitized);MgPlatform=$(Platform);Have_ArcSde=$(Have_ArcSde) bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ - - - - - - + - - - - - - $(WixExtDir)\WixUtilExtension.dll - WixUtilExtension - + - - \ No newline at end of file Modified: sandbox/jng/installer_wix6/Libraries/MapGuide Server/MapGuideServer.wxs =================================================================== --- sandbox/jng/installer_wix6/Libraries/MapGuide Server/MapGuideServer.wxs 2026-03-14 17:20:40 UTC (rev 10207) +++ sandbox/jng/installer_wix6/Libraries/MapGuide Server/MapGuideServer.wxs 2026-03-14 17:26:43 UTC (rev 10208) @@ -1,230 +1,131 @@ - - + - + - - + + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + Modified: sandbox/jng/installer_wix6/Libraries/MapGuide Web Extensions/Apache.wxs =================================================================== --- sandbox/jng/installer_wix6/Libraries/MapGuide Web Extensions/Apache.wxs 2026-03-14 17:20:40 UTC (rev 10207) +++ sandbox/jng/installer_wix6/Libraries/MapGuide Web Extensions/Apache.wxs 2026-03-14 17:26:43 UTC (rev 10208) @@ -1,5 +1,4 @@ - - +? - + - + - - - - - - + + + + + + @@ -11,121 +8,98 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -206,44 +168,36 @@ --> - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + \ No newline at end of file Modified: sandbox/jng/installer_wix6/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_en-US.wxl =================================================================== --- sandbox/jng/installer_wix6/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_en-US.wxl 2026-03-14 17:20:40 UTC (rev 10207) +++ sandbox/jng/installer_wix6/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_en-US.wxl 2026-03-14 17:26:43 UTC (rev 10208) @@ -1,68 +1,67 @@ - - - Web - MapGuide Web provides the components needed to serve MapGuide resources over the internet. - Apache - A bundled version of Apache with MapGuide enabled, running on port [APACHE_PORT]. - PHP - A bundled version of PHP with MapGuide enabled. - Tomcat - A bundled version of Tomcat with MapGuide enabled. - Development HTTP Server - A simple development HTTP server to easily spin up a mapagent or static HTML/JS content for development/testing without IIS or Apache - API Help - Web Extension API documentation - Map Viewer files - The support files for the map viewer, language independent. - PHP Viewer - The PHP version of the map viewer. - JSP Viewer - The JSP version of the map viewer. - .NET Viewer - The .NET version of the map viewer. - Samples - Sample code and data - Developer's Guide Sample Code (PHP) - PHP sample code from the MapGuide Developer's Guide. This requires the Sheboygan sample data. - Developer's Guide Sample Code (Java) - Java sample code from the MapGuide Developer's Guide. This requires the Sheboygan sample data. - Developer's Guide Sample Code (.net) - .net sample code from the MapGuide Developer's Guide. This requires the Sheboygan sample data. - Viewer Sample (PHP) - Viewer Sample code (PHP) - Viewer Sample (Java) - Viewer Sample code (Java) - Viewer Sample (.net) - Viewer Sample code (.net) - OpenLayers Samples - Samples demonstrating OpenLayers integration with MapGuide - Localization Files - Localization files for the web tier - Fusion - Fusion is a web-mapping application framework, allowing non-spatial web developers to build rich mapping applications quickly and easily - Site Administrator - The MapGuide Site Administrator is a web-based administrative front-end for the MapGuide Server - Map Agent - The map agent allows client applications to communicate with MapGuide over HTTP - Schema Report - The schema report allows the user to describe and preview MapGuide feature sources - Standard Icons - Icons for the AJAX viewer - Temp Directory - You may choose a location where MapGuide will store temporary files. - mapagent test pages - mapagent test harness web pages and scripts +? + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - MapGuide Developer's Guide - Web API Documentation - MapGuide Samples - Autodesk WikiHelp - Viewer API Documentation - Fusion API Documentation - MapGuide Site Administrator - MapAgent Test Pages - Get MapGuide Maestro - MapGuide Project Home - MapGuide Trac - Start MapGuide Development HTTP Server + + + + + + + + + + + + \ No newline at end of file Modified: sandbox/jng/installer_wix6/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj =================================================================== --- sandbox/jng/installer_wix6/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj 2026-03-14 17:20:40 UTC (rev 10207) +++ sandbox/jng/installer_wix6/Libraries/MapGuide Web Extensions/MapGuide Web Extensions.wixproj 2026-03-14 17:26:43 UTC (rev 10208) @@ -1,95 +1,38 @@ ? - + - Debug - x86 - 3.0 - {d41d53c4-433e-47b5-b663-e79b5569ee22} - 2.0 + Debug + x64 + false MapGuide Web Extensions Library - $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets - SOFTWARE\OSGeo\MapGuide - $(MSBuildProjectDirectory)\..\..\..\MgDev\$(Configuration) + SOFTWARE\OSGeo\MapGuide + $(MSBuildProjectDirectory)\..\..\..\MgDev\$(Configuration) + $([System.String]::Copy('$(MgSource)').Replace('"', '')) - - bin\$(Configuration)\ - obj\$(Configuration)\ - Debug;MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform) - - - bin\$(Configuration)\ - obj\$(Configuration)\ - MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform) - - - Debug;MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform) + + Debug;MgRegKey=$(MgRegKey);MgSource=$(MgSourceSanitized);MgPlatform=$(Platform) bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ - - MgRegKey=$(MgRegKey);MgSource=$(MgSource);MgPlatform=$(MgPlatform) + + MgRegKey=$(MgRegKey);MgSource=$(MgSourceSanitized);MgPlatform=$(Platform) bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - $(WixExtDir)\WixUtilExtension.dll - WixUtilExtension - - - $(WixExtDir)\WixNetFxExtension.dll - WixNetFxExtension - - - $(WixExtDir)\WixIIsExtension.dll - WixIIsExtension - + + + - - \ No newline at end of file Modified: sandbox/jng/installer_wix6/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs =================================================================== --- sandbox/jng/installer_wix6/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs 2026-03-14 17:20:40 UTC (rev 10207) +++ sandbox/jng/installer_wix6/Libraries/MapGuide Web Extensions/MapGuideWebExtensions.wxs 2026-03-14 17:26:43 UTC (rev 10208) @@ -1,47 +1,27 @@ - - + - + - - + + - + - - - + + + - + - - - + + + - - + + @@ -50,15 +30,17 @@ - + - + + + - + - - + + + + + - + @@ -97,7 +75,7 @@ - + @@ -105,54 +83,18 @@ - + - - - - - - - - - + + + + + + + + + @@ -160,56 +102,56 @@ - - - - - - - - - + + + + + + + + + - - + + - - + + - - + + - - - + + + - - - - - - - - + + + + + + + + - - + + - - + + - - - + + + - - + + - + - + @@ -235,25 +177,26 @@ - + - - + + - + - + - + - + + Modified: sandbox/jng/installer_wix6/Libraries/MapGuide Web Extensions/Shortcuts.wxs =================================================================== --- sandbox/jng/installer_wix6/Libraries/MapGuide Web Extensions/Shortcuts.wxs 2026-03-14 17:20:40 UTC (rev 10207) +++ sandbox/jng/installer_wix6/Libraries/MapGuide Web Extensions/Shortcuts.wxs 2026-03-14 17:26:43 UTC (rev 10208) @@ -1,262 +1,147 @@ - - + - + - - + + - + - + - + - + - - MGWEB_CONFIG="APACHE" + + - + - + - - MGWEB_CONFIG="APACHE" + + - + - + - - MGWEB_CONFIG="APACHE" + + - + - + - - MGWEB_CONFIG="APACHE" + + - + - + - - MGWEB_CONFIG="APACHE" - - + + + + - + - - MGWEB_CONFIG="APACHE" - + + + - + - - MGWEB_CONFIG="APACHE" - + + + - + - - MGWEB_CONFIG="IIS" + + - + - + - - MGWEB_CONFIG="IIS" + + - + - + - - MGWEB_CONFIG="IIS" + + - + - + - - MGWEB_CONFIG="IIS" + + - + - + - - MGWEB_CONFIG="IIS" - + + + - + - - MGWEB_CONFIG="IIS" - - + + + + - + - - MGWEB_CONFIG="IIS" - + + + - + - - - - + + + - + - - - + + + - + - + \ No newline at end of file Modified: sandbox/jng/installer_wix6/build.bat =================================================================== --- sandbox/jng/installer_wix6/build.bat 2026-03-14 17:20:40 UTC (rev 10207) +++ sandbox/jng/installer_wix6/build.bat 2026-03-14 17:26:43 UTC (rev 10208) @@ -8,8 +8,8 @@ rem value of INSTALLER_OUTPUT defined in this file rem rem Requirements: -rem 1. Wix 3.5 (http://wix.codeplex.com) -rem 2. Paraffin (http://www.wintellect.com/CS/blogs/jrobbins/archive/2008/12/22/paraffin-3-0-now-with-full-wix-3-0-support.aspx) +rem 1. WiX Toolset 6.0.2 SDK (restored through SDK-style .wixproj) +rem 2. Staged MapGuide output under ..\MgDev\ rem rem Usage: rem @@ -23,7 +23,7 @@ rem [-name=MapGuideInstallerFilename] rem [-title=MapGuideInstallerTitle] rem -rem Action: build(default), clean, prepare, generate (only use generate when creating new GIDs) +rem Action: build(default), clean, prepare, generate (generate is a no-op) rem SourceDirectory: The directory that was used for MapGuide build output rem MapGuideVersion: The version associated with the installer in the format 2.1.0.0 rem MapGuideInstallerFilename: File name of output .exe in the format MapGuideOpenSource-2.1.0-Something @@ -38,6 +38,8 @@ rem Command Line Option Defaults rem ================================================== +SET TYPEBUILD=Release +SET PLATFORM_CLR=x64 SET TYPEACTION=build SET CULTURE=en-US SET INSTALLER_VERSION_MAJOR_MINOR=4.0 @@ -74,8 +76,7 @@ SET INSTALLER_DEV_INSTALLER=%INSTALLER_DEV%\Installers\MapGuide SET NSIS=%CD%\Support\NSIS -SET PARAFFIN=%CD% -SET PATH=%PATH%;%PARAFFIN%;%NSIS%;%WIX%\bin\;%CD%\..\MgDev\BuildTools\WebTools\7-Zip +SET PATH=%PATH%;%NSIS%;%CD%\..\MgDev\BuildTools\WebTools\7-Zip rem ================================================== rem Web dependencies @@ -101,6 +102,9 @@ if "%1"=="-lang" goto get_language +if "%1"=="-build" goto get_typebuild +if "%1"=="-platform" goto get_platform + if "%1"=="-source" goto get_source if "%1"=="-version" goto get_version @@ -114,6 +118,20 @@ shift goto study_params +:get_typebuild +SET TYPEBUILD=%2 +SET INSTALLER_NAME=MapGuideOpenSource-%INSTALLER_VERSION_MAJOR_MINOR_REV%-Trunk-%CULTURE%-%TYPEBUILD%-%PLATFORM_CLR% +SET INSTALLER_TITLE="MapGuide Open Source %INSTALLER_VERSION_MAJOR_MINOR% Trunk (%TYPEBUILD%)" +SET MG_SOURCE=%CD%\..\MgDev\%TYPEBUILD% +SET MG_SOURCE_INC=%MG_SOURCE% +goto next_param + +:get_platform +SET PLATFORM_CLR=%2 +SET INSTALLER_NAME=MapGuideOpenSource-%INSTALLER_VERSION_MAJOR_MINOR_REV%-Trunk-%CULTURE%-%TYPEBUILD%-%PLATFORM_CLR% +SET PHP_TS_PACKAGE=php-%PHP_VERSION%-nts-Win32-vs16-%PLATFORM_CLR%.zip +goto next_param + :get_language SET CULTURE=%2 SET INSTALLER_OUTPUT=%INSTALLER_DEV%\Output\%CULTURE% @@ -158,6 +176,8 @@ echo Bundling ArcSDE Provider: %MG_WITH_ARCSDE% echo =================================================== +if /I not "%PLATFORM_CLR%"=="x64" goto error_x64_only + if "%TYPEACTION%"=="build" goto build if "%TYPEACTION%"=="prepare" goto prepare if "%TYPEACTION%"=="clean" goto clean @@ -165,9 +185,9 @@ :clean echo [clean]: Installer Pre-Reqs -%MSBUILD_CLEAN% InstallerPreReq.sln +%MSBUILD_CLEAN% InstallerPreReq.sln /p:Platform=x64 echo [clean]: Installer -%MSBUILD_CLEAN_CLR% InstallerWix.sln +%MSBUILD_CLEAN_CLR% InstallerWix.sln /p:Platform=x64 goto quit :prepare @@ -176,7 +196,7 @@ if not exist "%MG_SOURCE%\Web" goto error_mg_web_not_found if not exist "%MG_SOURCE%\CS-Map" goto error_mg_csmap_not_found echo [prepare] Installer Pre-Requisites -%MSBUILD% InstallerPreReq.sln +%MSBUILD% InstallerPreReq.sln /p:Platform=x64 copy %INSTALLER_FDO_REG_UTIL%\%TYPEBUILD%\FdoRegUtil.exe %MG_SOURCE%\Server\FDO popd echo [prepare] Unpack Apache httpd @@ -226,99 +246,12 @@ :generate echo [generate]: MapGuide Installer +echo [generate]: No-op. WiX-native harvesting is now defined in HarvestFiles.wxs. -SET PARAFFIN=paraffin.exe -guids -IF "%PLATFORM_CLR%" == "x64" SET PARAFFIN=paraffin.exe -Win64 -guids - -SET WIX_INC_SERVER="%INSTALLER_DEV%\Libraries\MapGuide Server\FileIncludes" -SET WIX_INC_WEB="%INSTALLER_DEV%\Libraries\MapGuide Web Extensions\FileIncludes" -SET WIX_INC_CSMAP="%INSTALLER_DEV%\Libraries\CS Map\FileIncludes" - -echo [generate]: Server - binaries -%PARAFFIN% -dir %MG_SOURCE%\Server\bin -alias $(var.MgSource)\Server\bin -custom SRVBINFILES -dirref SERVERROOTLOCATION -norecurse %WIX_INC_SERVER%\incBinFiles.wxs - -echo [generate]: Server - RepositoryAdmin -%PARAFFIN% -dir %MG_SOURCE%\Server\RepositoryAdmin -alias $(var.MgSource)\Server\RepositoryAdmin -custom SRVREPADMINFILES -dirref SERVERROOTLOCATION %WIX_INC_SERVER%\incRepositoryAdminFiles.wxs - -echo [generate]: Server - resources -%PARAFFIN% -dir %MG_SOURCE%\Server\Resources -alias $(var.MgSource)\Server\Resources -custom SRVRESOURCESFILES -dirref SERVERROOTLOCATION %WIX_INC_SERVER%\incResourcesFiles.wxs - -echo [generate]: Server - schema -%PARAFFIN% -dir %MG_SOURCE%\Server\Schema -alias $(var.MgSource)\Server\Schema -custom SRVSCHEMAFILES -dirref SERVERROOTLOCATION %WIX_INC_SERVER%\incSchemaFiles.wxs - -echo [generate]: Server - WMS -%PARAFFIN% -dir %MG_SOURCE%\Server\wms -alias $(var.MgSource)\Server\wms -custom SRVWMSFILES -dirref SERVERROOTLOCATION -norecurse %WIX_INC_SERVER%\incWmsFiles.wxs - -echo [generate]: Server - WFS -%PARAFFIN% -dir %MG_SOURCE%\Server\wfs -alias $(var.MgSource)\Server\wfs -custom SRVWFSFILES -dirref SERVERROOTLOCATION -norecurse %WIX_INC_SERVER%\incWfsFiles.wxs - -echo [generate]: CS-Map - dictionaries -%PARAFFIN% -dir %MG_SOURCE%\CS-Map\Dictionaries -alias $(var.MgSource)\CS-Map\Dictionaries -custom CSMAPDICTFILES -dirref CSMAPLOCATION -ext ASC -ext C -ext CNT -ext GID -ext HLP -ext MAK -ext NMK -ext VCPROJ -ext USER %WIX_INC_CSMAP%\incCSMapDictionaryFiles.wxs - -echo [generate]: Web - Apache -%PARAFFIN% -dir %MG_SOURCE%\Web\Apache24 -alias $(var.MgSource)\Web\Apache24 -custom APACHEFILES -dirref WEBEXTENSIONSLOCATION -dirExclude .svn %WIX_INC_WEB%\incApacheFiles.wxs - -echo [generate]: Web - Php TS -%PARAFFIN% -dir %MG_SOURCE%\Web\Php -alias $(var.MgSource)\Web\Php -custom PHPFILES -dirref WEBEXTENSIONSLOCATION %WIX_INC_WEB%\incPhpFiles.wxs - -echo [generate]: Web - Tomcat -%PARAFFIN% -dir %MG_SOURCE%\Web\Tomcat -alias $(var.MgSource)\Web\Tomcat -custom TOMCATFILES -dirref WEBEXTENSIONSLOCATION %WIX_INC_WEB%\incTomcatFiles.wxs - -echo [generate]: Web - DevHttpServer -%PARAFFIN% -dir %MG_SOURCE%\Web\DevHttpServer -alias $(var.MgSource)\Web\DevHttpServer -custom DEVHTTPSERVER -dirref WEBEXTENSIONSLOCATION %WIX_INC_WEB%\incDevHttpServerFiles.wxs - -echo [generate]: Web - Help -%PARAFFIN% -dir %MG_SOURCE%\Web\www\help -alias $(var.MgSource)\Web\www\help -custom HELPFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incHelpFiles.wxs - -echo [generate]: Web - Developer's Guide Samples (PHP) -%PARAFFIN% -dir %MG_SOURCE%\Web\www\phpsamples -alias $(var.MgSource)\Web\www\phpsamples -custom PHPDEVGUIDEFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incPhpDevGuideFiles.wxs - -echo [generate]: Web - Developer's Guide Samples (Java) -%PARAFFIN% -dir %MG_SOURCE%\Web\www\javasamples -alias $(var.MgSource)\Web\www\javasamples -custom JAVADEVGUIDEFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incJavaDevGuideFiles.wxs - -echo [generate]: Web - Developer's Guide Samples (DotNet) -%PARAFFIN% -dir %MG_SOURCE%\Web\www\dotnetsamples -alias $(var.MgSource)\Web\www\dotnetsamples -custom DOTNETDEVGUIDEFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incDotNetDevGuideFiles.wxs - -echo [generate]: Web - Developer's Guide Samples (PHP) -%PARAFFIN% -dir %MG_SOURCE%\Web\www\phpviewersample -alias $(var.MgSource)\Web\www\phpviewersample -custom PHPVIEWERSAMPLEFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incPhpViewerSampleFiles.wxs - -echo [generate]: Web - Developer's Guide Samples (Java) -%PARAFFIN% -dir %MG_SOURCE%\Web\www\javaviewersample -alias $(var.MgSource)\Web\www\javaviewersample -custom JAVAVIEWERSAMPLEFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incJavaViewerSampleFiles.wxs - -echo [generate]: Web - Developer's Guide Samples (DotNet) -%PARAFFIN% -dir %MG_SOURCE%\Web\www\dotnetviewersample -alias $(var.MgSource)\Web\www\dotnetviewersample -custom DOTNETVIEWERSAMPLEFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incDotNetViewerSampleFiles.wxs - -echo [generate]: Web - OpenLayers Samples -%PARAFFIN% -dir %MG_SOURCE%\Web\www\clientsamples -alias $(var.MgSource)\Web\www\clientsamples -custom OPENLAYERSSAMPLEFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incOpenLayersSampleFiles.wxs - -echo [generate]: Web - mapagent -%PARAFFIN% -dir %MG_SOURCE%\Web\www\mapagent -alias $(var.MgSource)\Web\www\mapagent -custom MAPAGENTFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incMapAgentFiles.wxs - -echo [generate]: Web - mapviewernet -%PARAFFIN% -dir %MG_SOURCE%\Web\www\mapviewernet -alias $(var.MgSource)\Web\www\mapviewernet -custom MAPVIEWERASPXFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incMapViewerAspxFiles.wxs - -echo [generate]: Web - mapviewerphp -%PARAFFIN% -dir %MG_SOURCE%\Web\www\mapviewerphp -alias $(var.MgSource)\Web\www\mapviewerphp -custom MAPVIEWERPHPFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incMapViewerPhpFiles.wxs - -echo [generate]: Web - mapviewerjava -%PARAFFIN% -dir %MG_SOURCE%\Web\www\mapviewerjava -alias $(var.MgSource)\Web\www\mapviewerjava -custom MAPVIEWERJSPFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incMapViewerJspFiles.wxs - -echo [generate]: Web - fusion -%PARAFFIN% -dir %MG_SOURCE%\Web\www\fusion -alias $(var.MgSource)\Web\www\fusion -custom FUSIONFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incFusionFiles.wxs - -echo [generate]: Web - misc web root -%PARAFFIN% -dir %MG_SOURCE%\Web\www -alias $(var.MgSource)\Web\www -custom WEBROOTFILES -dirref WEBEXTENSIONSLOCATION -norecurse %WIX_INC_WEB%\incWebRootFiles.wxs -%PARAFFIN% -dir %MG_SOURCE%\Web\www\viewerfiles -alias $(var.MgSource)\Web\www\viewerfiles -custom MAPVIEWERFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incMapViewerFiles.wxs -%PARAFFIN% -dir %MG_SOURCE%\Web\www\stdicons -alias $(var.MgSource)\Web\www\stdicons -custom MAPVIEWERSTDICONFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incMapViewerStdiconFiles.wxs -%PARAFFIN% -dir %MG_SOURCE%\Web\www\schemareport -alias $(var.MgSource)\Web\www\schemareport -custom MAPVIEWERSCHEMAREPORTFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incMapViewerSchemareportFiles.wxs -%PARAFFIN% -dir %MG_SOURCE%\Web\www\mapadmin -alias $(var.MgSource)\Web\www\mapadmin -custom MAPVIEWERMAPADMINFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incMapViewerMapAdminFiles.wxs -%PARAFFIN% -dir %MG_SOURCE%\Web\www\localized -alias $(var.MgSource)\Web\www\localized -custom MAPVIEWERLOCALIZEDFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incMapViewerLocalizedFiles.wxs -%PARAFFIN% -dir %MG_SOURCE%\Web\www\WEB-INF -alias $(var.MgSource)\Web\www\WEB-INF -custom WEBINFFILES -dirref WEBROOTLOCATION %WIX_INC_WEB%\incWebInfFiles.wxs - goto quit :build -SET RUN_BUILD=%MSBUILD% /p:OutputName=%INSTALLER_NAME%;MgCulture=%CULTURE%;MgTitle=%INSTALLER_TITLE%;MgVersion=%INSTALLER_VERSION%;MgRegKey=%MG_REG_KEY%;MgPlatform=%PLATFORM_CLR%;Have_ArcSde=%MG_WITH_ARCSDE% +SET RUN_BUILD=%MSBUILD% /restore /p:Platform=x64;OutputName=%INSTALLER_NAME%;MgCulture=%CULTURE%;MgTitle=%INSTALLER_TITLE%;MgVersion=%INSTALLER_VERSION%;MgRegKey=%MG_REG_KEY%;MgPlatform=%PLATFORM_CLR%;Have_ArcSde=%MG_WITH_ARCSDE% if not ""=="%MG_SOURCE_INC%" set RUN_BUILD=%RUN_BUILD%;MgSource=%MG_SOURCE_INC% echo [build]: Installer @@ -363,6 +296,10 @@ echo [ERROR]: Could not find CS-Map directory at %MG_SOURCE%\CS-Map exit /B 1 +:error_x64_only +echo [ERROR]: x86/Win32 installer builds are no longer supported. Please use x64 build environment. +exit /B 1 + :error echo [ERROR]: There was an error building the component exit /B 1 @@ -380,6 +317,8 @@ echo ************************************************************************ echo build.bat [-h] echo [-a=Action] +echo [-build=TypeBuild] +echo [-platform=PlatformCLR] echo [-lang=Culture] echo [-source=SourceDirectory] echo [-version=MapGuideVersion] @@ -387,7 +326,9 @@ echo [-title=MapGuideInstallerTitle] echo echo Help: -h -echo Action: build(default), clean, prepare, generate (only use generate for creating new GIDs, or if not installing from ..\MgDev\Release) +echo Action: build(default), clean, prepare, generate (generate is now a no-op) +echo TypeBuild: Release(default) or Debug +echo PlatformCLR: x64(default) echo SourceDirectory: The directory that the MapGuide build process installed the source files into echo MapGuideVersion: The version associated with the installer in the format 2.1.0.0 echo MapGuideInstallerFilename: File name of output .exe in the format MapGuideOpenSource-2.1.0-Something (such as Beta, RC1, Final, etc)