[mapguide-commits] r9823 - sandbox/jng/vanilla_swig

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Fri Dec 4 23:59:33 PST 2020 

Author: jng
Date: 2020-12-04 23:59:31 -0800 (Fri, 04 Dec 2020)
New Revision: 9823

Removed:
   sandbox/jng/vanilla_swig/base_package_excludes.txt
   sandbox/jng/vanilla_swig/csmap_excludes.txt
   sandbox/jng/vanilla_swig/debug64_excludes.txt
   sandbox/jng/vanilla_swig/debug_excludes.txt
   sandbox/jng/vanilla_swig/desktop_package_excludes.txt
   sandbox/jng/vanilla_swig/dll_excludes.txt
   sandbox/jng/vanilla_swig/dotnet_excludes.txt
   sandbox/jng/vanilla_swig/dotnetapi_excludes.txt
   sandbox/jng/vanilla_swig/dotnetxml_excludes.txt
   sandbox/jng/vanilla_swig/java_excludes.txt
   sandbox/jng/vanilla_swig/mapagent_excludes.txt
   sandbox/jng/vanilla_swig/package_excludes.txt
   sandbox/jng/vanilla_swig/pdb_excludes.txt
   sandbox/jng/vanilla_swig/php_excludes.txt
   sandbox/jng/vanilla_swig/release64_excludes.txt
   sandbox/jng/vanilla_swig/release_excludes.txt
   sandbox/jng/vanilla_swig/svn_excludes.txt
   sandbox/jng/vanilla_swig/viewer_package_excludes.txt
Modified:
   sandbox/jng/vanilla_swig/setenvironment64.bat
