[mapguide-commits] r9975 - in trunk/MgDev: . Bindings Bindings/src/Bindings Bindings/src/Bindings/DotNet/Web Oem Portable Portable/MgPortable Web/src

Mon Oct 10 03:22:05 PDT 2022

Author: jng
Date: 2022-10-10 03:22:05 -0700 (Mon, 10 Oct 2022)
New Revision: 9975

Removed:
   trunk/MgDev/base_package_excludes.txt
   trunk/MgDev/build_desktop.bat
   trunk/MgDev/build_sdk.bat
   trunk/MgDev/csmap_excludes.txt
   trunk/MgDev/debug64_excludes.txt
   trunk/MgDev/debug_excludes.txt
   trunk/MgDev/desktop_package_excludes.txt
   trunk/MgDev/dll_excludes.txt
   trunk/MgDev/dotnet_excludes.txt
   trunk/MgDev/dotnetapi_excludes.txt
   trunk/MgDev/dotnetxml_excludes.txt
   trunk/MgDev/java_excludes.txt
   trunk/MgDev/mapagent_excludes.txt
   trunk/MgDev/nuget_pack.bat
   trunk/MgDev/nuget_prepare.bat
   trunk/MgDev/package_excludes.txt
   trunk/MgDev/pdb_excludes.txt
   trunk/MgDev/php_excludes.txt
   trunk/MgDev/release64_excludes.txt
   trunk/MgDev/release_excludes.txt
   trunk/MgDev/setenvironment.bat
   trunk/MgDev/svn_excludes.txt
   trunk/MgDev/viewer_package_excludes.txt
Modified:
   trunk/MgDev/
   trunk/MgDev/Bindings/TODO.txt
   trunk/MgDev/Bindings/src/Bindings/Bindings.sln
   trunk/MgDev/Bindings/src/Bindings/DotNet/Web/WebApi.vcxproj
   trunk/MgDev/Oem/oem.sln
   trunk/MgDev/Portable/
   trunk/MgDev/Portable/MgPortable/changelog.txt
   trunk/MgDev/Web/src/WebTier.sln
   trunk/MgDev/build.bat
   trunk/MgDev/setenvironment64.bat