Log:
- Remove xcopy exclusion files (we'll replace this with a dedicate cleanup script)
- Update setenvironment64.bat to streamline and remove unused settings


Deleted: sandbox/jng/vanilla_swig/base_package_excludes.txt
===================================================================
--- sandbox/jng/vanilla_swig/base_package_excludes.txt	2020-12-05 07:04:40 UTC (rev 9822)
+++ sandbox/jng/vanilla_swig/base_package_excludes.txt	2020-12-05 07:59:31 UTC (rev 9823)
@@ -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

Deleted: sandbox/jng/vanilla_swig/csmap_excludes.txt
===================================================================
--- sandbox/jng/vanilla_swig/csmap_excludes.txt	2020-12-05 07:04:40 UTC (rev 9822)
+++ sandbox/jng/vanilla_swig/csmap_excludes.txt	2020-12-05 07:59:31 UTC (rev 9823)
@@ -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: sandbox/jng/vanilla_swig/debug64_excludes.txt
===================================================================
Deleted: sandbox/jng/vanilla_swig/debug_excludes.txt
===================================================================
Deleted: sandbox/jng/vanilla_swig/desktop_package_excludes.txt
===================================================================
--- sandbox/jng/vanilla_swig/desktop_package_excludes.txt	2020-12-05 07:04:40 UTC (rev 9822)
+++ sandbox/jng/vanilla_swig/desktop_package_excludes.txt	2020-12-05 07:59:31 UTC (rev 9823)
@@ -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: sandbox/jng/vanilla_swig/dll_excludes.txt
===================================================================
--- sandbox/jng/vanilla_swig/dll_excludes.txt	2020-12-05 07:04:40 UTC (rev 9822)
+++ sandbox/jng/vanilla_swig/dll_excludes.txt	2020-12-05 07:59:31 UTC (rev 9823)
@@ -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: sandbox/jng/vanilla_swig/dotnet_excludes.txt
===================================================================
--- sandbox/jng/vanilla_swig/dotnet_excludes.txt	2020-12-05 07:04:40 UTC (rev 9822)
+++ sandbox/jng/vanilla_swig/dotnet_excludes.txt	2020-12-05 07:59:31 UTC (rev 9823)
@@ -1,2 +0,0 @@
-Php
-Java
\ No newline at end of file

Deleted: sandbox/jng/vanilla_swig/dotnetapi_excludes.txt
===================================================================
--- sandbox/jng/vanilla_swig/dotnetapi_excludes.txt	2020-12-05 07:04:40 UTC (rev 9822)
+++ sandbox/jng/vanilla_swig/dotnetapi_excludes.txt	2020-12-05 07:59:31 UTC (rev 9823)
@@ -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: sandbox/jng/vanilla_swig/dotnetxml_excludes.txt
===================================================================
--- sandbox/jng/vanilla_swig/dotnetxml_excludes.txt	2020-12-05 07:04:40 UTC (rev 9822)
+++ sandbox/jng/vanilla_swig/dotnetxml_excludes.txt	2020-12-05 07:59:31 UTC (rev 9823)
@@ -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: sandbox/jng/vanilla_swig/java_excludes.txt
===================================================================
--- sandbox/jng/vanilla_swig/java_excludes.txt	2020-12-05 07:04:40 UTC (rev 9822)
+++ sandbox/jng/vanilla_swig/java_excludes.txt	2020-12-05 07:59:31 UTC (rev 9823)
@@ -1,2 +0,0 @@
-DotNet
-Php
\ No newline at end of file

Deleted: sandbox/jng/vanilla_swig/mapagent_excludes.txt
===================================================================
--- sandbox/jng/vanilla_swig/mapagent_excludes.txt	2020-12-05 07:04:40 UTC (rev 9822)
+++ sandbox/jng/vanilla_swig/mapagent_excludes.txt	2020-12-05 07:59:31 UTC (rev 9823)
@@ -1 +0,0 @@
-mod_mgmapagent
\ No newline at end of file

Deleted: sandbox/jng/vanilla_swig/package_excludes.txt
===================================================================
--- sandbox/jng/vanilla_swig/package_excludes.txt	2020-12-05 07:04:40 UTC (rev 9822)
+++ sandbox/jng/vanilla_swig/package_excludes.txt	2020-12-05 07:59:31 UTC (rev 9823)
@@ -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: sandbox/jng/vanilla_swig/pdb_excludes.txt
===================================================================
--- sandbox/jng/vanilla_swig/pdb_excludes.txt	2020-12-05 07:04:40 UTC (rev 9822)
+++ sandbox/jng/vanilla_swig/pdb_excludes.txt	2020-12-05 07:59:31 UTC (rev 9823)
@@ -1,9 +0,0 @@
-com
-Logs
-Packages
-Repositories
-Resources
-Schema
-Temp
-wfs
-wms
\ No newline at end of file

Deleted: sandbox/jng/vanilla_swig/php_excludes.txt
===================================================================
--- sandbox/jng/vanilla_swig/php_excludes.txt	2020-12-05 07:04:40 UTC (rev 9822)
+++ sandbox/jng/vanilla_swig/php_excludes.txt	2020-12-05 07:59:31 UTC (rev 9823)
@@ -1,2 +0,0 @@
-DotNet
-Java
\ No newline at end of file

Deleted: sandbox/jng/vanilla_swig/release64_excludes.txt
===================================================================
--- sandbox/jng/vanilla_swig/release64_excludes.txt	2020-12-05 07:04:40 UTC (rev 9822)
+++ sandbox/jng/vanilla_swig/release64_excludes.txt	2020-12-05 07:59:31 UTC (rev 9823)
@@ -1,5 +0,0 @@
-.pdb
-.exp
-.lib
-.iobj
-.ipdb
\ No newline at end of file

Deleted: sandbox/jng/vanilla_swig/release_excludes.txt
===================================================================
--- sandbox/jng/vanilla_swig/release_excludes.txt	2020-12-05 07:04:40 UTC (rev 9822)
+++ sandbox/jng/vanilla_swig/release_excludes.txt	2020-12-05 07:59:31 UTC (rev 9823)
@@ -1,5 +0,0 @@
-.pdb
-.exp
-.lib
-.iobj
-.ipdb
\ No newline at end of file

Modified: sandbox/jng/vanilla_swig/setenvironment64.bat
===================================================================
--- sandbox/jng/vanilla_swig/setenvironment64.bat	2020-12-05 07:04:40 UTC (rev 9822)
+++ sandbox/jng/vanilla_swig/setenvironment64.bat	2020-12-05 07:59:31 UTC (rev 9823)
@@ -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 ==================================================
@@ -69,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
 
@@ -81,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 ==================================================
@@ -124,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
@@ -136,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 =============
@@ -157,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: sandbox/jng/vanilla_swig/svn_excludes.txt
===================================================================
--- sandbox/jng/vanilla_swig/svn_excludes.txt	2020-12-05 07:04:40 UTC (rev 9822)
+++ sandbox/jng/vanilla_swig/svn_excludes.txt	2020-12-05 07:59:31 UTC (rev 9823)
@@ -1,2 +0,0 @@
-.svn
-_svn
\ No newline at end of file

Deleted: sandbox/jng/vanilla_swig/viewer_package_excludes.txt
===================================================================
--- sandbox/jng/vanilla_swig/viewer_package_excludes.txt	2020-12-05 07:04:40 UTC (rev 9822)
+++ sandbox/jng/vanilla_swig/viewer_package_excludes.txt	2020-12-05 07:59:31 UTC (rev 9823)
@@ -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

More information about the mapguide-commits mailing list