Log:
Merged revision(s) 9815-9823 from sandbox/jng/vanilla_swig:
Fix false find/replace
........
Remove PostBuild from WebTier.sln. Actual files will be removed later.
........
Momentarily remove PhpApi from Bindings.sln so that we can get a full command-line build working first. Then we can re-instate it.
........
Add top-level commands to build.bat to build bindings and mg-portable. Remove setenvironment.bat as we now only support 64-bit builds
........
Copy jsoncpp library from its Oem location, not web's output dir
........
Remove old IMake from oem.sln
........
Remove obsolete nuget scripts
........
Remove obsolete build scripts
........
- Remove xcopy exclusion files (we'll replace this with a dedicate cleanup script)
- Update setenvironment64.bat to streamline and remove unused settings

........


Index: trunk/MgDev
===================================================================

--- trunk/MgDev	2022-10-10 10:10:45 UTC (rev 9974)
+++ trunk/MgDev	2022-10-10 10:22:05 UTC (rev 9975)

Property changes on: trunk/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
## -41,6 +41,6 ##
 /sandbox/jng/utfgrid:9179-9212
 /sandbox/jng/v30:8212-8227
 /sandbox/jng/v4:9511-9519
-/sandbox/jng/vanilla_swig:9757-9814
+/sandbox/jng/vanilla_swig:9757-9823
 /sandbox/jng/wfs_hits:9569-9577
 /sandbox/rfc94:5099-5163
\ No newline at end of property
Modified: trunk/MgDev/Bindings/TODO.txt
===================================================================
--- trunk/MgDev/Bindings/TODO.txt	2022-10-10 10:10:45 UTC (rev 9974)
+++ trunk/MgDev/Bindings/TODO.txt	2022-10-10 10:22:05 UTC (rev 9975)
@@ -8,6 +8,7 @@
  - [x] Consolidate Tools.sln into Bindings.sln
  - [ ] Relocate/remove existing test code
  - [x] Move packages dir up to to top-level MgDev subdirectory and make sure nuget.config sources from this dir
+ - [ ] Update build batch files to build bindings/portable
  - Split .net binding into the Foundation/Geometry/PlatformBase/MapGuideCommon/Web layout (https://github.com/jumpinjackie/mapguide-api-bindings/issues/18)
    - [x] Add .targets files to each C# project so that native dlls are copied properly when consumed by legacy .net framework applications/libraries
    - [x] Consolidate TestCommon and TestMapGuideApi .net projects to unified netstandard2.0 libraries

Modified: trunk/MgDev/Bindings/src/Bindings/Bindings.sln
===================================================================
--- trunk/MgDev/Bindings/src/Bindings/Bindings.sln	2022-10-10 10:10:45 UTC (rev 9974)
+++ trunk/MgDev/Bindings/src/Bindings/Bindings.sln	2022-10-10 10:22:05 UTC (rev 9975)
@@ -25,11 +25,6 @@
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PHP API", "PHP API", "{323AEA7C-774B-49D8-8D34-7A766288C549}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PhpApi", "Php\PhpApi.vcxproj", "{696D2664-D17F-4357-8A19-2B5DC4B29962}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B601F04C-0D42-4AFC-A092-B31185E2EA8C} = {B601F04C-0D42-4AFC-A092-B31185E2EA8C}
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Java API", "Java API", "{664329B8-67BD-4D38-AE4B-A2920B038C09}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaApi", "Java\JavaApi.vcxproj", "{C02F44CB-D916-428D-A1A5-04E225A2A4EC}"
@@ -170,14 +165,6 @@
 		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x64.Build.0 = Release|x64
 		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x64.Deploy.0 = Release|x64
 		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x86.ActiveCfg = Release|x64
-		{696D2664-D17F-4357-8A19-2B5DC4B29962}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{696D2664-D17F-4357-8A19-2B5DC4B29962}.Debug|x64.ActiveCfg = Debug|x64
-		{696D2664-D17F-4357-8A19-2B5DC4B29962}.Debug|x64.Build.0 = Debug|x64
-		{696D2664-D17F-4357-8A19-2B5DC4B29962}.Debug|x86.ActiveCfg = Debug|x64
-		{696D2664-D17F-4357-8A19-2B5DC4B29962}.Release|Any CPU.ActiveCfg = Release|x64
-		{696D2664-D17F-4357-8A19-2B5DC4B29962}.Release|x64.ActiveCfg = Release|x64
-		{696D2664-D17F-4357-8A19-2B5DC4B29962}.Release|x64.Build.0 = Release|x64
-		{696D2664-D17F-4357-8A19-2B5DC4B29962}.Release|x86.ActiveCfg = Release|x64
 		{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Debug|x64.ActiveCfg = Debug|x64
 		{C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Debug|x64.Build.0 = Debug|x64
@@ -465,7 +452,6 @@
 	GlobalSection(NestedProjects) = preSolution
 		{FDC09E9D-72BB-4C74-B88B-727D9D1D6C4E} = {59509894-F4A9-4C44-8B39-8B5115384DD0}
 		{B601F04C-0D42-4AFC-A092-B31185E2EA8C} = {99132700-5CAD-4540-9939-7502C1A448EA}
-		{696D2664-D17F-4357-8A19-2B5DC4B29962} = {323AEA7C-774B-49D8-8D34-7A766288C549}
 		{C02F44CB-D916-428D-A1A5-04E225A2A4EC} = {664329B8-67BD-4D38-AE4B-A2920B038C09}
 		{4A3F2DA2-F53F-48EE-9505-8285F3E089D4} = {59509894-F4A9-4C44-8B39-8B5115384DD0}
 		{59509894-F4A9-4C44-8B39-8B5115384DD0} = {A9257857-9844-4CEA-AF02-A7D8AB8F46AB}

Modified: trunk/MgDev/Bindings/src/Bindings/DotNet/Web/WebApi.vcxproj
===================================================================
--- trunk/MgDev/Bindings/src/Bindings/DotNet/Web/WebApi.vcxproj	2022-10-10 10:10:45 UTC (rev 9974)
+++ trunk/MgDev/Bindings/src/Bindings/DotNet/Web/WebApi.vcxproj	2022-10-10 10:22:05 UTC (rev 9975)
@@ -65,7 +65,8 @@
 copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgHttpHandler*.*" "$(TargetDir)\native\"
 copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgWebApp*.*" "$(TargetDir)\native\"
 copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgWebSupport*.*" "$(TargetDir)\native\"
-copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\lib_json*.*" "$(TargetDir)\native\"
+copy /Y "$(ProjectDir)..\..\..\..\..\Oem\jsoncpp\lib64\$(Configuration)\lib_json.dll" "$(TargetDir)\native\"
+copy /Y "$(ProjectDir)..\..\..\..\..\Oem\jsoncpp\lib64\$(Configuration)\lib_json.pdb" "$(TargetDir)\native\"
 </Command>
     </PreBuildEvent>
     <ClCompile>
@@ -106,7 +107,8 @@
 copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgHttpHandler*.*" "$(TargetDir)\native\"
 copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgWebApp*.*" "$(TargetDir)\native\"
 copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgWebSupport*.*" "$(TargetDir)\native\"
-copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\lib_json*.*" "$(TargetDir)\native\"
+copy /Y "$(ProjectDir)..\..\..\..\..\Oem\jsoncpp\lib64\$(Configuration)\lib_json.dll" "$(TargetDir)\native\"
+copy /Y "$(ProjectDir)..\..\..\..\..\Oem\jsoncpp\lib64\$(Configuration)\lib_json.pdb" "$(TargetDir)\native\"
 </Command>
     </PreBuildEvent>
     <ClCompile>

Modified: trunk/MgDev/Oem/oem.sln
===================================================================
--- trunk/MgDev/Oem/oem.sln	2022-10-10 10:10:45 UTC (rev 9974)
+++ trunk/MgDev/Oem/oem.sln	2022-10-10 10:22:05 UTC (rev 9975)
@@ -72,8 +72,6 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DWF W3D Toolkit", "DWFTK\develop\global\build\VC 14.0\W3DToolkit\W3DToolkit.vcxproj", "{9415DE9A-E01E-47C1-A159-EB1E1D4E518C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IMake", "..\BuildTools\WebTools\IMake\IMake.vcxproj", "{B601F04C-0D42-4AFC-A092-B31185E2EA8C}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "zlib_minizip\win\minizip.vcxproj", "{DB542A13-DE6E-3E82-BA87-7AE2885324B1}"
 EndProject
 Global
@@ -316,14 +314,6 @@
 		{9415DE9A-E01E-47C1-A159-EB1E1D4E518C}.Release|Win32.Build.0 = Release (Read-Write WChar LIB)|Win32
 		{9415DE9A-E01E-47C1-A159-EB1E1D4E518C}.Release|x64.ActiveCfg = Release (Read-Write WChar LIB)|x64
 		{9415DE9A-E01E-47C1-A159-EB1E1D4E518C}.Release|x64.Build.0 = Release (Read-Write WChar LIB)|x64
-		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|Win32.Build.0 = Debug|Win32
-		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|x64.ActiveCfg = Debug|x64
-		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|x64.Build.0 = Debug|x64
-		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|Win32.ActiveCfg = Release|Win32
-		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|Win32.Build.0 = Release|Win32
-		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x64.ActiveCfg = Release|x64
-		{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x64.Build.0 = Release|x64
 		{DB542A13-DE6E-3E82-BA87-7AE2885324B1}.Debug|Win32.ActiveCfg = Debug|Win32
 		{DB542A13-DE6E-3E82-BA87-7AE2885324B1}.Debug|Win32.Build.0 = Debug|Win32
 		{DB542A13-DE6E-3E82-BA87-7AE2885324B1}.Debug|x64.ActiveCfg = Debug|x64

Index: trunk/MgDev/Portable
===================================================================
--- trunk/MgDev/Portable	2022-10-10 10:10:45 UTC (rev 9974)
+++ trunk/MgDev/Portable	2022-10-10 10:22:05 UTC (rev 9975)

Property changes on: trunk/MgDev/Portable
___________________________________________________________________
Modified: svn:mergeinfo
## -14,4 +14,5 ##
 /sandbox/jng/msvc2019/Desktop:9884-9896
 /sandbox/jng/v30/Desktop:8215-8216,8218-8219
 /sandbox/jng/vanilla_swig/Desktop:9812-9814
+/sandbox/jng/vanilla_swig/Portable:9815-9823
 /sandbox/rfc94/Desktop:5099-5163
\ No newline at end of property
Modified: trunk/MgDev/Portable/MgPortable/changelog.txt
===================================================================
--- trunk/MgDev/Portable/MgPortable/changelog.txt	2022-10-10 10:10:45 UTC (rev 9974)
+++ trunk/MgDev/Portable/MgPortable/changelog.txt	2022-10-10 10:22:05 UTC (rev 9975)
@@ -239,7 +239,7 @@
    - MgQuitComponent for exiting the application.
  - MgLoadPackageComponent now accepts a MgLoadMapComponent that will be invoked when the package has been loaded
  - Allow deferred map loading (initialize viewer with MgMapViewerProvider, load the map later on)
- - Simplified constructor for MgPortableMapViewerProvider
+ - Simplified constructor for MgDesktopMapViewerProvider
  - MgComponent subclasses can indicate whether they can operate without a loaded map.
  - IMapViewer.ViewerInitialized event changed to IMapViewer.MapLoaded
 
@@ -289,7 +289,7 @@
  - OSGeo.MapGuide.Desktop.dll is no longer monolithic. It is modular, and now references the existing .net platform assemblies (OSGeo.MapGuide.Foundation.dll, OSGeo.MapGuide.Geometry.dll and OSGeo.MapGuide.PlatformBase.dll). Thus these assemblies also need to be referenced in addition to OSGeo.MapGuide.Desktop.dll
 
 Viewer Changelog:
- - Viewer now operates against MgPlatformBase. Instead of initializing the viewer with a MgdMap, you now initialize it with a MgMapViewerProvider (which currently has one implementation: MgPortableMapViewerProvider). This is to allow for other MgPlatformBase derived libraries to work with the viewer in the future (eg. The official MapGuide API)
+ - Viewer now operates against MgPlatformBase. Instead of initializing the viewer with a MgdMap, you now initialize it with a MgMapViewerProvider (which currently has one implementation: MgDesktopMapViewerProvider). This is to allow for other MgPlatformBase derived libraries to work with the viewer in the future (eg. The official MapGuide API)
  - Fix exceptions when querying for tooltips over visible layers that are initially not visible.
 
 NOTE: All OSGeo.MapGuide.* assemblies used by mg-desktop are signed. Take note of this when building libraries on top of these assemblies.

Modified: trunk/MgDev/Web/src/WebTier.sln
===================================================================
--- trunk/MgDev/Web/src/WebTier.sln	2022-10-10 10:10:45 UTC (rev 9974)
+++ trunk/MgDev/Web/src/WebTier.sln	2022-10-10 10:22:05 UTC (rev 9975)
@@ -24,8 +24,6 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebSupport", "WebSupport\WebSupport.vcxproj", "{795B1B0E-4EC8-469D-B641-E26324266FBF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PostBuild", "PostBuild\PostBuild.vcxproj", "{F486B768-640A-445D-8C09-437C896EFFAD}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IsapiAgent", "IsapiAgent\IsapiAgent.vcxproj", "{016586B2-EBA6-46B1-80DB-F48698D0823A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MapAgentCommon", "MapAgentCommon\MapAgentCommon.vcxproj", "{2E11E332-CF38-4C8E-999A-29935A63AA89}"
@@ -132,14 +130,6 @@
 		{795B1B0E-4EC8-469D-B641-E26324266FBF}.Release|Win32.Build.0 = Release|Win32
 		{795B1B0E-4EC8-469D-B641-E26324266FBF}.Release|x64.ActiveCfg = Release|x64
 		{795B1B0E-4EC8-469D-B641-E26324266FBF}.Release|x64.Build.0 = Release|x64
-		{F486B768-640A-445D-8C09-437C896EFFAD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F486B768-640A-445D-8C09-437C896EFFAD}.Debug|Win32.Build.0 = Debug|Win32
-		{F486B768-640A-445D-8C09-437C896EFFAD}.Debug|x64.ActiveCfg = Debug|x64
-		{F486B768-640A-445D-8C09-437C896EFFAD}.Debug|x64.Build.0 = Debug|x64
-		{F486B768-640A-445D-8C09-437C896EFFAD}.Release|Win32.ActiveCfg = Release|Win32
-		{F486B768-640A-445D-8C09-437C896EFFAD}.Release|Win32.Build.0 = Release|Win32
-		{F486B768-640A-445D-8C09-437C896EFFAD}.Release|x64.ActiveCfg = Release|x64
-		{F486B768-640A-445D-8C09-437C896EFFAD}.Release|x64.Build.0 = Release|x64
 		{016586B2-EBA6-46B1-80DB-F48698D0823A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{016586B2-EBA6-46B1-80DB-F48698D0823A}.Debug|Win32.Build.0 = Debug|Win32
 		{016586B2-EBA6-46B1-80DB-F48698D0823A}.Debug|x64.ActiveCfg = Debug|x64

Deleted: trunk/MgDev/base_package_excludes.txt
===================================================================
--- trunk/MgDev/base_package_excludes.txt	2022-10-10 10:10:45 UTC (rev 9974)
+++ trunk/MgDev/base_package_excludes.txt	2022-10-10 10:22:05 UTC (rev 9975)
@@ -1,47 +0,0 @@
-Backup
-Logs
-Repositories
-FDO
-Temp
-Dictionaries
-Resources
-Schema
-OSGeo.MapGuide.Desktop.dll
-OSGeo.MapGuide.Desktop.xml
-OSGeo.MapGuide.Viewer.dll
-OSGeo.MapGuide.Viewer.Desktop.dll
-OSGeo.MapGuide.Viewer.xml
-MapGuideDesktopUnmanagedApi.dll
-Platform.ini
-gd.dll
-MgGwsCommon.dll
-MgGwsQueryEngine.dll
-MgGwsResource.dll
-MgDesktop.dll
-MgRenderers.dll
-MgStylization.dll
-OSGeo.MapGuide.Foundation.dll
-OSGeo.MapGuide.Geometry.dll
-OSGeo.MapGuide.PlatformBase.dll
-OSGeo.MapGuide.Foundation.xml
-OSGeo.MapGuide.Geometry.xml
-OSGeo.MapGuide.PlatformBase.xml
-maestroapi.key
-DotNetHarness.exe
-DotNetHarness.exe.config
-DotNetHarness.vshost.exe
-DotNetHarness.vshost.exe.config
-DotNetHarness.vshost.exe.manifest
-DotNetUnitTest.exe
-DotNetUnitTest.exe.config
-MapViewerTest.exe
-MapViewerTest.exe.config
-SignMapGuideApi.exe
-UnitTest.exe
-SampleExtension.dll
-Sheboygan.AppLayout
-SheboyganTiled.AppLayout
-MgAppLayout.exe
-MapGuideDesktopApi.jar
-MapGuideDesktopApiJNI.dll
-MapGuideDesktopApi-sources.jar
\ No newline at end of file

Modified: trunk/MgDev/build.bat
===================================================================
--- trunk/MgDev/build.bat	2022-10-10 10:10:45 UTC (rev 9974)
+++ trunk/MgDev/build.bat	2022-10-10 10:22:05 UTC (rev 9975)
@@ -89,6 +89,8 @@
 if "%2"=="server" goto next_param
 if "%2"=="web" goto next_param
 if "%2"=="doc" goto next_param
+if "%2"=="bindings" goto next_param
+if "%2"=="portable" goto next_param
 if "%2"=="test" goto next_param
 if "%2"=="all" goto next_param
 if "%2"=="allnodoc" goto next_param
@@ -139,6 +141,7 @@
 if "%TYPECOMPONENT%"=="oem" goto clean_oem
 if "%TYPECOMPONENT%"=="server" goto clean_server
 if "%TYPECOMPONENT%"=="web" goto clean_web
+if "%TYPECOMPONENT%"=="bindings" goto clean_bindings
 if "%TYPECOMPONENT%"=="doc" goto clean_doc
 
 :clean_oem
@@ -163,6 +166,12 @@
 %ANT% clean -f %MG_OEM%\fusion\build.xml
 if not "%TYPECOMPONENT%"=="all" goto quit
 
+:clean_bindings
+echo [clean]: Clean Bindings
+%MSBUILD_CLEAN% %MG_BINDINGS%\src\Bindings\Bindings.sln
+if not "%errorlevel%"=="0" goto error
+if not "%TYPECOMPONENT%"=="all" goto quit
+
 :clean_doc
 echo [clean]: Clean Doc
 if exist %MG_DOC_OUTPUT% rd /S /Q %MG_DOC_OUTPUT%
@@ -177,6 +186,8 @@
 if "%TYPECOMPONENT%"=="oem" goto build_oem
 if "%TYPECOMPONENT%"=="server" goto build_server
 if "%TYPECOMPONENT%"=="web" goto build_web
+if "%TYPECOMPONENT%"=="bindings" goto build_bindings
+if "%TYPECOMPONENT%"=="portable" goto build_portable
 if "%TYPECOMPONENT%"=="doc" goto build_doc
 if "%TYPECOMPONENT%"=="all" goto build_oem
 if "%TYPECOMPONENT%"=="allnodoc" goto build_oem
@@ -215,6 +226,29 @@
 if "%TYPECOMPONENT%"=="server" 	 goto quit
 if "%TYPECOMPONENT%"=="web" 	 goto quit
 if "%TYPECOMPONENT%"=="doc" 	 goto quit
+
+:build_bindings
+echo [build]: Building Bindings
+dotnet restore %MG_BINDINGS%\src\Bindings\Bindings.sln
+%MSBUILD% %MG_BINDINGS%\src\Bindings\Bindings.sln
+if not "%errorlevel%"=="0" goto error
+if "%TYPECOMPONENT%"=="oem" 	 goto quit
+if "%TYPECOMPONENT%"=="server" 	 goto quit
+if "%TYPECOMPONENT%"=="web" 	 goto quit
+if "%TYPECOMPONENT%"=="bindings" goto quit
+if "%TYPECOMPONENT%"=="doc" 	 goto quit
+
+
+:build_portable
+echo [build]: Building mg-portable
+%MSBUILD% %MG_PORTABLE%\Portable.sln
+if not "%errorlevel%"=="0" goto error
+if "%TYPECOMPONENT%"=="oem" 	 goto quit
+if "%TYPECOMPONENT%"=="server" 	 goto quit
+if "%TYPECOMPONENT%"=="web" 	 goto quit
+if "%TYPECOMPONENT%"=="bindings" goto quit
+if "%TYPECOMPONENT%"=="portable" goto quit
+if "%TYPECOMPONENT%"=="doc" 	 goto quit
 if "%TYPECOMPONENT%"=="allnodoc" goto quit
 
 rem this is left out with component allnodoc
@@ -422,6 +456,8 @@
 echo                                oem,
 echo                                server,
 echo                                web,
-echo                                doc
+echo                                doc,
+echo                                bindings,
+echo                                portable
 echo ************************************************************************
 :quit

Deleted: trunk/MgDev/build_desktop.bat
===================================================================
--- trunk/MgDev/build_desktop.bat	2022-10-10 10:10:45 UTC (rev 9974)
+++ trunk/MgDev/build_desktop.bat	2022-10-10 10:22:05 UTC (rev 9975)
@@ -1,49 +0,0 @@
- at echo off
-rem Top-level build script for mg-desktop
-rem
-rem Author: Jackie Ng (jumpinjackie at gmail.com)
-rem
-rem You must call setenvironment[64].bat first with any appropriate
-rem parameters before calling this script
-rem
-rem This script presumes common/oem components have already been built
-rem so you should ideally run this after running build.bat
-
-SET MG_OUTPUT_DESKTOP=%MG_OUTPUT%\Desktop
-SET MG_OUTPUT_SAMPLES=%MG_OUTPUT%\DesktopSamples
-
-echo ===================================================
-echo Configuration is [%TYPEBUILD%, "%CONFIGURATION%|%PLATFORM%"]
-echo Output Directory for mg-desktop: %MG_OUTPUT_DESKTOP%
-echo Output Directory for samples: %MG_OUTPUT_SAMPLES%
-echo CPU cores: %CPU_CORES%
-echo ===================================================
-
-pushd Desktop
-echo [build]: Desktop API (%PLATFORM%, %CONFIGURATION%)
-%MSBUILD% /p:Platform=%PLATFORM% /p:Configuration=%CONFIGURATION% MgDesktopApi.sln
-if "%errorlevel%"=="1" goto error
-echo [build]: .net components (%PLATFORM%)
-%MSBUILD% /p:Platform=%PLATFORM_CLR% /p:Configuration=%CONFIGURATION% MgDesktopDotNet.sln
-if "%errorlevel%"=="1" goto error
-popd
-echo [install]: binaries
-%XCOPY% "Desktop\bin\%TYPEBUILD%" "%MG_OUTPUT_DESKTOP%" /EXCLUDE:svn_excludes.txt+%CONFIGURATION%_excludes.txt
-pushd "%MG_OUTPUT_DESKTOP%"
-REM Remove WebTier stuff that has no place in mg-desktop
-if exist MgMapGuideCommon.dll del MgMapGuideCommon.dll
-if exist OSGeo.MapGuide.MapGuideCommon.xml del OSGeo.MapGuide.MapGuideCommon.xml
-if exist OSGeo.MapGuide.Web.xml del OSGeo.MapGuide.Web.xml
-if exist Backup rd /S /Q Backup
-popd
-echo [install]: Samples
-pushd Desktop
-%XCOPY% Samples "%MG_OUTPUT_SAMPLES%" /EXCLUDE:samples_exclude.txt
-popd
-goto quit
-
-:error
-echo [ERROR]: There was an error building the component
-exit /B 1
-
-:quit
\ No newline at end of file

Deleted: trunk/MgDev/build_sdk.bat
===================================================================
--- trunk/MgDev/build_sdk.bat	2022-10-10 10:10:45 UTC (rev 9974)
+++ trunk/MgDev/build_sdk.bat	2022-10-10 10:22:05 UTC (rev 9975)
@@ -1,424 +0,0 @@
- at echo off
-rem MapGuide SDK build script for windows
-rem
-rem Author: Jackie Ng (jumpinjackie at gmail.com)
-rem
-rem This script will build a subset of the MapGuide source code, such that an SDK can be produced for developing MapGuide
-rem applications that do not involve the server/web tier. 
-rem 
-rem Due to a hard dependency on ACE, the entire header collection of the ACE library is also copied to the output include directory
-rem 
-rem Before you start, please make sure you have done the following:
-rem
-rem 1) Build the FDO source and place the files in \Oem\FDO (or alternatively download and extract the latest FDO binary sdk)
-rem    with the following structure:
-rem     - Bin\%CONFIG% (where %CONFIG% is debug or release)
-rem		- Inc
-rem		- Lib
-rem    
-rem 2) Download and install the following:
-rem     - doxygen (http://www.doxygen.org)
-rem
-rem 3) Change the values of DOXYGEN to match the paths of your Doxygen installations respectively
-rem     
-rem For a "cleaner" build experience, run this script from an exported copy of the
-rem MapGuide source code (ie. without subversion folders). 
-rem
-rem Usage:
-rem
-rem build.bat [-h]
-rem           [-v]
-rem	          [-c=BuildType]
-rem           [-a=Action]
-rem           [-o=OutputDirectory]
-rem
-rem BuildType: Release(default), Debug
-rem Action: build(default), install, clean
-rem OutputDirectory: The directory where files will be copied to if -a=install, if -o=default or -o=def then 
-rem files will be copied to %MG_DEFAULT_INSTALLDIR%
-
-rem ==================================================
-rem Top-level vars
-rem ==================================================
-SET OLDPATH=%PATH%
-SET TYPEACTION=build
-SET TYPEBUILD=Release
-rem There are no components in an SDK build. Everything must be built! DO NOT CHANGE!
-SET TYPECOMPONENT=all
-
-rem ==================================================
-rem MapGuide vars
-rem ==================================================
-SET MG_DEV=%CD%
-SET MG_OEM=%MG_DEV%\Oem
-SET MG_COMMON=%MG_DEV%\Common
-SET MG_DOC=%MG_DEV%\Doc
-SET MG_WEB=%MG_DEV%\Web
-SET MG_WEB_SRC=%MG_WEB%\src
-SET MG_WEB_BIN=%MG_WEB%\bin
-SET MG_DOC_OUTPUT=%MG_DOC%\MgOpensource_WebAPIReference
-SET MG_DOC_DEVGUIDE_SAMPLES=%MG_DOC%\samples\phpsamples
-SET MG_BUILD_TEMP=%MG_DEV%\BuildTemp
-
-SET MG_SDK_OUTPUT=%MG_DEV%\SDK\%TYPEBUILD%
-SET MG_SDK_BIN=%MG_SDK_OUTPUT%\Bin
-SET MG_SDK_LIB=%MG_SDK_OUTPUT%\Lib
-SET MG_SDK_INC=%MG_SDK_OUTPUT%\Inc
-SET MG_SDK_FDO=%MG_SDK_OUTPUT%\Fdo
-SET MG_BUILD_COMPONENT=
-
-SET MG_ERROR=0
-
-rem ==================================================
-rem MSBuild Settings
-rem ==================================================
-
-rem If the NUMBER_OF_PROCESSORS environment variable is wrong for any reason. Change this value.
-SET CPU_CORES=%NUMBER_OF_PROCESSORS%
-
-rem Uncomment the line below to enable msbuild logging
-rem SET MSBUILD_LOG=/l:FileLogger,Microsoft.Build.Engine;logfile=Build.log;verbosity=diagnostic
-SET MSBUILD_VERBOSITY=/v:q
-
-rem ==================================================
-rem Command aliases
-rem ==================================================
-rem SET XCOPY=xcopy /E /Y /I /F
-SET XCOPY=xcopy /E /Y /I /Q
-SET XCOPY_SINGLE=xcopy /Y /I /Q
-SET MSBUILD=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%TYPEBUILD% %MSBUILD_VERBOSITY% %MSBUILD_LOG%
-SET MSBUILD_CLEAN=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%TYPEBUILD% /t:Clean %MSBUILD_VERBOSITY%
-
-rem ==================================================
-rem Parameter Handling
-rem ==================================================
-
-:study_params
-if (%1)==() goto pre_build_check
-
-if "%1"=="-help"    goto help_show
-if "%1"=="-h"       goto help_show
-
-if "%1"=="-c"       goto get_conf
-if "%1"=="-config"  goto get_conf
-
-if "%1"=="-a"       goto get_action
-if "%1"=="-action"  goto get_action
-
-if "%1"=="-v"       goto get_verbose
-if "%1"=="-o"       goto get_output
-
-goto custom_error
-
-:next_param
-shift
-shift
-goto study_params
-
-:get_verbose
-SET MSBUILD_VERBOSITY=/v:d
-SET MSBUILD=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%TYPEBUILD% %MSBUILD_VERBOSITY% %MSBUILD_LOG%
-SET MSBUILD_CLEAN=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%TYPEBUILD% /t:Clean %MSBUILD_VERBOSITY%
-goto next_param
-
-:get_output
-SET MG_OUTPUT=%2
-if "%2" == "default" SET MG_OUTPUT=%MG_DEV%
-if "%2" == "def" SET MG_OUTPUT=%MG_DEV%
-SET MG_SDK_OUTPUT=%MG_OUTPUT%\SDK\%TYPEBUILD%
-SET MG_SDK_BIN=%MG_SDK_OUTPUT%\Bin
-SET MG_SDK_LIB=%MG_SDK_OUTPUT%\Lib
-SET MG_SDK_INC=%MG_SDK_OUTPUT%\Inc
-goto next_param
-
-:get_conf
-SET TYPEBUILD=%2
-SET MSBUILD=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%TYPEBUILD% %MSBUILD_VERBOSITY% %MSBUILD_LOG%
-SET MSBUILD_CLEAN=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%TYPEBUILD% /t:Clean %MSBUILD_VERBOSITY%
-SET MG_OUTPUT=%MG_DEV%\%TYPEBUILD%
-SET MG_OUTPUT_SERVER=%MG_OUTPUT%\Server
-SET MG_OUTPUT_WEB=%MG_OUTPUT%\Web
-
-if "%2"=="Release" goto next_param
-if "%2"=="Debug" goto next_param
-SET ERRORMSG=Unrecognised configuration: %2
-goto custom_error
-
-:get_action
-SET TYPEACTION=%2
-if "%2"=="build" goto next_param
-if "%2"=="clean" goto next_param
-if "%2"=="install" goto next_param
-SET ERRORMSG=Unrecognised action: %2
-goto custom_error
-
-rem ==================================================
-rem Check Environment Vars
-rem ==================================================
-:pre_build_check
-rem :check_java
-rem if exist "%JAVA_HOME%" goto check_ant
-rem SET ERRORMSG=Unable to find java sdk installation. Please install the java sdk and set the JAVA_HOME environment variable
-rem goto custom_error_no_help
-rem :check_ant
-rem if exist "%ANT_HOME%" goto check_fdo
-rem SET ERRORMSG=Unable to find Apache ant installation. Please install apache ant and set the ANT_HOME environment variable
-rem goto custom_error_no_help
-:check_fdo
-:check_fdo_bin
-if exist "%MG_OEM%\FDO\Bin\%TYPEBUILD%" goto check_fdo_inc
-SET ERRORMSG=Unable to find FDO binaries. Copy the FDO binaries %MG_OEM%\FDO\Bin\%TYPEBUILD%
-goto custom_error_no_help
-:check_fdo_inc
-if exist "%MG_OEM%\FDO\Bin\%TYPEBUILD%" goto check_fdo_lib
-SET ERRORMSG=Unable to find FDO headers. Copy the FDO headers into %MG_OEM%\Inc
-goto custom_error_no_help
-:check_fdo_lib
-if exist "%MG_OEM%\FDO\Bin\%TYPEBUILD%" goto start_build
-SET ERRORMSG=Unable to find FDO lib files. Copy the FDO lib files into %MG_OEM%\Lib
-goto custom_error_no_help
-
-:start_build
-echo ===================================================
-echo Configuration is [%TYPEBUILD%]
-echo Action is [%TYPEACTION%] on [%TYPECOMPONENT%]
-echo Deployment Directory for SDK: %MG_SDK_OUTPUT%
-echo CPU cores: %CPU_CORES%
-echo ===================================================
-
-if "%TYPEACTION%"=="build" goto build
-if "%TYPEACTION%"=="clean" goto clean
-if "%TYPEACTION%"=="install" goto install
-
-:clean
-if "%TYPECOMPONENT%"=="oem" goto clean_oem
-if "%TYPECOMPONENT%"=="common" goto clean_common
-if "%TYPECOMPONENT%"=="server" goto clean_server
-if "%TYPECOMPONENT%"=="web" goto clean_web
-if "%TYPECOMPONENT%"=="doc" goto clean_doc
-
-:clean_oem
-echo [clean]: Clean Oem
-%MSBUILD_CLEAN% %MG_OEM%\Oem.sln
-echo [clean]: Clean Oem - CS-Map
-%MSBUILD_CLEAN% %MG_OEM%\CSMap\CsMapDev\VC90\OpenSource.sln
-if not "%TYPECOMPONENT%"=="all" goto quit
-
-:clean_common
-echo [clean]: Clean Common
-%MSBUILD_CLEAN% %MG_COMMON%\Common.sln
-rem if not "%TYPECOMPONENT%"=="all" goto quit
-goto quit
-
-rem :clean_doc
-rem echo [clean]: Clean Doc
-rem if exist %MG_DOC_OUTPUT% rd /S /Q %MG_DOC_OUTPUT%
-rem goto quit
-
-
-rem =======================================================
-rem Build Targets.... the all targets just carry on
-rem =======================================================
-
-:build
-if "%TYPECOMPONENT%"=="oem" goto build_oem
-if "%TYPECOMPONENT%"=="common" goto build_common
-if "%TYPECOMPONENT%"=="server" goto build_server
-if "%TYPECOMPONENT%"=="web" goto build_web
-if "%TYPECOMPONENT%"=="doc" goto build_doc
-if "%TYPECOMPONENT%"=="all" goto build_oem
-if "%TYPECOMPONENT%"=="allnodoc" goto build_oem
-SET ERRORMSG=Unrecognised component: %TYPECOMPONENT%
-goto custom_error
-
-:build_oem
-echo [build]: Building Oem
-%MSBUILD% %MG_OEM%\Oem.sln
-if "%errorlevel%"=="1" goto error
-rem CsMap is not in Oem.sln, so we need to build that separately
-echo [build]: Building Oem - CSMap
-%MSBUILD% %MG_OEM%\CSMap\CsMapDev\VC90\OpenSource.sln
-if "%errorlevel%"=="1" goto error
-
-:build_common
-echo [build]: Building Common
-%MSBUILD% %MG_COMMON%\Common.sln
-if "%errorlevel%"=="1" goto error
-
-:build_web
-rem Shortcut method. Takes longer, but we get the SWIG'd binaries GUARANTEED!
-echo [build]: Building Web Tier
-%MSBUILD% "%MG_WEB_SRC%\WebTier.sln"
-if "%errorlevel%"=="1" goto error
-
-rem :build_swig
-rem echo [build]: SWIG wrappers - Unmanaged
-rem %MSBUILD% "%MG_WEB%\DotNetUnmanagedApi\Foundation\FoundationApi.vcproj"
-rem %MSBUILD% "%MG_WEB%\DotNetUnmanagedApi\Geometry\GeometryApi.vcproj"
-rem %MSBUILD% "%MG_WEB%\DotNetUnmanagedApi\MapGuideCommon\MapGuideCommonApi.vcproj"
-rem %MSBUILD% "%MG_WEB%\DotNetUnmanagedApi\PlatformBase\PlatformBaseApi.vcproj"
-rem %MSBUILD% "%MG_WEB%\DotNetUnmanagedApi\Web\WebApi.vcproj"
-rem echo [build]: SWIG wrappers - .net assemblies
-rem %MSBUILD% "%MG_WEB%\DotNetApi\Foundation\FoundationDotNetApi.vcproj"
-rem %MSBUILD% "%MG_WEB%\DotNetApi\Geometry\GeometryDotNetApi.vcproj"
-rem %MSBUILD% "%MG_WEB%\DotNetApi\MapGuideCommon\MapGuideCommonDotNetApi.vcproj"
-rem %MSBUILD% "%MG_WEB%\DotNetApi\PlatformBase\PlatformBaseDotNetApi.vcproj"
-rem %MSBUILD% "%MG_WEB%\DotNetUnmanagedApi\Web\WebApi.vcproj"
-
-rem :build_web
-rem echo [build]: Building Web Tier
-rem %MSBUILD% %MG_WEB_SRC%\WebTier.sln
-rem if "%errorlevel%"=="1" goto error
-rem if "%TYPECOMPONENT%"=="oem" 	 goto quit
-rem if "%TYPECOMPONENT%"=="common" 	 goto quit
-rem if "%TYPECOMPONENT%"=="server" 	 goto quit
-rem if "%TYPECOMPONENT%"=="web" 	 goto quit
-rem if "%TYPECOMPONENT%"=="doc" 	 goto quit
-rem if "%TYPECOMPONENT%"=="allnodoc" goto quit
-
-rem this is left out with component allnodoc
-
-rem :build_doc
-rem echo [build]: Building Doc
-rem pushd %MG_DOC%
-rem call MgOpenSource_run_doxygen.bat
-rem popd
-rem goto quit
-
-rem =======================================================
-rem INSTALL Targets.... the all targets just carry on
-rem =======================================================
-
-:install
-:install_sdk
-echo [install]: SDK
-if not exist "%MG_SDK_BIN%" mkdir "%MG_SDK_BIN%"
-if not exist "%MG_SDK_LIB%" mkdir "%MG_SDK_LIB%"
-if not exist "%MG_SDK_INC%" mkdir "%MG_SDK_INC%"
-echo [install]: SDK - Oem (ACE)
-rem ACE
-copy /Y "%MG_OEM%\ACE\ACE_wrappers\lib\ACE.dll" "%MG_SDK_BIN%"
-copy /Y "%MG_OEM%\ACE\ACE_wrappers\lib\ACE.pdb" "%MG_SDK_BIN%"
-copy /Y "%MG_OEM%\ACE\ACE_wrappers\lib\ACE.lib" "%MG_SDK_LIB%"
-rem Due to ACE headers being leaked out in public MG headers, we need these too
-%XCOPY% /S "%MG_OEM%\ACE\ACE_wrappers\ace\*.h" "%MG_SDK_INC%\ACE_wrappers\ACE" /EXCLUDE:svn_excludes.txt
-%XCOPY% /S "%MG_OEM%\ACE\ACE_wrappers\ace\*.inl" "%MG_SDK_INC%\ACE_wrappers\ACE" /EXCLUDE:svn_excludes.txt
-%XCOPY% /S "%MG_OEM%\ACE\ACE_wrappers\ace\*.cpp" "%MG_SDK_INC%\ACE_wrappers\ACE" /EXCLUDE:svn_excludes.txt
-echo [install]: SDK - Oem (GEOS)
-rem Same with GEOS
-copy /Y "%MG_OEM%\geos\VisualStudio\%TYPEBUILD%\GEOS.dll" "%MG_SDK_BIN%"
-copy /Y "%MG_OEM%\geos\VisualStudio\%TYPEBUILD%\GEOS.pdb" "%MG_SDK_BIN%"
-echo [install]: SDK - Oem (xerces)
-rem Same with xerces
-copy /Y "%MG_OEM%\dbxml\xerces-c-src\Build\Win32\VC9\%TYPEBUILD%\xerces-c_3_1mg.dll" "%MG_SDK_BIN%"
-copy /Y "%MG_OEM%\dbxml\xerces-c-src\Build\Win32\VC9\%TYPEBUILD%\xerces-c_3_1mg.pdb" "%MG_SDK_BIN%"
-copy /Y "%MG_OEM%\dbxml\xerces-c-src\Build\Win32\VC9\%TYPEBUILD%\xerces-c_3mg.lib" "%MG_SDK_LIB%"
-%XCOPY% /S "%MG_OEM%\dbxml\xerces-c-src\src\*.h" "%MG_SDK_INC%\xerces" /EXCLUDE:svn_excludes.txt
-%XCOPY% /S "%MG_OEM%\dbxml\xerces-c-src\src\*.hpp" "%MG_SDK_INC%\xerces" /EXCLUDE:svn_excludes.txt
-%XCOPY% /S "%MG_OEM%\dbxml\xerces-c-src\src\*.c" "%MG_SDK_INC%\xerces" /EXCLUDE:svn_excludes.txt
-echo [install]: SDK - Oem (DWF Toolkit)
-rem DWF Toolkit isn't technically required, but it's hard to implement your own MgDrawingService without it
-%XCOPY% /S "%MG_OEM%\DWFTK7.1\develop\global\lib\static\%TYPEBUILD%\vc8.0\*.lib" "%MG_SDK_LIB%\dwftk"
-%XCOPY% /S "%MG_OEM%\DWFTK7.1\develop\global\src\dwf\*.*" "%MG_SDK_INC%\DWFTK7.1\dwf" /EXCLUDE:svn_excludes.txt
-%XCOPY% /S "%MG_OEM%\DWFTK7.1\develop\global\src\dwfcore\*.*" "%MG_SDK_INC%\DWFTK7.1\dwfcore" /EXCLUDE:svn_excludes.txt
-%XCOPY% /S "%MG_OEM%\DWFTK7.1\develop\global\src\dwfemap\*.*" "%MG_SDK_INC%\DWFTK7.1\dwfemap" /EXCLUDE:svn_excludes.txt
-echo [install]: SDK - FDO
-rem FDO SDK. Copy each subdir into each respective "Fdo" subdirectory to distinguish FDO files from MG files
-%XCOPY% "%MG_OEM%\FDO\bin\%TYPEBUILD%" "%MG_SDK_BIN%\Fdo"
-%XCOPY% "%MG_OEM%\FDO\Inc" "%MG_SDK_INC%\Fdo"
-%XCOPY% "%MG_OEM%\FDO\Lib" "%MG_SDK_LIB%\Fdo"
-echo [install]: SDK - MG Common
-rem Common binaries
-copy /Y "%MG_COMMON%\bin\%TYPEBUILD%\*.dll" "%MG_SDK_BIN%
-copy /Y "%MG_COMMON%\lib\%TYPEBUILD%\*.lib" "%MG_SDK_LIB%
-copy /Y "%MG_COMMON%\bin\%TYPEBUILD%\*.pdb" "%MG_SDK_BIN%
-rem GD binary (required by Renderers)
-copy /Y "%MG_OEM%\gd\build\win32\gd\%TYPEBUILD%\gd.dll" "%MG_SDK_BIN%
-copy /Y "%MG_OEM%\gd\build\win32\gd\%TYPEBUILD%\gd.pdb" "%MG_SDK_BIN%
-rem Foundation
-if not exist "%MG_SDK_INC%\Foundation" mkdir "%MG_SDK_INC%\Foundation"
-%XCOPY% /S "%MG_COMMON%\Foundation\*.h" "%MG_SDK_INC%\Foundation" /EXCLUDE:svn_excludes.txt
-rem Geometry
-if not exist "%MG_SDK_INC%\Geometry" mkdir "%MG_SDK_INC%\Geometry"
-%XCOPY% /S "%MG_COMMON%\Geometry\*.h" "%MG_SDK_INC%\Geometry" /EXCLUDE:svn_excludes.txt
-rem MdfModel
-if not exist "%MG_SDK_INC%\MdfModel" mkdir "%MG_SDK_INC%\MdfModel"
-%XCOPY% /S "%MG_COMMON%\MdfModel\*.h" "%MG_SDK_INC%\MdfModel" /EXCLUDE:svn_excludes.txt
-rem MdfParser
-if not exist "%MG_SDK_INC%\MdfParser" mkdir "%MG_SDK_INC%\MdfParser"
-%XCOPY% /S "%MG_COMMON%\MdfParser\*.h" "%MG_SDK_INC%\MdfParser" /EXCLUDE:svn_excludes.txt
-rem PlatformBase
-if not exist "%MG_SDK_INC%\PlatformBase" mkdir "%MG_SDK_INC%\PlatformBase"
-%XCOPY% /S "%MG_COMMON%\PlatformBase\*.h" "%MG_SDK_INC%\PlatformBase" /EXCLUDE:svn_excludes.txt
-rem Renderers
-if not exist "%MG_SDK_INC%\Renderers" mkdir "%MG_SDK_INC%\Renderers"
-%XCOPY% /S "%MG_COMMON%\Renderers\*.h" "%MG_SDK_INC%\Renderers" /EXCLUDE:svn_excludes.txt
-rem Schema
-if not exist "%MG_SDK_INC%\Schema" mkdir "%MG_SDK_INC%\Schema"
-%XCOPY% "%MG_COMMON%\Schema" "%MG_SDK_INC%\Schema" /EXCLUDE:svn_excludes.txt
-rem Stylization
-if not exist "%MG_SDK_INC%\Stylization" mkdir "%MG_SDK_INC%\Stylization"
-%XCOPY% /S "%MG_COMMON%\Stylization\*.h" "%MG_SDK_INC%\Stylization" /EXCLUDE:svn_excludes.txt
-rem Delete some stuff that should not be there
-pushd "%MG_SDK_BIN%"
-del GeometryConsoleTest.pdb
-popd
-goto quit
-
-:error
-echo [ERROR]: There was an error building the component
-exit /B 1
-
-:custom_error_no_help
-echo [ERROR]: %ERRORMSG%
-SET ERRORMSG=
-exit /B 1
-
-:custom_error
-echo [ERROR]: %ERRORMSG%
-SET ERRORMSG=
-echo Please use the format:
-:help_show
-echo ************************************************************************
-echo build.bat [-h]
-echo           [-v]
-echo           [-c=BuildType]
-echo           [-w=Component]
-echo           [-a=Action]
-echo           [-o=OutputDirectory]
-echo Help:                  -h[elp]
-echo Verbose:               -v
-echo BuildType:             -c[onfig]=Release(default), Debug
-echo Action:                -a[ction]=build(default),
-echo                                  install,
-echo                                  clean,
-echo Component:             -w[ith]=all(default),
-echo                                oem,
-echo                                common,
-echo                                server,
-echo                                web,
-echo                                doc
-echo ************************************************************************
-:quit
-SET TYPEACTION=
-SET TYPEBUILD=
-SET MG_OUTPUT=
-SET MG_BUILD_COMPONENT=
-SET MG_DEV=
-SET MG_INSTALLER=
-SET MG_OEM=
-SET MG_SERVER=
-SET MG_WEB=
-SET MG_WEB_SRC=
-SET MG_WEB_BIN=
-SET MG_UNIT_TEST=
-SET MG_FUSION=
-SET MG_DOC=
-SET MG_DOC_OUTPUT=
-SET MG_ERROR=
-
-SET MSBUILD_LOG=
-SET MSBUILD_VERBOSITY=
-SET XCOPY=
-SET MSBUILD=
-SET PATH=%OLDPATH%

Deleted: trunk/MgDev/csmap_excludes.txt
===================================================================
--- trunk/MgDev/csmap_excludes.txt	2022-10-10 10:10:45 UTC (rev 9974)
+++ trunk/MgDev/csmap_excludes.txt	2022-10-10 10:22:05 UTC (rev 9975)
@@ -1,21 +0,0 @@
-coordsys.asc
-datums.asc
-ellipsoid.asc
-mreg.asc
-category.asc
-cs_comp.c
-cs_dictdiff.c
-OSTN02.txt
-OSTN97.txt
-TKY2JGD.par
-JGD2011V100.par
-.MRT
-compiler.
-cs-map.
-Australia\Gda94
-Usa\Geoid96
-Usa\Geoid99
-Usa\Geoid03
-Usa\NSRS2007
-Usa\NSRS2011
-WW15MGH.GRD
\ No newline at end of file

Deleted: trunk/MgDev/debug64_excludes.txt
===================================================================
--- trunk/MgDev/debug64_excludes.txt	2022-10-10 10:10:45 UTC (rev 9974)
+++ trunk/MgDev/debug64_excludes.txt	2022-10-10 10:22:05 UTC (rev 9975)
@@ -1,2 +0,0 @@
-MapGuideApi.jar
-MapGuideApi-sources.jar
\ No newline at end of file

Deleted: trunk/MgDev/debug_excludes.txt
===================================================================
Deleted: trunk/MgDev/desktop_package_excludes.txt
===================================================================
--- trunk/MgDev/desktop_package_excludes.txt	2022-10-10 10:10:45 UTC (rev 9974)
+++ trunk/MgDev/desktop_package_excludes.txt	2022-10-10 10:22:05 UTC (rev 9975)
@@ -1,43 +0,0 @@
-Backup
-Logs
-Temp
-Repositories
-Dictionaries
-ACE.dll
-FoundationUnmanagedApi.dll
-GeometryUnmanagedApi.dll
-GEOS.dll
-MgFoundation.dll
-MgGeometry.dll
-MgMdfModel.dll
-MgMdfParser.dll
-MgPlatformBase.dll
-OSGeo.MapGuide.Foundation.dll
-OSGeo.MapGuide.Geometry.dll
-OSGeo.MapGuide.PlatformBase.dll
-PlatformBaseUnmanagedApi.dll
-xerces-c_3_1mg.dll
-OSGeo.MapGuide.Desktop.dll
-OSGeo.MapGuide.Desktop.xml
-OSGeo.MapGuide.Viewer.dll
-OSGeo.MapGuide.Viewer.Desktop.dll
-OSGeo.MapGuide.Viewer.xml
-maestroapi.key
-DotNetHarness.exe
-DotNetHarness.exe.config
-DotNetHarness.vshost.exe
-DotNetHarness.vshost.exe.config
-DotNetHarness.vshost.exe.manifest
-DotNetUnitTest.exe
-DotNetUnitTest.exe.config
-MapViewerTest.exe
-MapViewerTest.exe.config
-SignMapGuideApi.exe
-UnitTest.exe
-Sheboygan.AppLayout
-SheboyganTiled.AppLayout
-SampleExtension.dll
-MgAppLayout.exe
-MapGuideDesktopApi.jar
-MapGuideDesktopApiJNI.dll
-MapGuideDesktopApi-sources.jar
\ No newline at end of file

Deleted: trunk/MgDev/dll_excludes.txt
===================================================================
--- trunk/MgDev/dll_excludes.txt	2022-10-10 10:10:45 UTC (rev 9974)
+++ trunk/MgDev/dll_excludes.txt	2022-10-10 10:22:05 UTC (rev 9975)
@@ -1,9 +0,0 @@
-SampleExtension.dll
-MgMapGuideCommon.dll
-OSGeo.MapGuide.Desktop.dll
-OSGeo.MapGuide.Foundation.dll
-OSGeo.MapGuide.Geometry.dll
-OSGeo.MapGuide.PlatformBase.dll
-OSGeo.MapGuide.Viewer.Desktop.dll
-OSGeo.MapGuide.Viewer.dll
-OSGeo.MapGuide.Viewer.xml
\ No newline at end of file

Deleted: trunk/MgDev/dotnet_excludes.txt
===================================================================
--- trunk/MgDev/dotnet_excludes.txt	2022-10-10 10:10:45 UTC (rev 9974)
+++ trunk/MgDev/dotnet_excludes.txt	2022-10-10 10:22:05 UTC (rev 9975)
@@ -1,2 +0,0 @@
-Php
-Java
\ No newline at end of file

Deleted: trunk/MgDev/dotnetapi_excludes.txt
===================================================================
--- trunk/MgDev/dotnetapi_excludes.txt	2022-10-10 10:10:45 UTC (rev 9974)
+++ trunk/MgDev/dotnetapi_excludes.txt	2022-10-10 10:22:05 UTC (rev 9975)
@@ -1,12 +0,0 @@
-OSGeo.MapGuide.Foundation.dll
-OSGeo.MapGuide.Geometry.dll
-OSGeo.MapGuide.MapGuideCommon.dll
-OSGeo.MapGuide.PlatformBase.dll
-OSGeo.MapGuide.Web.dll
-FoundationUnmanagedApi.dll
-GeometryUnmanagedApi.dll
-MapGuideCommonUnmanagedApi.dll
-PlatformBaseUnmanagedApi.dll
-WebUnmanagedApi.dll
-MapGuideDotNetApi.dll
-MapGuideUnmanagedApi.dll
\ No newline at end of file

Deleted: trunk/MgDev/dotnetxml_excludes.txt
===================================================================
--- trunk/MgDev/dotnetxml_excludes.txt	2022-10-10 10:10:45 UTC (rev 9974)
+++ trunk/MgDev/dotnetxml_excludes.txt	2022-10-10 10:22:05 UTC (rev 9975)
@@ -1,5 +0,0 @@
-OSGeo.MapGuide.Foundation.xml
-OSGeo.MapGuide.Geometry.xml
-OSGeo.MapGuide.PlatformBase.xml
-OSGeo.MapGuide.MapGuideCommon.xml
-OSGeo.MapGuide.Web.xml
\ No newline at end of file

Deleted: trunk/MgDev/java_excludes.txt
===================================================================
--- trunk/MgDev/java_excludes.txt	2022-10-10 10:10:45 UTC (rev 9974)
+++ trunk/MgDev/java_excludes.txt	2022-10-10 10:22:05 UTC (rev 9975)
@@ -1,2 +0,0 @@
-DotNet
-Php
\ No newline at end of file

Deleted: trunk/MgDev/mapagent_excludes.txt
===================================================================
--- trunk/MgDev/mapagent_excludes.txt	2022-10-10 10:10:45 UTC (rev 9974)
+++ trunk/MgDev/mapagent_excludes.txt	2022-10-10 10:22:05 UTC (rev 9975)
@@ -1 +0,0 @@
-mod_mgmapagent
\ No newline at end of file

Deleted: trunk/MgDev/nuget_pack.bat
===================================================================
--- trunk/MgDev/nuget_pack.bat	2022-10-10 10:10:45 UTC (rev 9974)
+++ trunk/MgDev/nuget_pack.bat	2022-10-10 10:22:05 UTC (rev 9975)
@@ -1,10 +0,0 @@
- at echo off
-SET MG_CPU=x86
-IF NOT "%1" == "" SET MG_CPU=%1
-pushd nuget
-nuget pack mapguide-api-base-%MG_CPU%.nuspec -BasePath %MG_CPU%\api-base
-nuget pack mg-desktop-%MG_CPU%.nuspec -BasePath %MG_CPU%\api-desktop
-nuget pack mg-desktop-viewer-%MG_CPU%.nuspec -BasePath %MG_CPU%\api-desktop-viewer
-nuget pack mapguide-api-web-%MG_CPU%.nuspec -BasePath %MG_CPU%\api-web
-nuget pack cs-map-dictionaries.nuspec -BasePath cs-map-dicts
-popd
\ No newline at end of file

Deleted: trunk/MgDev/nuget_prepare.bat
===================================================================
--- trunk/MgDev/nuget_prepare.bat	2022-10-10 10:10:45 UTC (rev 9974)
+++ trunk/MgDev/nuget_prepare.bat	2022-10-10 10:22:05 UTC (rev 9975)
@@ -1,148 +0,0 @@
- at echo off
-rem Top-level build script for mg-desktop
-rem
-rem Author: Jackie Ng (jumpinjackie at gmail.com)
-rem
-rem You must call setenvironment[64].bat first with any appropriate
-rem parameters before calling this script
-SET MG_VERSION=2.4.0.0
-SET MG_CPU=x86
-IF NOT "%1" == "" SET MG_VERSION=%1
-IF NOT "%2" == "" SET MG_CPU=%2
-
-echo Version: %MG_VERSION%
-echo CPU: %MG_CPU%
-
-IF "%MG_CPU%" == "x64" (
-    SET TYPEBUILD=release64
-) ELSE (
-    SET TYPEBUILD=release
-)
-
-SET NUGET_ROOT=%CD%\nuget
-SET NUGET_BASEDIR=%NUGET_ROOT%\%MG_CPU%
-SET NUGET_TARGET=net40
-SET NUGET_BASE_ROOT=%NUGET_BASEDIR%\api-base
-SET NUGET_CONTENT_BASE=%NUGET_BASE_ROOT%\mapguide-api-base
-SET NUGET_LIB_BASE=%NUGET_BASE_ROOT%\lib\%NUGET_TARGET%
-SET NUGET_DESKTOP_ROOT=%NUGET_BASEDIR%\api-desktop
-SET NUGET_CONTENT_DESKTOP=%NUGET_DESKTOP_ROOT%\mg-desktop
-SET NUGET_LIB_DESKTOP=%NUGET_DESKTOP_ROOT%\lib\%NUGET_TARGET%
-SET NUGET_VIEWER_ROOT=%NUGET_BASEDIR%\api-desktop-viewer
-SET NUGET_CONTENT_VIEWER=%NUGET_VIEWER_ROOT%\mg-desktop-viewer
-SET NUGET_LIB_VIEWER=%NUGET_VIEWER_ROOT%\lib\%NUGET_TARGET%
-SET NUGET_WEB_ROOT=%NUGET_BASEDIR%\api-web
-SET NUGET_CONTENT_WEB=%NUGET_WEB_ROOT%\mapguide-api-web
-SET NUGET_LIB_WEB=%NUGET_WEB_ROOT%\lib\%NUGET_TARGET%
-SET NUGET_CSMAP_ROOT=%NUGET_ROOT%\cs-map-dicts
-SET NUGET_CONTENT_CSMAP=%NUGET_CSMAP_ROOT%\dictionaries
-SET WEB_BASEDIR=%CD%\Web\bin\%TYPEBUILD%
-SET DESKTOP_SRC=%CD%\Desktop\MgDesktop
-SET DESKTOP_BASEDIR=%CD%\%TYPEBUILD%\Desktop
-SET SIGNER_ROOT=%CD%\Desktop\DesktopUnmanagedApi\DotNet
-
-IF NOT EXIST "%DESKTOP_BASEDIR%" (
-    echo mg-desktop base directory not found: %DESKTOP_BASEDIR%
-    goto error
-) ELSE (
-    echo mg-desktop base directory: %DESKTOP_BASEDIR%
-)
-IF NOT EXIST "%WEB_BASEDIR%" (
-    echo MapGuide Web base directory not found: %WEB_BASEDIR%
-    goto error
-) ELSE (
-    echo MapGuide Web base directory: %WEB_BASEDIR%
-)
-IF NOT EXIST "%DESKTOP_BASEDIR%\Dictionaries" (
-    echo CS-Map dictionaries directory not found: "%DESKTOP_BASEDIR%\Dictionaries"
-    goto error
-) ELSE (
-    echo CS-Map dictionaries directory: "%DESKTOP_BASEDIR%\Dictionaries"
-)
-IF NOT EXIST "%SIGNER_ROOT%" (
-    echo Signer root directory not found: %SIGNER_ROOT%
-    goto error
-) ELSE (
-    echo Signer root directory: %SIGNER_ROOT%
-)
-
-IF NOT EXIST "%NUGET_CONTENT_BASE%" MKDIR "%NUGET_CONTENT_BASE%"
-IF NOT EXIST "%NUGET_CONTENT_DESKTOP%" MKDIR "%NUGET_CONTENT_DESKTOP%"
-IF NOT EXIST "%NUGET_CONTENT_WEB%" MKDIR "%NUGET_CONTENT_WEB%"
-IF NOT EXIST "%NUGET_CONTENT_CSMAP%" MKDIR "%NUGET_CONTENT_CSMAP%"
-
-echo [install]: Copy api-base files to nuget staging
-xcopy /S /Y "%DESKTOP_BASEDIR%\*" "%NUGET_CONTENT_BASE%" /EXCLUDE:package_excludes.txt+base_package_excludes.txt
-xcopy /Y /I "%DESKTOP_BASEDIR%\OSGeo.MapGuide.Foundation.dll" "%NUGET_LIB_BASE%"
-xcopy /Y /I "%DESKTOP_BASEDIR%\OSGeo.MapGuide.Geometry.dll" "%NUGET_LIB_BASE%"
-xcopy /Y /I "%DESKTOP_BASEDIR%\OSGeo.MapGuide.PlatformBase.dll" "%NUGET_LIB_BASE%"
-xcopy /Y /I "%DESKTOP_BASEDIR%\OSGeo.MapGuide.Foundation.xml" "%NUGET_LIB_BASE%"
-xcopy /Y /I "%DESKTOP_BASEDIR%\OSGeo.MapGuide.Geometry.xml" "%NUGET_LIB_BASE%"
-xcopy /Y /I "%DESKTOP_BASEDIR%\OSGeo.MapGuide.PlatformBase.xml" "%NUGET_LIB_BASE%"
-echo [install]: Copy api-desktop files to nuget staging
-xcopy /S /Y "%DESKTOP_BASEDIR%\*" "%NUGET_CONTENT_DESKTOP%" /EXCLUDE:package_excludes.txt+desktop_package_excludes.txt
-xcopy /Y /I "%DESKTOP_BASEDIR%\OSGeo.MapGuide.Desktop.dll" "%NUGET_LIB_DESKTOP%"
-xcopy /Y /I "%DESKTOP_BASEDIR%\OSGeo.MapGuide.Desktop.xml" "%NUGET_LIB_DESKTOP%"
-echo [install]: Copy api-web files to nuget staging
-xcopy /Y /I "%WEB_BASEDIR%\MgWebApp.dll" "%NUGET_CONTENT_WEB%"
-xcopy /Y /I "%WEB_BASEDIR%\MgWebSupport.dll" "%NUGET_CONTENT_WEB%"
-xcopy /Y /I "%WEB_BASEDIR%\MgHttpHandler.dll" "%NUGET_CONTENT_WEB%"
-xcopy /Y /I "%WEB_BASEDIR%\MgMapGuideCommon.dll" "%NUGET_CONTENT_WEB%"
-xcopy /Y /I "%WEB_BASEDIR%\MapGuideCommonUnmanagedApi.dll" "%NUGET_CONTENT_WEB%"
-xcopy /Y /I "%WEB_BASEDIR%\lib_json.dll" "%NUGET_CONTENT_WEB%"
-xcopy /Y /I "%WEB_BASEDIR%\WebUnmanagedApi.dll" "%NUGET_CONTENT_WEB%"
-xcopy /Y /I "%WEB_BASEDIR%\OSGeo.MapGuide.MapGuideCommon.dll" "%NUGET_LIB_WEB%"
-xcopy /Y /I "%WEB_BASEDIR%\OSGeo.MapGuide.Web.dll" "%NUGET_LIB_WEB%"
-xcopy /Y /I "%WEB_BASEDIR%\OSGeo.MapGuide.MapGuideCommon.xml" "%NUGET_LIB_WEB%"
-xcopy /Y /I "%WEB_BASEDIR%\OSGeo.MapGuide.Web.xml" "%NUGET_LIB_WEB%"
-xcopy /Y /I "%SIGNER_ROOT%\SignMapGuideApi.exe" "%NUGET_LIB_WEB%"
-xcopy /Y /I "%SIGNER_ROOT%\maestroapi.key" "%NUGET_LIB_WEB%"
-echo [install]: Copy cs-map dictionaries to nuget staging
-xcopy /S /Y "%DESKTOP_BASEDIR%\Dictionaries\*" "%NUGET_CONTENT_CSMAP%"
-echo [build]: Signing MapGuide API assemblies
-pushd "%NUGET_LIB_WEB%"
-SignMapGuideApi.exe /framework=4.0
-rd /S /Q Backup
-del maestroapi.key
-del SignMapGuideApi.exe
-popd
-echo [install]: Copy api-desktop-viewer files to nuget staging
-xcopy /Y /I "%DESKTOP_BASEDIR%\OSGeo.MapGuide.Viewer.xml" "%NUGET_LIB_VIEWER%"
-xcopy /Y /I "%DESKTOP_BASEDIR%\OSGeo.MapGuide.Viewer.dll" "%NUGET_LIB_VIEWER%"
-xcopy /Y /I "%DESKTOP_BASEDIR%\OSGeo.MapGuide.Viewer.Desktop.dll" "%NUGET_LIB_VIEWER%"
-echo [prepare]: Nuspec files for %MG_VERSION% (%MG_CPU%)
-REM prep nuspec files
-pushd "%NUGET_ROOT%"
-echo [prepare]: mapguide-api-base
-call BatchSubstitute.bat MG_CPU %MG_CPU% mapguide-api-base.nuspec.tpl > temp.txt
-call BatchSubstitute.bat MG_VERSION %MG_VERSION% temp.txt > mapguide-api-base-%MG_CPU%.nuspec
-echo [prepare]: mapguide-api-web
-call BatchSubstitute.bat MG_CPU %MG_CPU% mapguide-api-web.nuspec.tpl > temp.txt
-call BatchSubstitute.bat MG_VERSION %MG_VERSION% temp.txt > mapguide-api-web-%MG_CPU%.nuspec
-echo [prepare]: mg-desktop
-call BatchSubstitute.bat MG_CPU %MG_CPU% mg-desktop.nuspec.tpl > temp.txt
-call BatchSubstitute.bat MG_VERSION %MG_VERSION% temp.txt > mg-desktop-%MG_CPU%.nuspec
-echo [prepare]: mg-desktop-viewer
-call BatchSubstitute.bat MG_CPU %MG_CPU% mg-desktop-viewer.nuspec.tpl > temp.txt
-call BatchSubstitute.bat MG_VERSION %MG_VERSION% temp.txt > mg-desktop-viewer-%MG_CPU%.nuspec
-echo [prepare]: cs-map-dictionaries
-call BatchSubstitute.bat MG_CPU %MG_CPU% cs-map-dictionaries.nuspec.tpl > temp.txt
-call BatchSubstitute.bat MG_VERSION %MG_VERSION% temp.txt > cs-map-dictionaries.nuspec
-del temp.txt
-echo [prepare]: NuGet Package readmes
-type api-base-readme.txt > "%NUGET_BASE_ROOT%\readme.txt"
-type api-desktop-readme.txt > "%NUGET_DESKTOP_ROOT%\readme.txt"
-type "%DESKTOP_SRC%\changelog.txt" >> "%NUGET_DESKTOP_ROOT%\readme.txt"
-type api-desktop-viewer-readme.txt > "%NUGET_VIEWER_ROOT%\readme.txt"
-type "%DESKTOP_SRC%\changelog.txt" >> "%NUGET_VIEWER_ROOT%\readme.txt"
-type api-web-readme.txt > "%NUGET_WEB_ROOT%\readme.txt"
-type cs-map-dict-readme.txt > "%NUGET_CSMAP_ROOT%\readme.txt"
-popd
-echo mg-desktop is ready for nuget packaging and publishing
-goto quit
-
-:error
-echo [ERROR]: There was an error building the component
-exit /B 1
-
-:quit
\ No newline at end of file

Deleted: trunk/MgDev/package_excludes.txt
===================================================================
--- trunk/MgDev/package_excludes.txt	2022-10-10 10:10:45 UTC (rev 9974)
+++ trunk/MgDev/package_excludes.txt	2022-10-10 10:22:05 UTC (rev 9975)
@@ -1,18 +0,0 @@
-.pdb
-.exp
-.lib
-MgMapGuideCommon.dll
-OSGeo.MapGuide.Foundation.xml
-OSGeo.MapGuide.Geometry.xml
-OSGeo.MapGuide.PlatformBase.xml
-OSGeo.FDO.dll
-OSGeo.FDO.Common.dll
-OSGeo.FDO.Geometry.dll
-OSGeo.FDO.Spatial.dll
-OSGeo.FDO.Providers.MySQL.Overrides.dll
-OSGeo.FDO.Providers.ODBC.Overrides.dll
-OSGeo.FDO.Providers.Rdbms.dll
-OSGeo.FDO.Providers.Rdbms.Overrides.dll
-OSGeo.FDO.Providers.SHP.Overrides.dll
-OSGeo.FDO.Providers.SQLServerSpatial.Overrides.dll
-OSGeo.FDO.Providers.WMS.Overrides.dll
\ No newline at end of file

Deleted: trunk/MgDev/pdb_excludes.txt
===================================================================
--- trunk/MgDev/pdb_excludes.txt	2022-10-10 10:10:45 UTC (rev 9974)
+++ trunk/MgDev/pdb_excludes.txt	2022-10-10 10:22:05 UTC (rev 9975)
@@ -1,9 +0,0 @@
-com
-Logs
-Packages
-Repositories
-Resources
-Schema
-Temp
-wfs
-wms
\ No newline at end of file

Deleted: trunk/MgDev/php_excludes.txt
===================================================================
--- trunk/MgDev/php_excludes.txt	2022-10-10 10:10:45 UTC (rev 9974)
+++ trunk/MgDev/php_excludes.txt	2022-10-10 10:22:05 UTC (rev 9975)
@@ -1,2 +0,0 @@
-DotNet
-Java
\ No newline at end of file

Deleted: trunk/MgDev/release64_excludes.txt
===================================================================
--- trunk/MgDev/release64_excludes.txt	2022-10-10 10:10:45 UTC (rev 9974)
+++ trunk/MgDev/release64_excludes.txt	2022-10-10 10:22:05 UTC (rev 9975)
@@ -1,9 +0,0 @@
-.pdb
-.exp
-.lib
-.iobj
-.ipdb
-TestData
-MgWebTestRunner
-MapGuideApi.jar
-MapGuideApi-sources.jar
\ No newline at end of file

Deleted: trunk/MgDev/release_excludes.txt
===================================================================
--- trunk/MgDev/release_excludes.txt	2022-10-10 10:10:45 UTC (rev 9974)
+++ trunk/MgDev/release_excludes.txt	2022-10-10 10:22:05 UTC (rev 9975)
@@ -1,7 +0,0 @@
-.pdb
-.exp
-.lib
-.iobj
-.ipdb
-TestData
-MgWebTestRunner
\ No newline at end of file

Deleted: trunk/MgDev/setenvironment.bat
===================================================================
--- trunk/MgDev/setenvironment.bat	2022-10-10 10:10:45 UTC (rev 9974)
+++ trunk/MgDev/setenvironment.bat	2022-10-10 10:22:05 UTC (rev 9975)
@@ -1,165 +0,0 @@
- at echo off
-rem ==================================================
-rem setenvironment.bat
-rem
-rem Sets the required environment variables for the
-rem build.bat script
-rem
-rem This script must be run from the VS2012 command prompt
-rem ==================================================
-rem Top-level vars
-rem ==================================================
-SET OLDPATH=%PATH%
-SET TYPEACTION=build
-SET TYPECOMPONENT=all
-
-SET TYPEBUILD=unknown
-SET CONFIGURATION=unknown
-SET PLATFORM=unknown
-SET PLATFORM_CLR=unknown
-
-SET PCONF=release
-if not "%1" == "" set PCONF=%1
-
-if "%PCONF%"=="debug" (
-SET TYPEBUILD=Debug
-SET CONFIGURATION=Debug
-SET PLATFORM=Win32
-SET PLATFORM_CLR=x86
-)
-
-IF "%PCONF%"=="release" (
-SET TYPEBUILD=Release
-SET CONFIGURATION=Release
-SET PLATFORM=Win32
-SET PLATFORM_CLR=x86
-)
-
-if "%TYPEBUILD%"=="unknown" (
-    echo Unknown configuration: %PCONF%
-    goto help_show
-)
-rem ==================================================
-rem MapGuide vars
-rem ==================================================
-SET MG_DEV=%CD%
-SET MG_OEM=%MG_DEV%\Oem
-SET MG_OEM_DBXML=dbxml
-SET MG_OEM_DB=db-4.8.26
-SET MG_FDO_BIN=%MG_OEM%\FDO\Bin\%TYPEBUILD%
-SET MG_FDO_INC=%MG_OEM%\FDO\Inc
-SET MG_FDO_LIB=%MG_OEM%\FDO\Lib
-SET MG_COMMON=%MG_DEV%\Common
-SET MG_SERVER=%MG_DEV%\Server
-SET MG_WEB=%MG_DEV%\Web
-SET MG_WEB_SRC=%MG_WEB%\src
-SET MG_WEB_BIN=%MG_WEB%\bin
-SET MG_UNIT_TEST=%MG_DEV%\UnitTest
-SET MG_FUSION=%MG_OEM%\Fusion
-SET MG_DOC=%MG_DEV%\Doc
-SET MG_DOC_OUTPUT=%MG_DOC%\MgOpensource_WebAPIReference
-SET MG_DOC_DEVGUIDE_SAMPLES=%MG_DOC%\samples
-SET MG_BUILD_TEMP=%MG_DEV%\BuildTemp
-
-rem === Intermediate build vars ===
-SET MG_BUILD_DBXML_EXE_PATH=%MG_OEM%\%MG_OEM_DBXML%\bin\%CONFIGURATION%
-SET MG_BUILD_SQLITE_PHP_API=%MG_OEM%\SQLite\bin\%TYPEBUILD%\php_SQLitePhpApi.dll
-SET MG_BUILD_SQLITE_DOTNET_API=%MG_OEM%\SQLite\bin\%TYPEBUILD%\SQLiteDotNet.dll
-SET MG_BUILD_MAPAGENT_PATH=%MG_WEB_SRC%\mapagent
-SET MG_BUILD_MAPAGENT=%MG_BUILD_MAPAGENT_PATH%\mod_mgmapagent.so
-
-SET MG_OUTPUT=%MG_DEV%\%TYPEBUILD%
-SET MG_OUTPUT_SERVER=%MG_OUTPUT%\Server
-SET MG_OUTPUT_WEB=%MG_OUTPUT%\Web
-SET MG_OUTPUT_CSMAP=%MG_OUTPUT%\CS-Map
-SET MG_OUTPUT_TEST=%MG_OUTPUT%\Test
-SET MG_BUILD_COMPONENT=
-
-SET MG_DEFAULT_INSTALLDIR=C:\Program Files\MapGuideOpenSource2.0
-SET MG_ERROR=0
-rem ==================================================
-rem Extra tool paths
-rem 
-rem Your paths may be different, adjust accordingly or
-rem set the appropriate environment variables before
-rem running
-rem ==================================================
-
-IF "%JAVA_HOME%" == "" SET JAVA_HOME=C:\Program Files (x86)\Java\jdk1.7.0_80
-IF "%DOXYGEN%" == "" SET DOXYGEN=%MG_DEV%\BuildTools\doxygen
-IF "%GNUWIN32%" == "" SET GNUWIN32=C:\Program Files (x86)\GnuWin32\bin
-IF "%SEVENZ%" == "" SET SEVENZ=%MG_DEV%\BuildTools\WebTools\7-Zip
-IF "%ANT_HOME%" == "" SET ANT_HOME=C:\apache-ant
-
-SET PATH=%PATH%;%DOXYGEN%;%GNUWIN32%;%SEVENZ%;%ANT_HOME%\bin
-rem ==================================================
-rem PHP/httpd env vars for Visual Studio
-rem ==================================================
-
-rem Comment out this line if you intend to build against a different version of PHP/httpd
-rem Be sure to change the paths below as well if that's the case
-call prepare_webtier_components.bat
-
-rem Set the env vars that VS will reference
-SET PHP_SRC=%MG_OEM%\LinuxApt\php-5.6.23
-SET PHP_LIB=%MG_OEM%\php\Release_TS
-SET HTTPD_SRC=%MG_OEM%\LinuxApt\httpd-2.4.18
-SET HTTPD_LIB=%MG_OEM%\httpd\lib
-rem Sanity checks
-if not exist "%PHP_SRC%" echo Environment variable PHP_SRC does not point to a valid directory (%PHP_SRC%). Please edit setenvironment64.bat to ensure PHP_SRC points to a valid directory
-if not exist "%PHP_LIB%\php5ts.lib" echo Environment variable PHP_LIB does not point to a valid directory (%PHP_LIB%). Could not find php5ts.lib in this directory. Please edit setenvironment64.bat to ensure PHP_LIB points to a valid directory
-if not exist "%HTTPD_SRC%" echo Environment variable HTTPD_SRC does not point to a valid directory (%HTTPD_SRC%). Please edit setenvironment64.bat to ensure HTTPD_SRC points to a valid directory
-if not exist "%HTTPD_LIB%\libhttpd.lib" echo Environment variable HTTPD_LIB does not point to a valid directory (%HTTPD_LIB%). Could not find libhttpd.lib in this directory. Please edit setenvironment64.bat to ensure HTTPD_LIB points to a valid directory
-if not exist "%HTTPD_LIB%\libapr-1.lib" echo Environment variable HTTPD_LIB does not point to a valid directory (%HTTPD_LIB%). Could not find libapr-1.lib in this directory. Please edit setenvironment64.bat to ensure HTTPD_LIB points to a valid directory
-if not exist "%HTTPD_LIB%\libaprutil-1.lib" echo Environment variable HTTPD_LIB does not point to a valid directory (%HTTPD_LIB%). Could not find libaprutil-1.lib in this directory. Please edit setenvironment64.bat to ensure HTTPD_LIB points to a valid directory
-
-rem ==================================================
-rem MSBuild Settings
-rem ==================================================
-
-rem If the NUMBER_OF_PROCESSORS environment variable is wrong for any reason. Change this value.
-SET CPU_CORES=%NUMBER_OF_PROCESSORS%
-
-rem Uncomment the line below to enable msbuild logging
-rem SET MSBUILD_LOG=/l:FileLogger,Microsoft.Build.Engine;logfile=Build.log;verbosity=diagnostic
-SET MSBUILD_VERBOSITY=/v:n
-
-rem ==================================================
-rem Command aliases
-rem ==================================================
-SET XCOPY=xcopy /E /Y /I /Q /H
-SET XCOPY_SINGLE=xcopy /Y /I /Q
-SET MSBUILD=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM% %MSBUILD_VERBOSITY% %MSBUILD_LOG%
-SET MSBUILD_CLR=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM_CLR% %MSBUILD_VERBOSITY% %MSBUILD_LOG%
-SET MSBUILD_CLEAN=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM% /t:Clean %MSBUILD_VERBOSITY%
-SET MSBUILD_CLEAN_CLR=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM_CLR% /t:Clean %MSBUILD_VERBOSITY%
-SET ANT=ant
-
-echo ======== Environment Variable Summary =============
-echo PHP_SRC    = %PHP_SRC%
-echo PHP_LIB    = %PHP_LIB%
-echo HTTPD_SRC  = %HTTPD_SRC%
-echo HTTPD_LIB  = %HTTPD_LIB%
-echo Configuration is [%TYPEBUILD%, "%CONFIGURATION%|%PLATFORM%"]
-echo Deployment Directory for Server: %MG_OUTPUT_SERVER%
-echo Deployment Directory for Web: %MG_OUTPUT_WEB%
-echo CPU cores: %CPU_CORES%
-echo =================== FDO ===========================
-echo Binaries: %MG_FDO_BIN%
-echo Headers: %MG_FDO_INC%
-echo Libs: %MG_FDO_LIB%
-echo =================== Oem ===========================
-echo DBXML executables: %MG_BUILD_DBXML_EXE_PATH%
-echo SQLite PHP API: %MG_BUILD_SQLITE_PHP_API%
-echo mod_mgmapagent.so: %MG_BUILD_MAPAGENT%
-echo ===================================================
-echo Type build.bat to build MapGuide
-
-goto done
-
-:help_show
-echo ************************************************************************
-echo Usage: setenvironment.bat [debug|release]
-echo If unspecified, configuration will default to release
-echo ************************************************************************
-:done
\ No newline at end of file

Modified: trunk/MgDev/setenvironment64.bat
===================================================================
--- trunk/MgDev/setenvironment64.bat	2022-10-10 10:10:45 UTC (rev 9974)
+++ trunk/MgDev/setenvironment64.bat	2022-10-10 10:22:05 UTC (rev 9975)
@@ -4,11 +4,6 @@
 rem
 rem Sets the required environment variables for the
 rem build.bat script
-rem
-rem This script must be run from the VS2012 command prompt
-rem 
-rem Cross-compilation is no longer supported by these scripts. 
-rem It's 2013, most of you should have a 64-bit box by now :)
 rem ==================================================
 rem Top-level vars
 rem ==================================================
@@ -56,6 +51,8 @@
 SET MG_COMMON=%MG_DEV%\Common
 SET MG_SERVER=%MG_DEV%\Server
 SET MG_WEB=%MG_DEV%\Web
+SET MG_BINDINGS=%MG_DEV%\Bindings
+SET MG_PORTABLE=%MG_DEV%\Portable
 SET MG_WEB_SRC=%MG_WEB%\src
 SET MG_WEB_BIN=%MG_WEB%\bin
 SET MG_UNIT_TEST=%MG_DEV%\UnitTest
@@ -67,8 +64,6 @@
 
 rem === Intermediate build vars ===
 SET MG_BUILD_DBXML_EXE_PATH=%MG_OEM%\%MG_OEM_DBXML%\bin64\%CONFIGURATION%
-SET MG_BUILD_SQLITE_PHP_API=%MG_OEM%\SQLite\bin\%TYPEBUILD%\php_SQLitePhpApi.dll
-SET MG_BUILD_SQLITE_DOTNET_API=%MG_OEM%\SQLite\bin\%TYPEBUILD%\SQLiteDotNet.dll
 SET MG_BUILD_MAPAGENT_PATH=%MG_WEB_SRC%\mapagent64
 SET MG_BUILD_MAPAGENT=%MG_BUILD_MAPAGENT_PATH%\mod_mgmapagent.so
 
@@ -79,7 +74,7 @@
 SET MG_OUTPUT_TEST=%MG_OUTPUT%\Test
 SET MG_BUILD_COMPONENT=
 
-SET MG_DEFAULT_INSTALLDIR=C:\Program Files\MapGuideOpenSource2.0
+SET MG_DEFAULT_INSTALLDIR=C:\Program Files\OSGeo\MapGuide
 SET MG_ERROR=0
 
 rem ==================================================
@@ -122,9 +117,6 @@
 rem MSBuild Settings
 rem ==================================================
 
-rem If the NUMBER_OF_PROCESSORS environment variable is wrong for any reason. Change this value.
-SET CPU_CORES=%NUMBER_OF_PROCESSORS%
-
 rem Uncomment the line below to enable msbuild logging
 rem SET MSBUILD_LOG=/l:FileLogger,Microsoft.Build.Engine;logfile=Build.log;verbosity=diagnostic
 SET MSBUILD_VERBOSITY=/v:n
@@ -134,10 +126,8 @@
 rem ==================================================
 SET XCOPY=xcopy /E /Y /I /Q /H
 SET XCOPY_SINGLE=xcopy /Y /I /Q
-SET MSBUILD=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM% %MSBUILD_VERBOSITY% %MSBUILD_LOG%
-SET MSBUILD_CLR=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM_CLR% %MSBUILD_VERBOSITY% %MSBUILD_LOG%
-SET MSBUILD_CLEAN=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM% /t:Clean %MSBUILD_VERBOSITY%
-SET MSBUILD_CLEAN_CLR=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM_CLR% /t:Clean %MSBUILD_VERBOSITY%
+SET MSBUILD=msbuild.exe /nologo /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM% %MSBUILD_VERBOSITY% %MSBUILD_LOG%
+SET MSBUILD_CLEAN=msbuild.exe /nologo /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM% /t:Clean %MSBUILD_VERBOSITY%
 SET ANT=ant
 
 echo ======== Environment Variable Summary =============
@@ -155,7 +145,6 @@
 echo Libs: %MG_FDO_LIB%
 echo =================== Oem ===========================
 echo DBXML executables: %MG_BUILD_DBXML_EXE_PATH%
-echo SQLite PHP API: %MG_BUILD_SQLITE_PHP_API%
 echo mod_mgmapagent.so: %MG_BUILD_MAPAGENT%
 echo ===================================================
 echo Type build.bat to build MapGuide

Deleted: trunk/MgDev/svn_excludes.txt
===================================================================
--- trunk/MgDev/svn_excludes.txt	2022-10-10 10:10:45 UTC (rev 9974)
+++ trunk/MgDev/svn_excludes.txt	2022-10-10 10:22:05 UTC (rev 9975)
@@ -1,2 +0,0 @@
-.svn
-_svn
\ No newline at end of file

Deleted: trunk/MgDev/viewer_package_excludes.txt
===================================================================
--- trunk/MgDev/viewer_package_excludes.txt	2022-10-10 10:10:45 UTC (rev 9974)
+++ trunk/MgDev/viewer_package_excludes.txt	2022-10-10 10:22:05 UTC (rev 9975)
@@ -1,48 +0,0 @@
-Backup
-Logs
-Repositories
-FDO
-Dictionaries
-Resources
-Schema
-OSGeo.MapGuide.Desktop.dll
-OSGeo.MapGuide.Viewer.dll
-OSGeo.MapGuide.Viewer.Desktop.dll
-OSGeo.MapGuide.Viewer.xml
-MapGuideDesktopUnmanagedApi.dll
-Platform.ini
-gd.dll
-MgGwsCommon.dll
-MgGwsQueryEngine.dll
-MgGwsResource.dll
-MgDesktop.dll
-MgRenderers.dll
-MgStylization.dll
-ACE.dll
-FoundationUnmanagedApi.dll
-GeometryUnmanagedApi.dll
-GEOS.dll
-MgFoundation.dll
-MgGeometry.dll
-MgMdfModel.dll
-MgMdfParser.dll
-MgPlatformBase.dll
-OSGeo.MapGuide.Foundation.dll
-OSGeo.MapGuide.Geometry.dll
-OSGeo.MapGuide.PlatformBase.dll
-PlatformBaseUnmanagedApi.dll
-xerces-c_3_1mg.dll
-OSGeo.MapGuide.Desktop.dll
-OSGeo.MapGuide.Viewer.dll
-OSGeo.MapGuide.Viewer.Desktop.dll
-maestroapi.key
-DotNetHarness.exe
-DotNetHarness.exe.config
-DotNetUnitTest.exe
-DotNetUnitTest.exe.config
-MapViewerTest.exe
-MapViewerTest.exe.config
-SignMapGuideApi.exe
-UnitTest.exe
-Sheboygan.AppLayout
-MgAppLayout.exe
\ No newline at end of file

