[mapguide-commits] r8789 - in sandbox/jng/diet_vs2015/MgDev: . Common/Foundation Common/Geometry Common/MapGuideCommon Common/MdfModel Common/MdfParser Common/PlatformBase Common/Renderers Common/Stylization Desktop Desktop/DesktopUnmanagedApi/DotNet Desktop/DesktopUnmanagedApi/JavaApiEx Desktop/MgDesktop Desktop/UnitTest Server/src/Common/Base Server/src/Common/Cache Server/src/Common/Manager Server/src/Common/Thread Server/src/Core Server/src/Gws/GwsCommon Server/src/Gws/GwsQueryEngine Server/src/PostBuild Server/src/Services/Drawing Server/src/Services/Feature Server/src/Services/Kml Server/src/Services/Mapping Server/src/Services/Profiling Server/src/Services/Rendering Server/src/Services/Resource Server/src/Services/ServerAdmin Server/src/Services/Site Server/src/Services/Tile Server/src/UnitTesting Web/src/ApacheAgent Web/src/CgiAgent Web/src/DotNetUnmanagedApi/Foundation Web/src/DotNetUnmanagedApi/Geometry Web/src/DotNetUnmanagedApi/MapGuideCommon Web/src/DotNetUnmanagedApi/PlatformBase Web/src/DotNetUnmanagedApi/Web Web/src/HttpHandler Web/src/IsapiAgent Web/src/JavaApi Web/src/JavaApiEx Web/src/MapAgentCommon Web/src/MapGuideApi Web/src/PhpApi Web/src/PhpMapGuideApiEnvConfig Web/src/WebApp Web/src/WebSupport
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Oct 19 03:53:12 PDT 2015
Author: jng
Date: 2015-10-19 03:53:12 -0700 (Mon, 19 Oct 2015)
New Revision: 8789
Removed:
sandbox/jng/diet_vs2015/MgDev/setenvironment64.bat
Modified:
sandbox/jng/diet_vs2015/MgDev/
sandbox/jng/diet_vs2015/MgDev/Common/Foundation/Foundation.vcxproj
sandbox/jng/diet_vs2015/MgDev/Common/Foundation/Makefile.am
sandbox/jng/diet_vs2015/MgDev/Common/Geometry/Geometry.vcxproj
sandbox/jng/diet_vs2015/MgDev/Common/Geometry/Makefile.am
sandbox/jng/diet_vs2015/MgDev/Common/MapGuideCommon/Makefile.am
sandbox/jng/diet_vs2015/MgDev/Common/MapGuideCommon/MapGuideCommon.vcxproj
sandbox/jng/diet_vs2015/MgDev/Common/MdfModel/MdfModel.vcxproj
sandbox/jng/diet_vs2015/MgDev/Common/MdfParser/Makefile.am
sandbox/jng/diet_vs2015/MgDev/Common/MdfParser/MdfParser.vcxproj
sandbox/jng/diet_vs2015/MgDev/Common/PlatformBase/Makefile.am
sandbox/jng/diet_vs2015/MgDev/Common/PlatformBase/PlatformBase.vcxproj
sandbox/jng/diet_vs2015/MgDev/Common/Renderers/Makefile.am
sandbox/jng/diet_vs2015/MgDev/Common/Renderers/Renderers.vcxproj
sandbox/jng/diet_vs2015/MgDev/Common/Stylization/Makefile.am
sandbox/jng/diet_vs2015/MgDev/Common/Stylization/Stylization.vcxproj
sandbox/jng/diet_vs2015/MgDev/Desktop/
sandbox/jng/diet_vs2015/MgDev/Desktop/DesktopUnmanagedApi/DotNet/DesktopApi.vcxproj
sandbox/jng/diet_vs2015/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/JavaApiEx.vcxproj
sandbox/jng/diet_vs2015/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/Makefile.am
sandbox/jng/diet_vs2015/MgDev/Desktop/MgDesktop/MgDesktop.vcxproj
sandbox/jng/diet_vs2015/MgDev/Desktop/UnitTest/UnitTest.vcxproj
sandbox/jng/diet_vs2015/MgDev/Server/src/Common/Base/Makefile.am
sandbox/jng/diet_vs2015/MgDev/Server/src/Common/Base/ServerBase.vcxproj
sandbox/jng/diet_vs2015/MgDev/Server/src/Common/Cache/Makefile.am
sandbox/jng/diet_vs2015/MgDev/Server/src/Common/Cache/ServerCache.vcxproj
sandbox/jng/diet_vs2015/MgDev/Server/src/Common/Manager/Makefile.am
sandbox/jng/diet_vs2015/MgDev/Server/src/Common/Manager/ServerManager.vcxproj
sandbox/jng/diet_vs2015/MgDev/Server/src/Common/Thread/Makefile.am
sandbox/jng/diet_vs2015/MgDev/Server/src/Common/Thread/ServerThread.vcxproj
sandbox/jng/diet_vs2015/MgDev/Server/src/Core/Makefile.am
sandbox/jng/diet_vs2015/MgDev/Server/src/Core/ServerCore.vcxproj
sandbox/jng/diet_vs2015/MgDev/Server/src/Core/serverconfig.ini
sandbox/jng/diet_vs2015/MgDev/Server/src/Gws/GwsCommon/GwsCommon.vcxproj
sandbox/jng/diet_vs2015/MgDev/Server/src/Gws/GwsCommon/Makefile.am
sandbox/jng/diet_vs2015/MgDev/Server/src/Gws/GwsQueryEngine/GwsQueryEngine.vcxproj
sandbox/jng/diet_vs2015/MgDev/Server/src/PostBuild/PostBuild.mak
sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Drawing/Makefile.am
sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Drawing/ServerDrawingService.vcxproj
sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Feature/Makefile.am
sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Feature/ServerFeatureService.vcxproj
sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Kml/Makefile.am
sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Kml/ServerKmlService.vcxproj
sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Mapping/Makefile.am
sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Mapping/ServerMappingService.vcxproj
sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Profiling/Makefile.am
sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Profiling/ServerProfilingService.vcxproj
sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Rendering/Makefile.am
sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Rendering/ServerRenderingService.vcxproj
sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Resource/Makefile.am
sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Resource/ServerResourceService.vcxproj
sandbox/jng/diet_vs2015/MgDev/Server/src/Services/ServerAdmin/Makefile.am
sandbox/jng/diet_vs2015/MgDev/Server/src/Services/ServerAdmin/ServerAdminService.vcxproj
sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Site/Makefile.am
sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Site/ServerSiteService.vcxproj
sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Tile/Makefile.am
sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Tile/ServerTileService.vcxproj
sandbox/jng/diet_vs2015/MgDev/Server/src/UnitTesting/Makefile.am
sandbox/jng/diet_vs2015/MgDev/Server/src/UnitTesting/UnitTesting.vcxproj
sandbox/jng/diet_vs2015/MgDev/Web/src/ApacheAgent/ApacheAgent.vcxproj
sandbox/jng/diet_vs2015/MgDev/Web/src/ApacheAgent/Makefile.am
sandbox/jng/diet_vs2015/MgDev/Web/src/CgiAgent/CgiAgent.vcxproj
sandbox/jng/diet_vs2015/MgDev/Web/src/CgiAgent/Makefile.am
sandbox/jng/diet_vs2015/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationApi.vcxproj
sandbox/jng/diet_vs2015/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApi.vcxproj
sandbox/jng/diet_vs2015/MgDev/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApi.vcxproj
sandbox/jng/diet_vs2015/MgDev/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApi.vcxproj
sandbox/jng/diet_vs2015/MgDev/Web/src/DotNetUnmanagedApi/Web/WebApi.vcxproj
sandbox/jng/diet_vs2015/MgDev/Web/src/HttpHandler/HttpHandler.vcxproj
sandbox/jng/diet_vs2015/MgDev/Web/src/HttpHandler/Makefile.am
sandbox/jng/diet_vs2015/MgDev/Web/src/IsapiAgent/IsapiAgent.vcxproj
sandbox/jng/diet_vs2015/MgDev/Web/src/JavaApi/JavaApi.vcxproj
sandbox/jng/diet_vs2015/MgDev/Web/src/JavaApi/Makefile.am
sandbox/jng/diet_vs2015/MgDev/Web/src/JavaApiEx/JavaApiEx.vcxproj
sandbox/jng/diet_vs2015/MgDev/Web/src/JavaApiEx/Makefile.am
sandbox/jng/diet_vs2015/MgDev/Web/src/MapAgentCommon/MapAgentCommon.vcxproj
sandbox/jng/diet_vs2015/MgDev/Web/src/MapGuideApi/copydlls.bat
sandbox/jng/diet_vs2015/MgDev/Web/src/PhpApi/Makefile.am
sandbox/jng/diet_vs2015/MgDev/Web/src/PhpApi/PhpApi.vcxproj
sandbox/jng/diet_vs2015/MgDev/Web/src/PhpMapGuideApiEnvConfig/PhpMapGuideApiEnvConfig.vcxproj
sandbox/jng/diet_vs2015/MgDev/Web/src/WebApp/Makefile.am
sandbox/jng/diet_vs2015/MgDev/Web/src/WebApp/WebApp.vcxproj
sandbox/jng/diet_vs2015/MgDev/Web/src/WebSupport/Makefile.am
sandbox/jng/diet_vs2015/MgDev/Web/src/WebSupport/WebSupport.vcxproj
sandbox/jng/diet_vs2015/MgDev/build.bat
sandbox/jng/diet_vs2015/MgDev/configure.in
sandbox/jng/diet_vs2015/MgDev/prebuild.sh
sandbox/jng/diet_vs2015/MgDev/setenvironment.bat
Log:
Merged revision(s) 8641-8642, 8644-8645, 8653, 8655, 8668, 8670-8671, 8673-8674, 8680 from sandbox/jng/diet:
Modify the server projects to use the OEM component environment variables for include and linker settings
The PostBuild project has not been modified and is currently broken as a result of this change. The PostBuild.mak makefile will require re-jigging to work against our new scheme.
........
Modify the WebTier projects to use the OEM component environment variables for include and linker settings
The PostBuild and MapGuideApi projects has not been modified and is currently broken as a result of this change. Their respective files will require re-jigging to work against our new scheme.
........
Fix and simplify PostBuild.mak to work in our new tree layout. Also change default MentorDictionaryPath to allow for command-line unit test or IDE debug/run without modifying serverconfig.ini. Debug/run without modifying serverconfig.ini assumes the following layout:
* A checkout of MgDev is in $WORKING_COPY\MgDev
* A checkout of Oem is in $WORKING_COPY\Oem
........
Fix typo
........
Consolidate setenvironment.bat and setenvironment64.bat
........
Update mg-desktop projects to use new environment variables
........
Update our Makefiles to use parameterized Oem component paths
........
Fix DWF Toolkit linker paths
........
Fix cppunit and DWF Toolkit paths
........
Fix syntax error. I guess autotools Ubuntu was more lenient.
........
set executable bit on prebuild.sh
........
Update copydlls.bat to use our environment variable paths
........
Property changes on: sandbox/jng/diet_vs2015/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315,8318,8335,8340,8354-8355,8365,8373
/branches/3.0/MgDev:8705,8710
/sandbox/VC140:8684-8759
/sandbox/adsk/2.6l:8727
/sandbox/adsk/3.0m:8563,8584,8607,8625,8694-8695
/sandbox/jng/convenience_apis:8262-8268,8271-8363
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/dwftk:8321-8324,8328-8329,8331,8352
/sandbox/jng/geos34x:8256-8259
/sandbox/jng/tiling:8174-8208
/sandbox/jng/v30:8212-8227
/sandbox/rfc94:5099-5163
+ /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315,8318,8335,8340,8354-8355,8365,8373
/branches/3.0/MgDev:8705,8710
/sandbox/VC140:8684-8759
/sandbox/adsk/2.6l:8727
/sandbox/adsk/3.0m:8563,8584,8607,8625,8694-8695
/sandbox/jng/convenience_apis:8262-8268,8271-8363
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/diet:8641-8642,8644-8645,8653,8655,8668,8670-8671,8673-8674,8680
/sandbox/jng/dwftk:8321-8324,8328-8329,8331,8352
/sandbox/jng/geos34x:8256-8259
/sandbox/jng/tiling:8174-8208
/sandbox/jng/v30:8212-8227
/sandbox/rfc94:5099-5163
Modified: sandbox/jng/diet_vs2015/MgDev/Common/Foundation/Foundation.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Common/Foundation/Foundation.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Common/Foundation/Foundation.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\MdfModel;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\MdfModel;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FOUNDATION_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -106,7 +106,7 @@
<Link>
<AdditionalDependencies>ACEd.lib;xerces-c_3mgD.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgFoundationd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgFoundationd.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -120,7 +120,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\MdfModel;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\MdfModel;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FOUNDATION_EXPORTS;__LITTLE_ENDIAN__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -132,7 +132,7 @@
<Link>
<AdditionalDependencies>ACEd.lib;xerces-c_3mgD.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgFoundationd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgFoundationd.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -143,7 +143,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\MdfModel;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\MdfModel;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FOUNDATION_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
<Link>
<AdditionalDependencies>ACE.lib;xerces-c_3mg.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgFoundation.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgFoundation.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -170,7 +170,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\MdfModel;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\MdfModel;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FOUNDATION_EXPORTS;__LITTLE_ENDIAN__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -179,9 +179,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;xerces-c_3mg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgFoundation.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgFoundation.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: sandbox/jng/diet_vs2015/MgDev/Common/Foundation/Makefile.am
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Common/Foundation/Makefile.am 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Common/Foundation/Makefile.am 2015-10-19 10:53:12 UTC (rev 8789)
@@ -230,8 +230,8 @@
-ISystem \
-I../Security \
-I../MdfModel \
- -I../../Oem/ACE/ACE_wrappers \
- -I../../Oem/dbxml/xerces-c-src/src
+ -I$(mg_oem_ace_src)/ACE_wrappers \
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src
libMgFoundation_la_LIBADD = \
-lACE \
@@ -240,7 +240,7 @@
-lxerces-c
libMgFoundation_la_LDFLAGS = -release $(PACKAGE_VERSION) \
- -L../../Oem/ACE/ACE_wrappers/ace \
- -L../../Oem/dbxml/install/lib \
+ -L$(mg_oem_ace_src)/ACE_wrappers/ace \
+ -L$(mg_oem_dbxml_src)/install/lib \
-L../MdfParser \
-L../MdfModel
Modified: sandbox/jng/diet_vs2015/MgDev/Common/Geometry/Geometry.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Common/Geometry/Geometry.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Common/Geometry/Geometry.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\CoordinateSystem;..\Foundation;..\Geometry;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\geos\include;..\..\Oem\CsMap\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\CoordinateSystem;..\Foundation;..\Geometry;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_GEOS_INC_DIR);$(MG_OEM_CSMAP_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GEOMETRY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -103,9 +103,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>csmapd.lib;ACEd.lib;GEOSd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_CSMAP_LIBS);$(MG_OEM_ACE_LIBS);$(MG_OEM_GEOS_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgGeometryd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\CsMap\lib140\$(Configuration);..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\Oem\geos\VisualStudio\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_CSMAP_LIB_DIR);$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_GEOS_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -120,7 +120,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\CoordinateSystem;..\Foundation;..\Geometry;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\geos\include;..\..\Oem\CsMap\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\CoordinateSystem;..\Foundation;..\Geometry;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_GEOS_INC_DIR);$(MG_OEM_CSMAP_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GEOMETRY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -129,9 +129,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>csmapd.lib;ACEd.lib;GEOSd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_CSMAP_LIBS);$(MG_OEM_ACE_LIBS);$(MG_OEM_GEOS_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgGeometryd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\CsMap\lib140\$(Configuration)64;..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\Oem\geos\VisualStudio\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_CSMAP_LIB_DIR);$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_GEOS_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<ImportLibrary>..\lib\$(Configuration)64\MgGeometryd.lib</ImportLibrary>
@@ -143,7 +143,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\CoordinateSystem;..\Foundation;..\Geometry;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\geos\include;..\..\Oem\CsMap\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\CoordinateSystem;..\Foundation;..\Geometry;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_GEOS_INC_DIR);$(MG_OEM_CSMAP_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GEOMETRY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -151,9 +151,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>csmap.lib;ACE.lib;GEOS.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_CSMAP_LIBS);$(MG_OEM_ACE_LIBS);$(MG_OEM_GEOS_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgGeometry.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\CsMap\lib140\$(Configuration);..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\Oem\geos\VisualStudio\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_CSMAP_LIB_DIR);$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_GEOS_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -170,7 +170,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\CoordinateSystem;..\Foundation;..\Geometry;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\geos\include;..\..\Oem\CsMap\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\CoordinateSystem;..\Foundation;..\Geometry;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_GEOS_INC_DIR);$(MG_OEM_CSMAP_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GEOMETRY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -178,9 +178,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>csmap.lib;ACE.lib;GEOS.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_CSMAP_LIBS);$(MG_OEM_ACE_LIBS);$(MG_OEM_GEOS_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgGeometry.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\CsMap\lib140\$(Configuration)64;..\..\Oem\ACE\ACE_Wrappers\lib64\$(Configuration);..\..\Oem\geos\VisualStudio\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_CSMAP_LIB_DIR);$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_GEOS_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
Modified: sandbox/jng/diet_vs2015/MgDev/Common/Geometry/Makefile.am
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Common/Geometry/Makefile.am 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Common/Geometry/Makefile.am 2015-10-19 10:53:12 UTC (rev 8789)
@@ -444,21 +444,21 @@
-I../MdfModel \
-I../Foundation \
-I../Geometry \
- -I../../Oem/ACE/ACE_wrappers \
- -I../../Oem/geos/include \
- -I../../Oem/dbxml/xerces-c-src/src \
- -I../../Oem/CsMap/Include \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
+ -I$(mg_oem_geos_src)/include \
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src \
+ -I$(mg_oem_csmap_src)/Include \
-I../../Common/CoordinateSystem
libMgGeometry_la_LIBADD = \
-lACE \
-lMgFoundation \
- ../../Oem/CsMap/.libs/libCsmap.a \
- ../../Oem/geos/src/.libs/libgeos.a
+ $(mg_oem_csmap_src)/.libs/libCsmap.a \
+ $(mg_oem_geos_src)/src/.libs/libgeos.a
libMgGeometry_la_LDFLAGS = -release $(PACKAGE_VERSION) \
- -L../../Oem/ACE/ACE_wrappers/ace \
+ -L$(mg_oem_ace_src)/ACE_wrappers/ace \
-L../Foundation \
- -L../../Oem/CsMap \
+ -L$(mg_oem_csmap_src) \
-L../../Common/CoordinateSystem
Modified: sandbox/jng/diet_vs2015/MgDev/Common/MapGuideCommon/Makefile.am
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Common/MapGuideCommon/Makefile.am 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Common/MapGuideCommon/Makefile.am 2015-10-19 10:53:12 UTC (rev 8789)
@@ -272,9 +272,9 @@
-I../MdfModel \
-I../Foundation \
-I../Geometry \
- -I../../Oem/ACE/ACE_wrappers \
- -I../../Oem/geos/source/headers \
- -I../../Oem/dbxml/xerces-c-src/src
+ -I$(mg_oem_ace_src)/ACE_wrappers \
+ -I$(mg_oem_geos_src)/source/headers \
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src
libMgMapGuideCommon_la_LIBADD = \
-lACE \
@@ -286,7 +286,7 @@
-lMgSecurity
libMgMapGuideCommon_la_LDFLAGS = -release $(PACKAGE_VERSION) \
- -L../../Oem/ACE/ACE_wrappers/ace \
+ -L$(mg_oem_ace_src)/ACE_wrappers/ace \
-L../PlatformBase \
-L../Foundation \
-L../Geometry \
Modified: sandbox/jng/diet_vs2015/MgDev/Common/MapGuideCommon/MapGuideCommon.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Common/MapGuideCommon/MapGuideCommon.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Common/MapGuideCommon/MapGuideCommon.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\Foundation;..\PlatformBase;..\Geometry;..\Security;..\MdfModel;..\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\Foundation;..\PlatformBase;..\Geometry;..\Security;..\MdfModel;..\MdfParser;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MAPGUIDECOMMON_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -103,9 +103,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgMapGuideCommond.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -120,7 +120,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\Foundation;..\PlatformBase;..\Geometry;..\Security;..\MdfModel;..\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\Foundation;..\PlatformBase;..\Geometry;..\Security;..\MdfModel;..\MdfParser;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MAPGUIDECOMMON_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -129,9 +129,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgMapGuideCommond.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -146,7 +146,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\Foundation;..\PlatformBase;..\Geometry;..\Security;..\MdfModel;..\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\Foundation;..\PlatformBase;..\Geometry;..\Security;..\MdfModel;..\MdfParser;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MAPGUIDECOMMON_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -154,9 +154,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgMapGuideCommon.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -173,7 +173,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\Foundation;..\PlatformBase;..\Geometry;..\Security;..\MdfModel;..\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\Foundation;..\PlatformBase;..\Geometry;..\Security;..\MdfModel;..\MdfParser;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MAPGUIDECOMMON_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -181,9 +181,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgMapGuideCommon.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
Modified: sandbox/jng/diet_vs2015/MgDev/Common/MdfModel/MdfModel.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Common/MdfModel/MdfModel.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Common/MdfModel/MdfModel.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -95,7 +95,7 @@
<ClCompile>
<AdditionalOptions>$(USRCFLAGS) %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MDFMODEL_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_VS2010;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -121,7 +121,7 @@
<ClCompile>
<AdditionalOptions>$(USRCFLAGS) %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MDFMODEL_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -146,7 +146,7 @@
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<OmitFramePointers>true</OmitFramePointers>
- <AdditionalIncludeDirectories>..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MDFMODEL_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
@@ -176,7 +176,7 @@
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<OmitFramePointers>true</OmitFramePointers>
- <AdditionalIncludeDirectories>..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MDFMODEL_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
Modified: sandbox/jng/diet_vs2015/MgDev/Common/MdfParser/Makefile.am
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Common/MdfParser/Makefile.am 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Common/MdfParser/Makefile.am 2015-10-19 10:53:12 UTC (rev 8789)
@@ -4,7 +4,7 @@
INCLUDES = \
-I../MdfModel/ \
- -I../../Oem/dbxml/xerces-c-src/src/
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src/
lib_LTLIBRARIES = libMgMdfParser.la
@@ -242,4 +242,4 @@
libMgMdfParser_la_LDFLAGS = -release $(PACKAGE_VERSION) \
-L../MdfModel \
- -L../../Oem/dbxml/install/lib
+ -L$(mg_oem_dbxml_src)/install/lib
Modified: sandbox/jng/diet_vs2015/MgDev/Common/MdfParser/MdfParser.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Common/MdfParser/MdfParser.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Common/MdfParser/MdfParser.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -95,7 +95,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\MdfModel;..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\MdfModel;$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MDFPARSER_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -106,9 +106,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>xerces-c_3mgD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_XERCES_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgMdfParserd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_XERCES_LIB_DIR)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgMdfParserd.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -122,7 +122,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\MdfModel;..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\MdfModel;$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MDFPARSER_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -133,9 +133,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>xerces-c_3mgD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_XERCES_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgMdfParserd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_XERCES_LIB_DIR)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgMdfParserd.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -146,7 +146,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\MdfModel;..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\MdfModel;$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MDFPARSER_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -155,9 +155,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>xerces-c_3mg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_XERCES_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgMdfParser.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_XERCES_LIB_DIR)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgMdfParser.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -173,7 +173,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\MdfModel;..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\MdfModel;$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MDFPARSER_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -182,9 +182,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>xerces-c_3mg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_XERCES_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgMdfParser.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_XERCES_LIB_DIR)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgMdfParser.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: sandbox/jng/diet_vs2015/MgDev/Common/PlatformBase/Makefile.am
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Common/PlatformBase/Makefile.am 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Common/PlatformBase/Makefile.am 2015-10-19 10:53:12 UTC (rev 8789)
@@ -249,9 +249,9 @@
-I../MdfModel \
-I../Foundation \
-I../Geometry \
- -I../../Oem/ACE/ACE_wrappers \
- -I../../Oem/geos/source/headers \
- -I../../Oem/dbxml/xerces-c-src/src
+ -I$(mg_oem_ace_src)/ACE_wrappers \
+ -I$(mg_oem_geos_src)source/headers \
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src
libMgPlatformBase_la_LIBADD = \
-lACE \
@@ -261,7 +261,7 @@
-lMgGeometry
libMgPlatformBase_la_LDFLAGS = -release $(PACKAGE_VERSION) \
- -L../../Oem/ACE/ACE_wrappers/ace \
+ -L$(mg_oem_ace_src)/ACE_wrappers/ace \
-L../Foundation \
-L../Geometry \
-L../../Common/CoordinateSystem \
Modified: sandbox/jng/diet_vs2015/MgDev/Common/PlatformBase/PlatformBase.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Common/PlatformBase/PlatformBase.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Common/PlatformBase/PlatformBase.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\MdfModel;..\MdfParser;..\Foundation;..\Geometry;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\MdfModel;..\MdfParser;..\Foundation;..\Geometry;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PLATFORMBASE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -103,9 +103,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgPlatformBased.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -118,7 +118,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\MdfModel;..\MdfParser;..\Foundation;..\Geometry;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\MdfModel;..\MdfParser;..\Foundation;..\Geometry;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PLATFORMBASE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -127,9 +127,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgPlatformBased.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<ImportLibrary>..\lib\$(Configuration)64\MgPlatformBased.lib</ImportLibrary>
@@ -139,7 +139,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\MdfModel;..\MdfParser;..\Foundation;..\Geometry;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\MdfModel;..\MdfParser;..\Foundation;..\Geometry;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PLATFORMBASE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -147,9 +147,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgPlatformBase.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -164,7 +164,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\MdfModel;..\MdfParser;..\Foundation;..\Geometry;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\MdfModel;..\MdfParser;..\Foundation;..\Geometry;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PLATFORMBASE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -172,9 +172,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgPlatformBase.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
Modified: sandbox/jng/diet_vs2015/MgDev/Common/Renderers/Makefile.am
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Common/Renderers/Makefile.am 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Common/Renderers/Makefile.am 2015-10-19 10:53:12 UTC (rev 8789)
@@ -7,11 +7,11 @@
-I../Stylization/ \
-I$(map_fdo_include) \
-I$(map_fdo_include)/ExpressionEngine \
- -I../../Oem/DWFTK/develop/global/src/ \
- -I../../Oem/DWFTK/develop/global/src/dwf/ \
- -I../../Oem/gd/gd/ \
- -I../../Oem/gd/lpng \
- -I../../Oem/gd/freetype/include/ \
+ -I$(mg_oem_dwftk_src)/develop/global/src/ \
+ -I$(mg_oem_dwftk_src)/develop/global/src/dwf/ \
+ -I$(mg_oem_gd_src)/ \
+ -I$(mg_oem_libpng_src)/ \
+ -I$(mg_oem_freetype_src)/include/ \
-I../../Oem/agg-2.4/include \
-I../../Oem/agg-2.4/font_freetype
@@ -82,14 +82,14 @@
AM_CXXFLAGS = @CXXFLAGS@ -DDWFTK_BUILD_EXPAT
libMgRenderers_la_LIBADD = \
- ../../Oem/gd/gd/.libs/libgd.a \
- ../../Oem/gd/freetype/objs/.libs/libfreetype.a \
- ../../Oem/gd/jpeg/.libs/libjpeg.a \
- ../../Oem/gd/lpng/libpng.a \
+ $(mg_oem_gd_src)/.libs/libgd.a \
+ $(mg_oem_freetype_src)/objs/.libs/libfreetype.a \
+ $(mg_oem_libjpeg_src)/.libs/libjpeg.a \
+ $(mg_oem_libpng_src)/libpng.a \
../../Oem/agg-2.4/src/libagg.a \
-ldwfcore \
-ldwftk
libMgRenderers_la_LDFLAGS = -release $(PACKAGE_VERSION) \
- -L../../Oem/DWFTK/develop/global/src/dwfcore/.libs \
- -L../../Oem/DWFTK/develop/global/src/dwf/.libs
+ -L$(mg_oem_dwftk_src)/develop/global/src/dwfcore/.libs \
+ -L$(mg_oem_dwftk_src)/develop/global/src/dwf/.libs
Modified: sandbox/jng/diet_vs2015/MgDev/Common/Renderers/Renderers.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Common/Renderers/Renderers.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Common/Renderers/Renderers.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -95,7 +95,7 @@
<ClCompile>
<AdditionalOptions>$(USRCFLAGS) %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\MdfModel;..\Stylization;..\..\Oem\FDO\inc;..\..\Oem\FDO\inc\ExpressionEngine;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Oem\gd\gd;..\..\Oem\gd\freetype\include;..\..\Oem\agg-2.4\include;..\..\Oem\agg-2.4\font_freetype;..\..\Oem\gd\lpng;..\..\Oem\gd\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\MdfModel;..\Stylization;$(MG_OEM_FDO_INC_DIR);$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_DWFTK_INC_DIR)\dwf;$(MG_OEM_GD_INC_DIR);$(MG_OEM_FREETYPE_INC_DIR);..\..\Oem\agg-2.4\include;$(MG_OEM_LIBPNG_INC_DIR);..\..\Oem\agg-2.4\font_freetype;$(MG_OEM_ZLIB_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;RENDERERS_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -105,9 +105,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>dwfcore_wt.1.7.0.lib;dwftk_wt.7.7.0.lib;w3dtk_wt.1.7.1555.lib;whiptk_wt.7.13.601.lib;gd.lib;freetype235_D.lib;libpngd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_DWFTK_LIBS_RENDERERS);$(MG_OEM_GD_LIBS);$(MG_OEM_FREETYPE_LIBS);$(MG_OEM_LIBPNG_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgRenderersd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration)\vc10.0;..\..\Oem\gd\build\win32\gd\$(Configuration);..\..\Oem\gd\freetype\objs\$(Configuration);..\..\Oem\gd\lpng\projects\vs\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_DWFTK_LIB_DIR);$(MG_OEM_GD_LIB_DIR);$(MG_OEM_FREETYPE_LIB_DIR);$(MG_OEM_LIBPNG_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgRenderersd.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -124,7 +124,7 @@
<ClCompile>
<AdditionalOptions>$(USRCFLAGS) %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\MdfModel;..\Stylization;..\..\Oem\FDO\inc;..\..\Oem\FDO\inc\ExpressionEngine;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Oem\gd\gd;..\..\Oem\gd\freetype\include;..\..\Oem\agg-2.4\include;..\..\Oem\agg-2.4\font_freetype;..\..\Oem\gd\lpng;..\..\Oem\gd\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\MdfModel;..\Stylization;$(MG_OEM_FDO_INC_DIR);$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_DWFTK_INC_DIR)\dwf;$(MG_OEM_GD_INC_DIR);$(MG_OEM_FREETYPE_INC_DIR);..\..\Oem\agg-2.4\include;$(MG_OEM_LIBPNG_INC_DIR);..\..\Oem\agg-2.4\font_freetype;$(MG_OEM_ZLIB_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;RENDERERS_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -134,9 +134,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>dwfcore_wt.1.7.0.lib;dwftk_wt.7.7.0.lib;w3dtk_wt.1.7.1555.lib;whiptk_wt.7.13.601.lib;gd.lib;freetype235_D.lib;libpngd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_DWFTK_LIBS_RENDERERS);$(MG_OEM_GD_LIBS);$(MG_OEM_FREETYPE_LIBS);$(MG_OEM_LIBPNG_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgRenderersd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\DWFTK\develop\global\lib\x64\static\$(Configuration)\vc10.0;..\..\Oem\gd\build\win32\gd\$(Configuration)64;..\..\Oem\gd\freetype\objs\$(Configuration)64;..\..\Oem\gd\lpng\projects\vs\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_DWFTK_LIB_DIR);$(MG_OEM_GD_LIB_DIR);$(MG_OEM_FREETYPE_LIB_DIR);$(MG_OEM_LIBPNG_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgRenderersd.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -154,7 +154,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
- <AdditionalIncludeDirectories>..\MdfModel;..\Stylization;..\..\Oem\FDO\inc;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Oem\gd\gd;..\..\Oem\gd\freetype\include;..\..\Oem\agg-2.4\include;..\..\Oem\gd\lpng;..\..\Oem\agg-2.4\font_freetype;..\..\Oem\gd\zlib;..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\MdfModel;..\Stylization;$(MG_OEM_FDO_INC_DIR);$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_DWFTK_INC_DIR)\dwf;$(MG_OEM_GD_INC_DIR);$(MG_OEM_FREETYPE_INC_DIR);..\..\Oem\agg-2.4\include;$(MG_OEM_LIBPNG_INC_DIR);..\..\Oem\agg-2.4\font_freetype;$(MG_OEM_ZLIB_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;RENDERERS_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -164,9 +164,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>dwfcore_wt.1.7.0.lib;dwftk_wt.7.7.0.lib;w3dtk_wt.1.7.1555.lib;whiptk_wt.7.13.601.lib;gd.lib;freetype235.lib;libpng.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_DWFTK_LIBS_RENDERERS);$(MG_OEM_GD_LIBS);$(MG_OEM_FREETYPE_LIBS);$(MG_OEM_LIBPNG_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgRenderers.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration)\vc10.0;..\..\Oem\gd\build\win32\gd\$(Configuration);..\..\Oem\gd\freetype\objs\$(Configuration);..\..\Oem\gd\lpng\projects\vs\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_DWFTK_LIB_DIR);$(MG_OEM_GD_LIB_DIR);$(MG_OEM_FREETYPE_LIB_DIR);$(MG_OEM_LIBPNG_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgRenderers.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -189,7 +189,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
- <AdditionalIncludeDirectories>..\MdfModel;..\Stylization;..\..\Oem\FDO\inc;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Oem\gd\gd;..\..\Oem\gd\freetype\include;..\..\Oem\agg-2.4\include;..\..\Oem\gd\lpng;..\..\Oem\agg-2.4\font_freetype;..\..\Oem\gd\zlib;..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\MdfModel;..\Stylization;$(MG_OEM_FDO_INC_DIR);$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_DWFTK_INC_DIR)\dwf;$(MG_OEM_GD_INC_DIR);$(MG_OEM_FREETYPE_INC_DIR);..\..\Oem\agg-2.4\include;$(MG_OEM_LIBPNG_INC_DIR);..\..\Oem\agg-2.4\font_freetype;$(MG_OEM_ZLIB_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;RENDERERS_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -199,9 +199,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>dwfcore_wt.1.7.0.lib;dwftk_wt.7.7.0.lib;w3dtk_wt.1.7.1555.lib;whiptk_wt.7.13.601.lib;gd.lib;freetype235.lib;libpng.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_DWFTK_LIBS_RENDERERS);$(MG_OEM_GD_LIBS);$(MG_OEM_FREETYPE_LIBS);$(MG_OEM_LIBPNG_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgRenderers.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\DWFTK\develop\global\lib\x64\static\$(Configuration)\vc10.0;..\..\Oem\gd\build\win32\gd\$(Configuration)64;..\..\Oem\gd\freetype\objs\$(Configuration)64;..\..\Oem\gd\lpng\projects\vs\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_DWFTK_LIB_DIR);$(MG_OEM_GD_LIB_DIR);$(MG_OEM_FREETYPE_LIB_DIR);$(MG_OEM_LIBPNG_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgRenderers.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: sandbox/jng/diet_vs2015/MgDev/Common/Stylization/Makefile.am
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Common/Stylization/Makefile.am 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Common/Stylization/Makefile.am 2015-10-19 10:53:12 UTC (rev 8789)
@@ -7,7 +7,7 @@
-I../Foundation \
-I$(map_fdo_include) \
-I$(map_fdo_include)/ExpressionEngine \
- -I../../Oem/ACE/ACE_wrappers
+ -I$(mg_oem_ace_src)/ACE_wrappers
lib_LTLIBRARIES = libMgStylization.la
Modified: sandbox/jng/diet_vs2015/MgDev/Common/Stylization/Stylization.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Common/Stylization/Stylization.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Common/Stylization/Stylization.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -95,7 +95,7 @@
<ClCompile>
<AdditionalOptions>$(USRCFLAGS) %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\MdfModel;..\Foundation;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\FDO\inc;..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\MdfModel;..\Foundation;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;STYLIZATION_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -107,7 +107,7 @@
<Link>
<AdditionalDependencies>FDO.lib;FDOCommon.lib;ExpressionEngine.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgStylizationd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\FDO\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_FDO_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgStylizationd.pdb</ProgramDatabaseFile>
@@ -125,7 +125,7 @@
<ClCompile>
<AdditionalOptions>$(USRCFLAGS) %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\MdfModel;..\Foundation;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\FDO\inc;..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\MdfModel;..\Foundation;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;STYLIZATION_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -138,7 +138,7 @@
<Link>
<AdditionalDependencies>FDO.lib;FDOCommon.lib;ExpressionEngine.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgStylizationd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_FDO_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgStylizationd.pdb</ProgramDatabaseFile>
@@ -157,7 +157,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
- <AdditionalIncludeDirectories>..\MdfModel;..\Foundation;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\FDO\inc;..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\MdfModel;..\Foundation;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;STYLIZATION_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -168,7 +168,7 @@
<Link>
<AdditionalDependencies>FDO.lib;FDOCommon.lib;ExpressionEngine.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgStylization.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\FDO\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_FDO_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgStylization.pdb</ProgramDatabaseFile>
@@ -192,7 +192,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
- <AdditionalIncludeDirectories>..\MdfModel;..\Foundation;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\FDO\inc;..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\MdfModel;..\Foundation;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;STYLIZATION_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -203,7 +203,7 @@
<Link>
<AdditionalDependencies>FDO.lib;FDOCommon.lib;ExpressionEngine.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgStylization.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_FDO_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgStylization.pdb</ProgramDatabaseFile>
Property changes on: sandbox/jng/diet_vs2015/MgDev/Desktop
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev/Desktop:7152
/branches/2.5/MgDev/Desktop:7511
/branches/2.6/MgDev/Desktop:8276-8286,8314-8315
/branches/3.0/MgDev/Desktop:8710
/sandbox/jng/convenience_apis/Desktop:8271-8363
/sandbox/jng/createruntimemap/Desktop:7486-7555
/sandbox/jng/dwftk/Desktop:8321-8324,8328-8329,8331,8352
/sandbox/jng/geos34x/Desktop:8256-8259
/sandbox/jng/v30/Desktop:8215-8216,8218-8219
/sandbox/rfc94/Desktop:5099-5163
+ /branches/2.4/MgDev/Desktop:7152
/branches/2.5/MgDev/Desktop:7511
/branches/2.6/MgDev/Desktop:8276-8286,8314-8315
/branches/3.0/MgDev/Desktop:8710
/sandbox/jng/convenience_apis/Desktop:8271-8363
/sandbox/jng/createruntimemap/Desktop:7486-7555
/sandbox/jng/diet/Desktop:8655,8668,8670-8671,8673-8674,8680
/sandbox/jng/dwftk/Desktop:8321-8324,8328-8329,8331,8352
/sandbox/jng/geos34x/Desktop:8256-8259
/sandbox/jng/v30/Desktop:8215-8216,8218-8219
/sandbox/rfc94/Desktop:5099-5163
Modified: sandbox/jng/diet_vs2015/MgDev/Desktop/DesktopUnmanagedApi/DotNet/DesktopApi.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Desktop/DesktopUnmanagedApi/DotNet/DesktopApi.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Desktop/DesktopUnmanagedApi/DotNet/DesktopApi.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -77,15 +77,15 @@
<PreBuildEvent>
<Command>del /Q DesktopCustom\*prop
IF NOT EXIST DesktopCustom mkdir DesktopCustom
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideDesktopConstants.xml C# ./MapGuideDesktopConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\MapGuideDesktopConstants.xml C# ./MapGuideDesktopConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideDesktopApiGen.xml C#
-..\..\..\Oem\SWIGEx\Win32\swig -c++ -csharp -dllname MapGuideDesktopUnmanagedApi -namespace OSGeo.MapGuide -proxydir .\DesktopCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgDesktopApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideDesktopApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\MapGuideDesktopApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -dllname MapGuideDesktopUnmanagedApi -namespace OSGeo.MapGuide -proxydir .\DesktopCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgDesktopApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideDesktopApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\FDO\Inc;..\..\..\Oem\FDO\Inc\ExpressionEngine;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\DWFTK\develop\global\src;..\..\..\Oem\DWFTK\develop\global\src\dwf;..\..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;..\..\..\Common\Renderers;..\..\..\Common\Stylization;$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_DWFTK_INC_DIR)\dwf;..\..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,9 +94,9 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>MgDesktopd.lib;FDO.lib;FDOCommon.lib;ACEd.lib;MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;xerces-c_3mgD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>MgDesktopd.lib;FDO.lib;FDOCommon.lib;$(MG_OEM_ACE_LIBS);MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;$(MG_OEM_XERCES_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\bin\debug\MapGuideDesktopUnmanagedApi.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Lib\Debug;..\..\..\Common\lib\$(Configuration);..\..\..\Oem\FDO\Lib;..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\Lib\Debug;..\..\..\Common\lib\$(Configuration);$(MG_OEM_FDO_LIB_DIR);$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ImportLibrary>..\lib\debug\MapGuideDesktopUnmanagedApi.lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
@@ -106,16 +106,16 @@
<PreBuildEvent>
<Command>del /Q DesktopCustom\*prop
IF NOT EXIST DesktopCustom mkdir DesktopCustom
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideDesktopConstants.xml C# ./MapGuideDesktopConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\MapGuideDesktopConstants.xml C# ./MapGuideDesktopConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideDesktopApiGen.xml C#
-..\..\..\Oem\SWIGEx\Win32\swig -c++ -csharp -dllname MapGuideDesktopUnmanagedApi -namespace OSGeo.MapGuide -proxydir .\DesktopCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgDesktopApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideDesktopApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\MapGuideDesktopApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -dllname MapGuideDesktopUnmanagedApi -namespace OSGeo.MapGuide -proxydir .\DesktopCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgDesktopApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideDesktopApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\FDO\Inc;..\..\..\Oem\FDO\Inc\ExpressionEngine;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\DWFTK\develop\global\src;..\..\..\Oem\DWFTK\develop\global\src\dwf;..\..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;..\..\..\Common\Renderers;..\..\..\Common\Stylization;$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_DWFTK_INC_DIR)\dwf;..\..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -123,9 +123,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>MgDesktop.lib;FDO.lib;FDOCommon.lib;ACE.lib;MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;xerces-c_3mg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>MgDesktop.lib;FDO.lib;FDOCommon.lib;$(MG_OEM_ACE_LIBS);MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;$(MG_OEM_XERCES_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\bin\release\$(ProjectName).dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Lib\release;..\..\..\Common\lib\$(Configuration);..\..\..\Oem\FDO\Lib;..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\Lib\release;..\..\..\Common\lib\$(Configuration);$(MG_OEM_FDO_LIB_DIR);$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OptimizeReferences>true</OptimizeReferences>
@@ -142,10 +142,10 @@
<PreBuildEvent>
<Command>del /Q DesktopCustom\*prop
IF NOT EXIST DesktopCustom mkdir DesktopCustom
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideDesktopConstants.xml C# ./MapGuideDesktopConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\MapGuideDesktopConstants.xml C# ./MapGuideDesktopConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideDesktopApiGen.xml C#
-..\..\..\Oem\SWIGEx\Win32\swig -c++ -csharp -dllname MapGuideDesktopUnmanagedApi -namespace OSGeo.MapGuide -proxydir .\DesktopCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgDesktopApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideDesktopApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\MapGuideDesktopApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -dllname MapGuideDesktopUnmanagedApi -namespace OSGeo.MapGuide -proxydir .\DesktopCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgDesktopApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideDesktopApi.i
</Command>
</PreBuildEvent>
<Midl>
@@ -153,7 +153,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\FDO\Inc;..\..\..\Oem\FDO\Inc\ExpressionEngine;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\DWFTK\develop\global\src;..\..\..\Oem\DWFTK\develop\global\src\dwf;..\..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;..\..\..\Common\Renderers;..\..\..\Common\Stylization;$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_DWFTK_INC_DIR)\dwf;..\..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -162,9 +162,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>MgDesktopd.lib;FDO.lib;FDOCommon.lib;ACEd.lib;MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;xerces-c_3mgD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>MgDesktopd.lib;FDO.lib;FDOCommon.lib;$(MG_OEM_ACE_LIBS);MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;$(MG_OEM_XERCES_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\bin\debug\MapGuideDesktopUnmanagedApi.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Lib\Debug64;..\..\..\Common\lib\$(Configuration)64;..\..\..\Oem\FDO\Lib64;..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\Lib\Debug64;..\..\..\Common\lib\$(Configuration)64;$(MG_OEM_FDO_LIB_DIR);$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ImportLibrary>..\lib\debug\MapGuideDesktopUnmanagedApi.lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
@@ -174,10 +174,10 @@
<PreBuildEvent>
<Command>del /Q DesktopCustom\*prop
IF NOT EXIST DesktopCustom mkdir DesktopCustom
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideDesktopConstants.xml C# ./MapGuideDesktopConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\MapGuideDesktopConstants.xml C# ./MapGuideDesktopConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideDesktopApiGen.xml C#
-..\..\..\Oem\SWIGEx\Win32\swig -c++ -csharp -dllname MapGuideDesktopUnmanagedApi -namespace OSGeo.MapGuide -proxydir .\DesktopCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgDesktopApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideDesktopApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\MapGuideDesktopApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -dllname MapGuideDesktopUnmanagedApi -namespace OSGeo.MapGuide -proxydir .\DesktopCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgDesktopApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideDesktopApi.i
</Command>
</PreBuildEvent>
<Midl>
@@ -186,7 +186,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\FDO\Inc;..\..\..\Oem\FDO\Inc\ExpressionEngine;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\DWFTK\develop\global\src;..\..\..\Oem\DWFTK\develop\global\src\dwf;..\..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;..\..\..\Common\Renderers;..\..\..\Common\Stylization;$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_DWFTK_INC_DIR)\dwf;..\..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -194,9 +194,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>MgDesktop.lib;FDO.lib;FDOCommon.lib;ACE.lib;MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;xerces-c_3mg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>MgDesktop.lib;FDO.lib;FDOCommon.lib;$(MG_OEM_ACE_LIBS);MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;$(MG_OEM_XERCES_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>..\..\bin\release64\$(ProjectName).dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Lib\Release64;..\..\..\Common\lib\$(Configuration)64;..\..\..\Oem\FDO\Lib64;..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\Lib\Release64;..\..\..\Common\lib\$(Configuration)64;$(MG_OEM_FDO_LIB_DIR);$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OptimizeReferences>true</OptimizeReferences>
Modified: sandbox/jng/diet_vs2015/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/JavaApiEx.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/JavaApiEx.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/JavaApiEx.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -93,10 +93,10 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+ <Command>$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\Constants.xml Java .
copy .\java.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
-..\..\..\Oem\SwigEx\Win32\swig -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideDesktopApiJNId -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideDesktopApiJNId -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideApi.i
move /Y *.java org\osgeo\mapguide
del org\osgeo\mapguide\*.class
echo Building java classes...
@@ -108,7 +108,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\MgDesktop;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\MgDesktop;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>Async</ExceptionHandling>
@@ -118,9 +118,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>MgFoundationd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgGeometryd.lib;MgPlatformBased.lib;MgDesktopd.lib;ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>MgFoundationd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgGeometryd.lib;MgPlatformBased.lib;MgDesktopd.lib;$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Common\lib\$(Configuration);..\..\lib\debug;..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\Common\lib\$(Configuration);..\..\lib\debug;$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -133,10 +133,10 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+ <Command>$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\Constants.xml Java .
copy .\java.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
-..\..\..\Oem\SwigEx\Win32\swig -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideDesktopApiJNId -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideDesktopApiJNId -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideApi.i
move /Y *.java org\osgeo\mapguide
del org\osgeo\mapguide\*.class
echo Building java classes...
@@ -148,7 +148,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\MgDesktop;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\MgDesktop;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>Async</ExceptionHandling>
@@ -158,9 +158,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>MgFoundationd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgGeometryd.lib;MgPlatformBased.lib;MgDesktopd.lib;ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>MgFoundationd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgGeometryd.lib;MgPlatformBased.lib;MgDesktopd.lib;$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Common\lib\$(Configuration)64;..\..\lib\debug64;..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\Common\lib\$(Configuration)64;..\..\lib\debug64;$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -173,10 +173,10 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+ <Command>$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\Constants.xml Java .
copy .\java.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
-..\..\..\Oem\SwigEx\Win32\swig -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideDesktopApiJNI -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideDesktopApiJNI -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideApi.i
move /Y *.java org\osgeo\mapguide
del org\osgeo\mapguide\*.class
echo Building java classes...
@@ -189,7 +189,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\MgDesktop;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\MgDesktop;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -197,9 +197,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>MgFoundation.lib;MgMdfModel.lib;MgMdfParser.lib;MgGeometry.lib;MgPlatformBase.lib;MgDesktop.lib;ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>MgFoundation.lib;MgMdfModel.lib;MgMdfParser.lib;MgGeometry.lib;MgPlatformBase.lib;MgDesktop.lib;$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Common\lib\$(Configuration);..\..\lib\release;..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\Common\lib\$(Configuration);..\..\lib\release;$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -214,10 +214,10 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+ <Command>$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\Constants.xml Java .
copy .\java.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
-..\..\..\Oem\SwigEx\Win32\swig -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideDesktopApiJNI -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideDesktopApiJNI -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideDesktopApi -o MgApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideApi.i
move /Y *.java org\osgeo\mapguide
del org\osgeo\mapguide\*.class
echo Building java classes...
@@ -229,7 +229,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\MgDesktop;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\MgDesktop;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -237,9 +237,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>MgFoundation.lib;MgMdfModel.lib;MgMdfParser.lib;MgGeometry.lib;MgPlatformBase.lib;MgDesktop.lib;ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>MgFoundation.lib;MgMdfModel.lib;MgMdfParser.lib;MgGeometry.lib;MgPlatformBase.lib;MgDesktop.lib;$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Common\lib\$(Configuration)64;..\..\lib\release64;..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\Common\lib\$(Configuration)64;..\..\lib\release64;$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: sandbox/jng/diet_vs2015/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/Makefile.am
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/Makefile.am 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Desktop/DesktopUnmanagedApi/JavaApiEx/Makefile.am 2015-10-19 10:53:12 UTC (rev 8789)
@@ -18,11 +18,11 @@
-I../../../Common/MapGuideCommon \
-I$(JAVA_HOME)/include \
-I$(JAVA_HOME)/include/linux \
- -I../../../Oem/ACE/ACE_wrappers \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
-I../HttpHandler \
-I../WebSupport \
-I../WebApp \
- -I../../../Oem/dbxml/xerces-c-src/src
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src
BUILT_SOURCES = MgApi_wrap.cpp
@@ -45,7 +45,7 @@
-lMgWebApp
libMapGuideJavaApiEx_la_LDFLAGS = -release $(PACKAGE_VERSION) \
- -L../../../Oem/ACE/ACE_wrappers/ace \
+ -L$(mg_oem_ace_src)/ACE_wrappers/ace \
-L../../../Common/MdfModel \
-L../../../Common/MdfParser \
-L../../../Common/Foundation \
@@ -54,7 +54,7 @@
-L../../../Common/MapGuideCommon \
-L../HttpHandler \
-L../WebApp \
- -L../../../Oem/dbxml/install/lib
+ -L$(mg_oem_dbxml_src)/install/lib
MgApi_wrap.cpp : \
../WebApp/WebApp.h \
@@ -457,10 +457,10 @@
../HttpHandler/HttpRequestParam.h \
../HttpHandler/HttpResponse.h \
../HttpHandler/HttpResult.h
- ../../../BuildTools/WebTools/IMake/Linux/IMake ../MapGuideApi/MapGuideApiGen.xml Java
+ $(mg_oem_imake_src)/Linux/IMake ../MapGuideApi/MapGuideApiGen.xml Java
cp -f java.i language.i
- ../../../BuildTools/WebTools/IMake/Linux/IMake ../MapGuideApi/Constants.xml Java .
- ../../../Oem/SWIGEx/Linux/swig -dllname MapGuideJavaApiEx -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -package org.osgeo.mapguide -root MgObject -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise();" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib ../../../Oem/SWIGEx/Lib MapGuideApi.i
+ $(mg_oem_imake_src)/Linux/IMake ../MapGuideApi/Constants.xml Java .
+ $(mg_oem_swig_src)/Linux/swig -dllname MapGuideJavaApiEx -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -package org.osgeo.mapguide -root MgObject -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise();" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib $(mg_oem_swig_src)/Lib MapGuideApi.i
rm -f org/osgeo/mapguide/*.class
mv -f *.java org/osgeo/mapguide
$(JAVA_HOME)/bin/javac -classpath . org/osgeo/mapguide/*.java
Modified: sandbox/jng/diet_vs2015/MgDev/Desktop/MgDesktop/MgDesktop.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Desktop/MgDesktop/MgDesktop.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Desktop/MgDesktop/MgDesktop.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -82,7 +82,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<IntrinsicFunctions>false</IntrinsicFunctions>
- <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Server\src\Gws\Include;..\..\Server\src\Gws\GwsCommon\inc;..\..\Server\src\Gws\GwsQueryEngine\inc;..\..\Common\Security;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_DWFTK_INC_DIR)\dwf;..\..\Server\src\Gws\Include;..\..\Server\src\Gws\GwsCommon\inc;..\..\Server\src\Gws\GwsQueryEngine\inc;..\..\Common\Security;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;_USRDLL;DESKTOP_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>Sync</ExceptionHandling>
@@ -93,10 +93,10 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;ExpressionEngine.lib;ACEd.lib;MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;MgGwsCommond.lib;MgGwsQueryEngined.lib;xerces-c_3mgD.lib;dwfcore_wt.1.7.0.lib;dwftk_wt.7.7.0.lib;w3dtk_wt.1.7.1555.lib;whiptk_wt.7.13.601.lib;MgSecurityd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;ExpressionEngine.lib;$(MG_OEM_ACE_LIBS);MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;MgGwsCommond.lib;MgGwsQueryEngined.lib;$(MG_OEM_XERCES_LIBS);$(MG_OEM_DWFTK_LIBS_RENDERERS);MgSecurityd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ShowProgress>NotSet</ShowProgress>
<OutputFile>$(OutDir)MgDesktopd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\Oem\FDO\Lib;..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration)\vc10.0;..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration);..\..\Common\lib\$(Configuration);..\..\Server\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);$(MG_OEM_DWFTK_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);..\..\Common\lib\$(Configuration);..\..\Server\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;FDOGeometry.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -121,7 +121,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Server\src\Gws\Include;..\..\Server\src\Gws\GwsCommon\inc;..\..\Server\src\Gws\GwsQueryEngine\inc;..\..\Common\Security;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_DWFTK_INC_DIR)\dwf;..\..\Server\src\Gws\Include;..\..\Server\src\Gws\GwsCommon\inc;..\..\Server\src\Gws\GwsQueryEngine\inc;..\..\Common\Security;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DESKTOP_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -130,9 +130,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;ExpressionEngine.lib;ACE.lib;MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;MgGwsCommon.lib;MgGwsQueryEngine.lib;xerces-c_3mg.lib;dwfcore_wt.1.7.0.lib;dwftk_wt.7.7.0.lib;w3dtk_wt.1.7.1555.lib;whiptk_wt.7.13.601.lib;MgSecurity.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;ExpressionEngine.lib;$(MG_OEM_ACE_LIBS);MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;MgGwsCommon.lib;MgGwsQueryEngine.lib;$(MG_OEM_XERCES_LIBS);$(MG_OEM_DWFTK_LIBS_RENDERERS);MgSecurity.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\Oem\FDO\Lib;..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration)\vc10.0;..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration);..\..\Common\lib\$(Configuration);..\..\Server\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);$(MG_OEM_DWFTK_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);..\..\Common\lib\$(Configuration);..\..\Server\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>MgMdfParser.dll;MgGeometry.dll;MgGwsCommon.dll;MgGwsResource.dll;FDO.dll;FDOCommon.dll;MgStylization.dll;FDOGeometry.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -155,7 +155,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<IntrinsicFunctions>false</IntrinsicFunctions>
- <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Server\src\Gws\Include;..\..\Server\src\Gws\GwsCommon\inc;..\..\Server\src\Gws\GwsQueryEngine\inc;..\..\Common\Security;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_DWFTK_INC_DIR)\dwf;..\..\Server\src\Gws\Include;..\..\Server\src\Gws\GwsCommon\inc;..\..\Server\src\Gws\GwsQueryEngine\inc;..\..\Common\Security;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;_USRDLL;DESKTOP_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<ExceptionHandling>Sync</ExceptionHandling>
@@ -166,10 +166,10 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;ExpressionEngine.lib;ACEd.lib;MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;MgGwsCommond.lib;MgGwsQueryEngined.lib;xerces-c_3mgD.lib;dwfcore_wt.1.7.0.lib;dwftk_wt.7.7.0.lib;w3dtk_wt.1.7.1555.lib;whiptk_wt.7.13.601.lib;MgSecurityd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;ExpressionEngine.lib;$(MG_OEM_ACE_LIBS);MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;MgGwsCommond.lib;MgGwsQueryEngined.lib;$(MG_OEM_XERCES_LIBS);$(MG_OEM_DWFTK_LIBS_RENDERERS);MgSecurityd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ShowProgress>NotSet</ShowProgress>
<OutputFile>$(OutDir)MgDesktopd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\Oem\FDO\Lib64;..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration)64\vc10.0;..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;..\..\Common\lib\$(Configuration)64;..\..\Server\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);$(MG_OEM_DWFTK_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);..\..\Common\lib\$(Configuration)64;..\..\Server\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;FDOGeometry.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -197,7 +197,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Server\src\Gws\Include;..\..\Server\src\Gws\GwsCommon\inc;..\..\Server\src\Gws\GwsQueryEngine\inc;..\..\Common\Security;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_DWFTK_INC_DIR)\dwf;..\..\Server\src\Gws\Include;..\..\Server\src\Gws\GwsCommon\inc;..\..\Server\src\Gws\GwsQueryEngine\inc;..\..\Common\Security;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DESKTOP_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Sync</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -206,9 +206,9 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;ExpressionEngine.lib;ACE.lib;MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;MgGwsCommon.lib;MgGwsQueryEngine.lib;xerces-c_3mg.lib;dwfcore_wt.1.7.0.lib;dwftk_wt.7.7.0.lib;w3dtk_wt.1.7.1555.lib;whiptk_wt.7.13.601.lib;MgSecurity.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;ExpressionEngine.lib;$(MG_OEM_ACE_LIBS);MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;MgGwsCommon.lib;MgGwsQueryEngine.lib;$(MG_OEM_XERCES_LIBS);$(MG_OEM_DWFTK_LIBS_RENDERERS);MgSecurity.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\Oem\FDO\Lib64;..\..\Oem\DWFTK\develop\global\lib\x64\static\$(Configuration)\vc10.0;..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;..\..\Common\lib\$(Configuration)64;..\..\Server\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);$(MG_OEM_DWFTK_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);..\..\Common\lib\$(Configuration)64;..\..\Server\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>MgMdfParser.dll;MgGeometry.dll;MgGwsCommon.dll;MgGwsResource.dll;FDO.dll;FDOCommon.dll;MgStylization.dll;FDOGeometry.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: sandbox/jng/diet_vs2015/MgDev/Desktop/UnitTest/UnitTest.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Desktop/UnitTest/UnitTest.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Desktop/UnitTest/UnitTest.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -75,7 +75,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Oem\CppUnit-1.9.14\include;..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_DWFTK_INC_DIR)\dwf;$(MG_OEM_CPPUNIT_INC_DIR);..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -84,19 +84,19 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>cppunitd.lib;MgDesktopd.lib;FDO.lib;FDOCommon.lib;ACEd.lib;MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;xerces-c_3mgD.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\Oem\FDO\Lib;..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration);..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration);..\..\Common\lib\$(Configuration);..\Lib\debug;..\..\Oem\CppUnit-1.9.14\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>$(MG_OEM_CPPUNIT_LIBS);MgDesktopd.lib;FDO.lib;FDOCommon.lib;$(MG_OEM_ACE_LIBS);MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;$(MG_OEM_XERCES_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);$(MG_OEM_DWFTK_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);..\..\Common\lib\$(Configuration);..\Lib\debug;$(MG_OEM_CPPUNIT_LIB_DIR)%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
<Command>xcopy /S /Y ..\..\Common\bin\debug\*.* $(OutDir)
xcopy /S /Y /I ..\..\Common\MapGuideCommon\Resources\*.* $(OutDir)Resources\
-xcopy /S /Y /I ..\..\Oem\ACE\ACE_wrappers\lib\debug\ACEd.dll $(OutDir)
-xcopy /S /Y /I ..\..\Oem\dbxml\bin\debug\xerces-c_3_1mgD.dll $(OutDir)
-xcopy /S /Y /I ..\..\Oem\geos\VisualStudio\Debug\GEOSd.dll $(OutDir)
-xcopy /S /Y /I ..\..\Oem\gd\build\win32\gd\Debug\gd.dll $(OutDir)
-xcopy /S /Y /I ..\..\Oem\FDO\Bin\Debug\*.* $(OutDir)FDO\
+xcopy /S /Y /I $(MG_OEM_ACE_LIB_DIR)\ACEd.dll $(OutDir)
+xcopy /S /Y /I $(MG_OEM_DBXML_BIN_DIR)\xerces-c_3_1mgD.dll $(OutDir)
+xcopy /S /Y /I $(MG_OEM_GEOS_BIN_DIR)\GEOSd.dll $(OutDir)
+xcopy /S /Y /I $(MG_OEM_GD_BIN_DIR)\gd.dll $(OutDir)
+xcopy /S /Y /I $(MG_OEM_FDO_ROOT)\Bin\Debug\*.* $(OutDir)FDO\
xcopy /S /Y /I ..\..\Server\bin\Debug\MgGws*.* $(OutDir)
xcopy /Y ..\MgDesktop\bin\$(Configuration)\*.* $(OutDir)
xcopy /S /Y /I ..\..\UnitTest\TestData\DrawingService\*.* $(OutDir)..\UnitTestFiles\
@@ -110,10 +110,10 @@
xcopy /S /Y /I ..\..\UnitTest\TestData\TileService\*.* $(OutDir)..\UnitTestFiles\
xcopy /S /Y /I ..\DesktopTestData\*.* $(OutDir)..\UnitTestFiles\
copy /Y $(OutDir)..\UnitTestFiles\UT_Parcels.sdf copy /Y $(OutDir)..\UnitTestFiles\UT_Parcels_Writeable.sdf
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csd $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.gdc $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.mrt $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csv $(OutDir)Dictionaries\
+xcopy /S /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.csd $(OutDir)Dictionaries\
+xcopy /S /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.gdc $(OutDir)Dictionaries\
+xcopy /S /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.mrt $(OutDir)Dictionaries\
+xcopy /S /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.csv $(OutDir)Dictionaries\
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
@@ -123,7 +123,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Oem\CppUnit-1.9.14\include;..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_DWFTK_INC_DIR)\dwf;$(MG_OEM_CPPUNIT_INC_DIR);..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -132,19 +132,19 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>cppunitd.lib;MgDesktopd.lib;FDO.lib;FDOCommon.lib;ACEd.lib;MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;xerces-c_3mgD.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\Oem\FDO\Lib64;..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration)64;..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;..\..\Common\lib\$(Configuration)64;..\Lib\debug64;..\..\Oem\CppUnit-1.9.14\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>$(MG_OEM_CPPUNIT_LIBS);MgDesktopd.lib;FDO.lib;FDOCommon.lib;$(MG_OEM_ACE_LIBS);MgFoundationd.lib;MgGeometryd.lib;MgMdfModeld.lib;MgMdfParserd.lib;MgPlatformBased.lib;MgRenderersd.lib;MgStylizationd.lib;$(MG_OEM_XERCES_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);$(MG_OEM_DWFTK_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);..\..\Common\lib\$(Configuration)64;..\Lib\debug64;$(MG_OEM_CPPUNIT_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<TargetMachine>MachineX64</TargetMachine>
</Link>
<PostBuildEvent>
<Command>xcopy /S /Y ..\..\Common\bin\debug64\*.* $(OutDir)
xcopy /S /Y /I ..\..\Common\MapGuideCommon\Resources\*.* $(OutDir)Resources\
-xcopy /S /Y /I ..\..\Oem\ACE\ACE_wrappers\lib\debug64\ACEd.dll $(OutDir)
-xcopy /S /Y /I ..\..\Oem\dbxml\bin\debug64\xerces-c_3_1mgD.dll $(OutDir)
-xcopy /S /Y /I ..\..\Oem\geos\VisualStudio\Debug64\GEOSd.dll $(OutDir)
-xcopy /S /Y /I ..\..\Oem\gd\build\win32\gd\Debug64\gd.dll $(OutDir)
-xcopy /S /Y /I ..\..\Oem\FDO\Bin\Debug64\*.* $(OutDir)FDO\
+xcopy /S /Y /I $(MG_OEM_ACE_LIB_DIR)\ACEd.dll $(OutDir)
+xcopy /S /Y /I $(MG_OEM_DBXML_BIN_DIR)\xerces-c_3_1mgD.dll $(OutDir)
+xcopy /S /Y /I $(MG_OEM_GEOS_BIN_DIR)\GEOSd.dll $(OutDir)
+xcopy /S /Y /I $(MG_OEM_GD_BIN_DIR)\gd.dll $(OutDir)
+xcopy /S /Y /I $(MG_OEM_FDO_ROOT)\Bin\Debug64\*.* $(OutDir)FDO\
xcopy /S /Y /I ..\..\Server\bin\Debug64\MgGws*.* $(OutDir)
xcopy /Y ..\MgDesktop\bin\Debug64\*.* $(OutDir)
xcopy /S /Y /I ..\..\UnitTest\TestData\DrawingService\*.* $(OutDir)..\UnitTestFiles\
@@ -158,10 +158,10 @@
xcopy /S /Y /I ..\..\UnitTest\TestData\TileService\*.* $(OutDir)..\UnitTestFiles\
xcopy /S /Y /I ..\DesktopTestData\*.* $(OutDir)..\UnitTestFiles\
copy /Y $(OutDir)..\UnitTestFiles\UT_Parcels.sdf copy /Y $(OutDir)..\UnitTestFiles\UT_Parcels_Writeable.sdf
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csd $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.gdc $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.mrt $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csv $(OutDir)Dictionaries\
+xcopy /S /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.csd $(OutDir)Dictionaries\
+xcopy /S /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.gdc $(OutDir)Dictionaries\
+xcopy /S /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.mrt $(OutDir)Dictionaries\
+xcopy /S /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.csv $(OutDir)Dictionaries\
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
@@ -169,7 +169,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Oem\CppUnit-1.9.14\include;..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_DWFTK_INC_DIR)\dwf;$(MG_OEM_CPPUNIT_INC_DIR);..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -177,8 +177,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>cppunit.lib;MgDesktop.lib;FDO.lib;FDOCommon.lib;ACE.lib;MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;xerces-c_3mg.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\Oem\FDO\Lib;..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration);..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration);..\..\Common\lib\$(Configuration);..\Lib\release;..\..\Oem\CppUnit-1.9.14\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>$(MG_OEM_CPPUNIT_LIBS);MgDesktop.lib;FDO.lib;FDOCommon.lib;$(MG_OEM_ACE_LIBS);MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;$(MG_OEM_XERCES_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);$(MG_OEM_DWFTK_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);..\..\Common\lib\$(Configuration);..\Lib\release;$(MG_OEM_CPPUNIT_LIB_DIR)%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OptimizeReferences>true</OptimizeReferences>
@@ -188,11 +188,11 @@
<PostBuildEvent>
<Command>xcopy /S /Y ..\..\Common\bin\release\*.* $(OutDir)
xcopy /S /Y /I ..\..\Common\MapGuideCommon\Resources\*.* $(OutDir)Resources\
-xcopy /S /Y /I ..\..\Oem\ACE\ACE_wrappers\lib\Release\ACE.dll $(OutDir)
-xcopy /S /Y /I ..\..\Oem\dbxml\bin\Release\xerces-c_3_1mg.dll $(OutDir)
-xcopy /S /Y /I ..\..\Oem\geos\VisualStudio\Release\GEOS.dll $(OutDir)
-xcopy /S /Y /I ..\..\Oem\gd\build\win32\gd\Release\gd.dll $(OutDir)
-xcopy /S /Y /I ..\..\Oem\FDO\Bin\Release\*.* $(OutDir)FDO\
+xcopy /S /Y /I $(MG_OEM_ACE_LIB_DIR)\ACE.dll $(OutDir)
+xcopy /S /Y /I $(MG_OEM_DBXML_BIN_DIR)\xerces-c_3_1mg.dll $(OutDir)
+xcopy /S /Y /I $(MG_OEM_GEOS_BIN_DIR)\GEOS.dll $(OutDir)
+xcopy /S /Y /I $(MG_OEM_GD_BIN_DIR)\gd.dll $(OutDir)
+xcopy /S /Y /I $(MG_OEM_FDO_ROOT)\Bin\Release\*.* $(OutDir)FDO\
xcopy /S /Y /I ..\..\Server\bin\Release\MgGws*.* $(OutDir)
xcopy /Y ..\MgDesktop\bin\$(Configuration)\*.* $(OutDir)
xcopy /S /Y /I ..\..\UnitTest\TestData\DrawingService\*.* $(OutDir)..\UnitTestFiles\
@@ -206,11 +206,11 @@
xcopy /S /Y /I ..\..\UnitTest\TestData\TileService\*.* $(OutDir)..\UnitTestFiles\
xcopy /S /Y /I ..\DesktopTestData\*.* $(OutDir)..\UnitTestFiles\
copy /Y $(OutDir)..\UnitTestFiles\UT_Parcels.sdf copy /Y $(OutDir)..\UnitTestFiles\UT_Parcels_Writeable.sdf
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csd $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.gdc $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.mrt $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csv $(OutDir)Dictionaries\
-xcopy /Y /I ..\..\Oem\CsMap\Dictionaries\*.txt $(OutDir)Dictionaries\
+xcopy /S /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.csd $(OutDir)Dictionaries\
+xcopy /S /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.gdc $(OutDir)Dictionaries\
+xcopy /S /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.mrt $(OutDir)Dictionaries\
+xcopy /S /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.csv $(OutDir)Dictionaries\
+xcopy /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.txt $(OutDir)Dictionaries\
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
@@ -221,7 +221,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\dbxml\xerces-c-src\src;..\..\Oem\FDO\Inc;..\..\Oem\FDO\Inc\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;..\..\Oem\DWFTK\develop\global\src;..\..\Oem\DWFTK\develop\global\src\dwf;..\..\Oem\CppUnit-1.9.14\include;..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common\Foundation;..\..\Common\PlatformBase;..\..\Common\Geometry;..\..\Common\MdfModel;..\..\Common\MdfParser;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;..\..\Common\Renderers;..\..\Common\Stylization;$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_DWFTK_INC_DIR)\dwf;$(MG_OEM_CPPUNIT_INC_DIR);..\MgDesktop;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -229,8 +229,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>cppunit.lib;MgDesktop.lib;FDO.lib;FDOCommon.lib;ACE.lib;MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;xerces-c_3mg.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\Oem\FDO\Lib64;..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration)64;..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;..\..\Common\lib\$(Configuration)64;..\Lib\release64;..\..\Oem\CppUnit-1.9.14\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>$(MG_OEM_CPPUNIT_LIBS);MgDesktop.lib;FDO.lib;FDOCommon.lib;$(MG_OEM_ACE_LIBS);MgFoundation.lib;MgGeometry.lib;MgMdfModel.lib;MgMdfParser.lib;MgPlatformBase.lib;MgRenderers.lib;MgStylization.lib;$(MG_OEM_XERCES_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);$(MG_OEM_DWFTK_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);..\..\Common\lib\$(Configuration)64;..\Lib\release64;$(MG_OEM_CPPUNIT_LIB_DIR)%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OptimizeReferences>true</OptimizeReferences>
@@ -240,11 +240,11 @@
<PostBuildEvent>
<Command>xcopy /S /Y ..\..\Common\bin\release64\*.* $(OutDir)
xcopy /S /Y /I ..\..\Common\MapGuideCommon\Resources\*.* $(OutDir)Resources\
-xcopy /S /Y /I ..\..\Oem\ACE\ACE_wrappers\lib64\Release\ACE.dll $(OutDir)
-xcopy /S /Y /I ..\..\Oem\dbxml\bin64\Release\xerces-c_3_1mg.dll $(OutDir)
-xcopy /S /Y /I ..\..\Oem\geos\VisualStudio\Release64\GEOS.dll $(OutDir)
-xcopy /S /Y /I ..\..\Oem\gd\build\win32\gd\Release64\gd.dll $(OutDir)
-xcopy /S /Y /I ..\..\Oem\FDO\Bin\Release64\*.* $(OutDir)FDO\
+xcopy /S /Y /I $(MG_OEM_ACE_LIB_DIR)\ACE.dll $(OutDir)
+xcopy /S /Y /I $(MG_OEM_DBXML_BIN_DIR)\xerces-c_3_1mg.dll $(OutDir)
+xcopy /S /Y /I $(MG_OEM_GEOS_BIN_DIR)\GEOS.dll $(OutDir)
+xcopy /S /Y /I $(MG_OEM_GD_BIN_DIR)\gd.dll $(OutDir)
+xcopy /S /Y /I $(MG_OEM_FDO_ROOT)\Bin\Release64\*.* $(OutDir)FDO\
xcopy /S /Y /I ..\..\Server\bin\Release64\MgGws*.* $(OutDir)
xcopy /Y ..\MgDesktop\bin\release64\*.* $(OutDir)
xcopy /S /Y /I ..\..\UnitTest\TestData\DrawingService\*.* $(OutDir)..\UnitTestFiles\
@@ -258,11 +258,11 @@
xcopy /S /Y /I ..\..\UnitTest\TestData\TileService\*.* $(OutDir)..\UnitTestFiles\
xcopy /S /Y /I ..\DesktopTestData\*.* $(OutDir)..\UnitTestFiles\
copy /Y $(OutDir)..\UnitTestFiles\UT_Parcels.sdf copy /Y $(OutDir)..\UnitTestFiles\UT_Parcels_Writeable.sdf
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csd $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.gdc $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.mrt $(OutDir)Dictionaries\
-xcopy /S /Y /I ..\..\Oem\CsMap\Dictionaries\*.csv $(OutDir)Dictionaries\
-xcopy /Y /I ..\..\Oem\CsMap\Dictionaries\*.txt $(OutDir)Dictionaries\
+xcopy /S /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.csd $(OutDir)Dictionaries\
+xcopy /S /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.gdc $(OutDir)Dictionaries\
+xcopy /S /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.mrt $(OutDir)Dictionaries\
+xcopy /S /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.csv $(OutDir)Dictionaries\
+xcopy /Y /I $(MG_OEM_CSMAP_DICT_DIR)\*.txt $(OutDir)Dictionaries\
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/Common/Base/Makefile.am
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/Common/Base/Makefile.am 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/Common/Base/Makefile.am 2015-10-19 10:53:12 UTC (rev 8789)
@@ -5,7 +5,7 @@
prefix=@prefix@/server
INCLUDES = \
- -I../../../../Oem/ACE/ACE_wrappers \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
-I../../../../Common/MdfModel \
-I../../../../Common/Foundation \
-I../../../../Common/Geometry \
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/Common/Base/ServerBase.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/Common/Base/ServerBase.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/Common/Base/ServerBase.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\Common\Manager;..\..\Services\Resource;..\..\Services\Site;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Oem\ACE\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common\Manager;..\..\Services\Resource;..\..\Services\Site;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_BASE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -104,9 +104,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerBased.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerBased.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -120,7 +120,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\Common\Manager;..\..\Services\Resource;..\..\Services\Site;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Oem\ACE\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common\Manager;..\..\Services\Resource;..\..\Services\Site;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_BASE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -130,9 +130,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerBased.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerBased.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -146,7 +146,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\Common\Manager;..\..\Services\Resource;..\..\Services\Site;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Oem\ACE\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common\Manager;..\..\Services\Resource;..\..\Services\Site;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_BASE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -155,9 +155,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerBase.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerBase.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -173,7 +173,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\Common\Manager;..\..\Services\Resource;..\..\Services\Site;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Oem\ACE\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common\Manager;..\..\Services\Resource;..\..\Services\Site;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_BASE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -182,9 +182,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerBase.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerBase.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/Common/Cache/Makefile.am
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/Common/Cache/Makefile.am 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/Common/Cache/Makefile.am 2015-10-19 10:53:12 UTC (rev 8789)
@@ -10,7 +10,7 @@
-I../../../../Common/MapGuideCommon \
-I../../../../Common/Geometry \
-I../../../../Common/MdfModel \
- -I../../../../Oem/ACE/ACE_wrappers \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
-I$(map_fdo_include)
lib_LTLIBRARIES = libMgServerCache.la
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/Common/Cache/ServerCache.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/Common/Cache/ServerCache.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/Common/Cache/ServerCache.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>.;..\..\..\..\Common\Foundation;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\Geometry;..\..\..\..\Common\MdfModel;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\ACE\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>.;..\..\..\..\Common\Foundation;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\Geometry;..\..\..\..\Common\MdfModel;$(MG_OEM_FDO_INC_DIR);$(MG_OEM_ACE_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_CACHE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -103,9 +103,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerCached.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerCached.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -119,7 +119,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>.;..\..\..\..\Common\Foundation;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\Geometry;..\..\..\..\Common\MdfModel;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\ACE\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>.;..\..\..\..\Common\Foundation;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\Geometry;..\..\..\..\Common\MdfModel;$(MG_OEM_FDO_INC_DIR);$(MG_OEM_ACE_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_CACHE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -128,9 +128,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerCached.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerCached.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -144,7 +144,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>.;..\..\..\..\Common\Foundation;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\Geometry;..\..\..\..\Common\MdfModel;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\ACE\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>.;..\..\..\..\Common\Foundation;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\Geometry;..\..\..\..\Common\MdfModel;$(MG_OEM_FDO_INC_DIR);$(MG_OEM_ACE_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_CACHE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -152,9 +152,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerCache.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerCache.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -170,7 +170,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>.;..\..\..\..\Common\Foundation;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\Geometry;..\..\..\..\Common\MdfModel;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\ACE\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>.;..\..\..\..\Common\Foundation;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\Geometry;..\..\..\..\Common\MdfModel;$(MG_OEM_FDO_INC_DIR);$(MG_OEM_ACE_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_CACHE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -178,9 +178,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerCache.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerCache.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/Common/Manager/Makefile.am
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/Common/Manager/Makefile.am 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/Common/Manager/Makefile.am 2015-10-19 10:53:12 UTC (rev 8789)
@@ -5,9 +5,9 @@
prefix=@prefix@/server
INCLUDES = \
- -I../../../../Oem/ACE/ACE_wrappers \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
-I$(map_fdo_include) \
- -I../../../../Oem/dbxml/xerces-c-src/src \
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src \
-I../../../../Common \
-I../../../../Common/Security \
-I../../../../Common/Foundation \
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/Common/Manager/ServerManager.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/Common/Manager/ServerManager.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/Common/Manager/ServerManager.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..;..\..\..\..\Common;..\..\..\..\Common\Foundation;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\Geometry;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\Common\Cache;..\..\Common\Thread;..\..\Services\Drawing;..\..\Services\Feature;..\..\Services\Kml;..\..\Services\Mapping;..\..\Services\Profiling;..\..\Services\Rendering;..\..\Services\Resource;..\..\Services\ServerAdmin;..\..\Services\Site;..\..\Services\Tile;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\FDO\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..;..\..\..\..\Common;..\..\..\..\Common\Foundation;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\Geometry;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\Common\Cache;..\..\Common\Thread;..\..\Services\Drawing;..\..\Services\Feature;..\..\Services\Kml;..\..\Services\Mapping;..\..\Services\Profiling;..\..\Services\Rendering;..\..\Services\Resource;..\..\Services\ServerAdmin;..\..\Services\Site;..\..\Services\Tile;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_MANAGER_EXPORTS;PSAPI_VERSION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -105,9 +105,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;FDO.lib;FDOCommon.lib;pdh.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);FDO.lib;FDOCommon.lib;pdh.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerManagerd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\..\Oem\FDO\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerManagerd.pdb</ProgramDatabaseFile>
@@ -122,7 +122,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..;..\..\..\..\Common;..\..\..\..\Common\Foundation;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\Geometry;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\Common\Cache;..\..\Common\Thread;..\..\Services\Drawing;..\..\Services\Feature;..\..\Services\Kml;..\..\Services\Mapping;..\..\Services\Profiling;..\..\Services\Rendering;..\..\Services\Resource;..\..\Services\ServerAdmin;..\..\Services\Site;..\..\Services\Tile;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\FDO\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..;..\..\..\..\Common;..\..\..\..\Common\Foundation;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\Geometry;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\Common\Cache;..\..\Common\Thread;..\..\Services\Drawing;..\..\Services\Feature;..\..\Services\Kml;..\..\Services\Mapping;..\..\Services\Profiling;..\..\Services\Rendering;..\..\Services\Resource;..\..\Services\ServerAdmin;..\..\Services\Site;..\..\Services\Tile;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_MANAGER_EXPORTS;PSAPI_VERSION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -133,9 +133,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;FDO.lib;FDOCommon.lib;pdh.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);FDO.lib;FDOCommon.lib;pdh.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerManagerd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerManagerd.pdb</ProgramDatabaseFile>
@@ -150,7 +150,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..;..\..\..\..\Common;..\..\..\..\Common\Foundation;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\Geometry;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\Common\Cache;..\..\Common\Thread;..\..\Services\Drawing;..\..\Services\Feature;..\..\Services\Kml;..\..\Services\Mapping;..\..\Services\Profiling;..\..\Services\Rendering;..\..\Services\Resource;..\..\Services\ServerAdmin;..\..\Services\Site;..\..\Services\Tile;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\FDO\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..;..\..\..\..\Common;..\..\..\..\Common\Foundation;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\Geometry;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\Common\Cache;..\..\Common\Thread;..\..\Services\Drawing;..\..\Services\Feature;..\..\Services\Kml;..\..\Services\Mapping;..\..\Services\Profiling;..\..\Services\Rendering;..\..\Services\Resource;..\..\Services\ServerAdmin;..\..\Services\Site;..\..\Services\Tile;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_MANAGER_EXPORTS;PSAPI_VERSION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -159,9 +159,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;FDO.lib;FDOCommon.lib;pdh.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);FDO.lib;FDOCommon.lib;pdh.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerManager.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\..\Oem\FDO\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerManager.pdb</ProgramDatabaseFile>
@@ -178,7 +178,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..;..\..\..\..\Common;..\..\..\..\Common\Foundation;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\Geometry;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\Common\Cache;..\..\Common\Thread;..\..\Services\Drawing;..\..\Services\Feature;..\..\Services\Kml;..\..\Services\Mapping;..\..\Services\Profiling;..\..\Services\Rendering;..\..\Services\Resource;..\..\Services\ServerAdmin;..\..\Services\Site;..\..\Services\Tile;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\FDO\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..;..\..\..\..\Common;..\..\..\..\Common\Foundation;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\Geometry;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\Common\Cache;..\..\Common\Thread;..\..\Services\Drawing;..\..\Services\Feature;..\..\Services\Kml;..\..\Services\Mapping;..\..\Services\Profiling;..\..\Services\Rendering;..\..\Services\Resource;..\..\Services\ServerAdmin;..\..\Services\Site;..\..\Services\Tile;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_MANAGER_EXPORTS;PSAPI_VERSION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -187,9 +187,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;FDO.lib;FDOCommon.lib;pdh.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);FDO.lib;FDOCommon.lib;pdh.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerManager.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerManager.pdb</ProgramDatabaseFile>
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/Common/Thread/Makefile.am
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/Common/Thread/Makefile.am 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/Common/Thread/Makefile.am 2015-10-19 10:53:12 UTC (rev 8789)
@@ -5,7 +5,7 @@
prefix=@prefix@/server
INCLUDES = \
- -I../../../../Oem/ACE/ACE_wrappers \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
-I../../../../Common/Foundation \
-I../../../../Common/Geometry \
-I../../../../Common/MapGuideCommon \
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/Common/Thread/ServerThread.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/Common/Thread/ServerThread.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/Common/Thread/ServerThread.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Oem\ACE\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;$(MG_OEM_ACE_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_THREAD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -103,9 +103,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerThreadd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerThreadd.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -119,7 +119,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Oem\ACE\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;$(MG_OEM_ACE_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_THREAD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -128,9 +128,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerThreadd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerThreadd.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -144,7 +144,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Oem\ACE\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;$(MG_OEM_ACE_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_THREAD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -152,9 +152,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerThread.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerThread.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -170,7 +170,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Oem\ACE\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;$(MG_OEM_ACE_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_THREAD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -178,9 +178,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerThread.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerThread.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/Core/Makefile.am
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/Core/Makefile.am 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/Core/Makefile.am 2015-10-19 10:53:12 UTC (rev 8789)
@@ -2,14 +2,14 @@
EXTRA_DIST = serverconfig.ini ServerCore.vcproj ServerCore.rc
mentor_dict_install_dir=@prefix@/share/gis/coordsys
-mentor_dict_source_dir=$(map_srcdir)/Oem/CsMap/Dictionaries
+mentor_dict_source_dir=$(mg_oem_csmap_src)/Dictionaries
root_prefix=@prefix@
prefix=@prefix@/server
INCLUDES = \
- -I../../../Oem/ACE/ACE_wrappers \
- -I../../../Oem/dbxml/xerces-c-src/src \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src \
-I $(map_fdo_include) \
-I $(map_fdo_include)/ExpressionEngine \
-I../Common \
@@ -32,7 +32,7 @@
-I../../../Common/Geometry \
-I../../../Common/PlatformBase \
-I../../../Common/MapGuideCommon \
- -I../../../Oem/gd/freetype/include \
+ -I$(mg_oem_freetype_src)/include \
-I../../../Common/MdfModel \
-I../../../Common/MdfParser \
-I../../../Common/Stylization \
@@ -131,10 +131,11 @@
mgserver_LDFLAGS = \
-R$(map_fdo_lib) \
- -R$(map_srcdir)/Oem/ACE/ACE_wrappers/ace \
- -R$(map_srcdir)/Oem/DWFTK/develop/global/src/dwfcore \
- -R$(map_srcdir)/Oem/DWFTK/develop/global/src/dwf \
- -R$(map_srcdir)/Oem/dbxml/install/lib \
+ -R$(mg_oem_ace_src)/ACE_wrappers/ace \
+ -R$(mg_oem_dwftk_src)/develop/global/src/dwfcore/.libs \
+ -R$(mg_oem_dwftk_src)/develop/global/src/dwf/.libs \
+ -R$(mg_oem_dbxml_src)/install/lib \
+ -R$(mg_oem_cppunit_src)/src/cppunit/.libs \
-R$(map_srcdir)/Common/CoordinateSystem/.libs \
-R$(map_srcdir)/Common/MdfModel/.libs \
-R$(map_srcdir)/Common/MdfParser/.libs \
@@ -160,10 +161,10 @@
-R$(map_srcdir)/Server/src/Services/Tile/.libs \
-R$(map_srcdir)/Server/src/$(map_unittesting_dir)/.libs \
-L$(map_fdo_lib) \
- -L../../../Oem/ACE/ACE_wrappers/ace \
- -L../../../Oem/DWFTK/develop/global/src/dwfcore \
- -L../../../Oem/DWFTK/develop/global/src/dwf \
- -L../../../Oem/dbxml/install/lib \
+ -L$(mg_oem_ace_src)/ACE_wrappers/ace \
+ -L$(mg_oem_dwftk_src)/develop/global/src/dwfcore/.libs \
+ -L$(mg_oem_dwftk_src)/develop/global/src/dwf/.libs \
+ -L$(mg_oem_dbxml_src)/install/lib \
-L$(top_builddir)/Common/CoordinateSystem \
-L../../../Common/MdfModel \
-L../../../Common/MdfParser \
@@ -396,17 +397,17 @@
test -d $(mentor_dict_install_dir) || ($(mkinstalldirs) $(mentor_dict_install_dir); \
cp -f -r $(mentor_dict_source_dir)/* $(mentor_dict_install_dir);)
@cp -fp ../../../Common/Schema/*.xsd $(schemadir)
- @cp -fp ../../../Oem/dbxml/install/bin/db_archive ${prefix}/bin/
- @cp -fp ../../../Oem/dbxml/install/bin/db_checkpoint ${prefix}/bin/
- @cp -fp ../../../Oem/dbxml/install/bin/db_dump ${prefix}/bin/
- @cp -fp ../../../Oem/dbxml/install/bin/db_hotbackup ${prefix}/bin/
- @cp -fp ../../../Oem/dbxml/install/bin/db_load ${prefix}/bin/
- @cp -fp ../../../Oem/dbxml/install/bin/db_recover ${prefix}/bin/
- @cp -fp ../../../Oem/dbxml/install/bin/db_upgrade ${prefix}/bin/
- @cp -fp ../../../Oem/dbxml/install/bin/db_verify ${prefix}/bin/
- @cp -fp ../../../Oem/dbxml/install/bin/dbxml ${prefix}/bin/
- @cp -fp ../../../Oem/dbxml/install/bin/dbxml_dump ${prefix}/bin/
- @cp -fp ../../../Oem/dbxml/install/bin/dbxml_load ${prefix}/bin/
+ @cp -fp $(mg_oem_dbxml_src)/install/bin/db_archive ${prefix}/bin/
+ @cp -fp $(mg_oem_dbxml_src)/install/bin/db_checkpoint ${prefix}/bin/
+ @cp -fp $(mg_oem_dbxml_src)/install/bin/db_dump ${prefix}/bin/
+ @cp -fp $(mg_oem_dbxml_src)/install/bin/db_hotbackup ${prefix}/bin/
+ @cp -fp $(mg_oem_dbxml_src)/install/bin/db_load ${prefix}/bin/
+ @cp -fp $(mg_oem_dbxml_src)/install/bin/db_recover ${prefix}/bin/
+ @cp -fp $(mg_oem_dbxml_src)/install/bin/db_upgrade ${prefix}/bin/
+ @cp -fp $(mg_oem_dbxml_src)/install/bin/db_verify ${prefix}/bin/
+ @cp -fp $(mg_oem_dbxml_src)/install/bin/dbxml ${prefix}/bin/
+ @cp -fp $(mg_oem_dbxml_src)/install/bin/dbxml_dump ${prefix}/bin/
+ @cp -fp $(mg_oem_dbxml_src)/install/bin/dbxml_load ${prefix}/bin/
@cp -fp ../../RepositoryAdmin/*.sh $(repositoryadmindir)
@cp -fp ../../RepositoryAdmin/*.php $(repositoryadmindir)
@cp -fp ../../RepositoryAdmin/*.inc $(repositoryadmindir)
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/Core/ServerCore.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/Core/ServerCore.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/Core/ServerCore.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -93,7 +93,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\Common;..\Common\Base;..\Common\Cache;..\Common\Manager;..\Common\Thread;..\Services\Drawing;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Profiling;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\gd\freetype\include;..\..\..\Oem\FDO\inc;..\..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\Common;..\Common\Base;..\Common\Cache;..\Common\Manager;..\Common\Thread;..\Services\Drawing;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Profiling;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Renderers;..\..\..\Common\Stylization;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FREETYPE_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;ACE_HAS_SVC_DLL=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -104,9 +104,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;xerces-c_3mgD.lib;FDOCommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);FDOCommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)mgserver.exe</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\Oem\dbxml\lib\$(Configuration);..\..\..\Oem\FDO\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDOCommon.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)mgserver.pdb</ProgramDatabaseFile>
@@ -122,7 +122,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\Common;..\Common\Base;..\Common\Cache;..\Common\Manager;..\Common\Thread;..\Services\Drawing;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Profiling;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\gd\freetype\include;..\..\..\Oem\FDO\inc;..\..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\Common;..\Common\Base;..\Common\Cache;..\Common\Manager;..\Common\Thread;..\Services\Drawing;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Profiling;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Renderers;..\..\..\Common\Stylization;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FREETYPE_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;ACE_HAS_SVC_DLL=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -133,9 +133,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;xerces-c_3mgD.lib;FDOCommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);FDOCommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)mgserver.exe</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\dbxml\lib64\$(Configuration);..\..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDOCommon.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)mgserver.pdb</ProgramDatabaseFile>
@@ -152,7 +152,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\Common;..\Common\Base;..\Common\Cache;..\Common\Manager;..\Common\Thread;..\Services\Drawing;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Profiling;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\gd\freetype\include;..\..\..\Oem\FDO\inc;..\..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\Common;..\Common\Base;..\Common\Cache;..\Common\Manager;..\Common\Thread;..\Services\Drawing;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Profiling;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Renderers;..\..\..\Common\Stylization;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FREETYPE_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;ACE_HAS_SVC_DLL=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
@@ -164,9 +164,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;xerces-c_3mg.lib;FDOCommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);FDOCommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)mgserver.exe</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\Oem\dbxml\lib\$(Configuration);..\..\..\Oem\FDO\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDOCommon.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)mgserver.pdb</ProgramDatabaseFile>
@@ -184,7 +184,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\Common;..\Common\Base;..\Common\Cache;..\Common\Manager;..\Common\Thread;..\Services\Drawing;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Profiling;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Renderers;..\..\..\Common\Stylization;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\gd\freetype\include;..\..\..\Oem\FDO\inc;..\..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\Common;..\Common\Base;..\Common\Cache;..\Common\Manager;..\Common\Thread;..\Services\Drawing;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Profiling;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Renderers;..\..\..\Common\Stylization;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FREETYPE_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;ACE_HAS_SVC_DLL=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
@@ -196,9 +196,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;xerces-c_3mg.lib;FDOCommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);FDOCommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)mgserver.exe</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\dbxml\lib64\$(Configuration);..\..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDOCommon.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)mgserver.pdb</ProgramDatabaseFile>
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/Core/serverconfig.ini
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/Core/serverconfig.ini 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/Core/serverconfig.ini 2015-10-19 10:53:12 UTC (rev 8789)
@@ -100,7 +100,7 @@
MachineIp = 127.0.0.1
MaxLogFileSize = 1024
MaxLogFileSizeEnabled = 0
-MentorDictionaryPath = ../../../Oem/CsMap/Dictionaries/
+MentorDictionaryPath = ../../../../Oem/CsMap/Dictionaries/
MentorUserDictionaryPath =
PreCacheMaps =
Renderer = AGG
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/Gws/GwsCommon/GwsCommon.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/Gws/GwsCommon/GwsCommon.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/Gws/GwsCommon/GwsCommon.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -92,7 +92,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>.\inc;..\Include;..\GwsResource;..\..\..\..\Oem\FDO\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>.\inc;..\Include;..\GwsResource;$(MG_OEM_FDO_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GWSCOMMON_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -104,7 +104,7 @@
<Link>
<AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgGwsCommond.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\FDO\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_FDO_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;FDOGeometry.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgGwsCommond.pdb</ProgramDatabaseFile>
@@ -119,7 +119,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>.\inc;..\Include;..\GwsResource;..\..\..\..\Oem\FDO\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>.\inc;..\Include;..\GwsResource;$(MG_OEM_FDO_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GWSCOMMON_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -131,7 +131,7 @@
<Link>
<AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgGwsCommond.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_FDO_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;FDOGeometry.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgGwsCommond.pdb</ProgramDatabaseFile>
@@ -146,7 +146,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>.\inc;..\Include;..\GwsResource;..\..\..\..\Oem\FDO\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>.\inc;..\Include;..\GwsResource;$(MG_OEM_FDO_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GWSCOMMON_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -157,7 +157,7 @@
<Link>
<AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgGwsCommon.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\FDO\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_FDO_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;FDOGeometry.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgGwsCommon.pdb</ProgramDatabaseFile>
@@ -174,7 +174,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>.\inc;..\Include;..\GwsResource;..\..\..\..\Oem\FDO\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>.\inc;..\Include;..\GwsResource;$(MG_OEM_FDO_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GWSCOMMON_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
<Link>
<AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgGwsCommon.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_FDO_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;FDOGeometry.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgGwsCommon.pdb</ProgramDatabaseFile>
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/Gws/GwsCommon/Makefile.am
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/Gws/GwsCommon/Makefile.am 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/Gws/GwsCommon/Makefile.am 2015-10-19 10:53:12 UTC (rev 8789)
@@ -40,7 +40,7 @@
-I../Include \
-I../GwsResource \
-I./inc \
- -I../../../../Oem/ACE/ACE_wrappers \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
-I../../../../Common/Foundation \
-I../../../../Common/Geometry
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/Gws/GwsQueryEngine/GwsQueryEngine.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/Gws/GwsQueryEngine/GwsQueryEngine.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/Gws/GwsQueryEngine/GwsQueryEngine.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>.\inc;..\Include;..\GwsCommon\inc;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>.\inc;..\Include;..\GwsCommon\inc;$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;GWSQUERYENGINE_EXPORTS;_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -108,7 +108,7 @@
<Link>
<AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;ExpressionEngine.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgGwsQueryEngined.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\FDO\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_FDO_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>GwsQueryEngine.def</ModuleDefinitionFile>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;FDOGeometry.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -124,7 +124,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>.\inc;..\Include;..\GwsCommon\inc;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>.\inc;..\Include;..\GwsCommon\inc;$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;GWSQUERYENGINE_EXPORTS;_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -138,7 +138,7 @@
<Link>
<AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;ExpressionEngine.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgGwsQueryEngined.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_FDO_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>GwsQueryEngine.def</ModuleDefinitionFile>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;FDOGeometry.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -154,7 +154,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>.\inc;..\Include;..\GwsCommon\inc;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>.\inc;..\Include;..\GwsCommon\inc;$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GWSQUERYENGINE_EXPORTS;_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
@@ -169,7 +169,7 @@
<Link>
<AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;ExpressionEngine.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgGwsQueryEngine.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\FDO\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_FDO_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>GwsQueryEngine.def</ModuleDefinitionFile>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;FDOGeometry.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -187,7 +187,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>.\inc;..\Include;..\GwsCommon\inc;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>.\inc;..\Include;..\GwsCommon\inc;$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GWSQUERYENGINE_EXPORTS;_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
@@ -202,7 +202,7 @@
<Link>
<AdditionalDependencies>FDO.lib;FDOCommon.lib;FDOGeometry.lib;ExpressionEngine.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgGwsQueryEngine.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_FDO_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>GwsQueryEngine.def</ModuleDefinitionFile>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;FDOGeometry.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/PostBuild/PostBuild.mak
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/PostBuild/PostBuild.mak 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/PostBuild/PostBuild.mak 2015-10-19 10:53:12 UTC (rev 8789)
@@ -1,118 +1,43 @@
-..\..\bin\debug\MgFoundationd.dll : ..\..\..\Common\bin\debug\MgFoundationd.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug\MgFoundationd.dll ..\..\bin\debug\
+CopyBinariesDebug:
+ xcopy /r /d /y ..\..\..\Common\bin\debug\*.* "..\..\bin\debug\"
+ xcopy /r /d /y $(MG_OEM_ACE_BIN_DIR)\ACEd.dll "..\..\bin\debug\"
+ xcopy /r /d /y $(MG_OEM_ACE_BIN_DIR)\ACEd.pdb "..\..\bin\debug\"
+ xcopy /r /d /y $(MG_OEM_GD_BIN_DIR)\gd.dll "..\..\bin\debug\"
+ xcopy /r /d /y $(MG_OEM_GD_BIN_DIR)\gd.pdb "..\..\bin\debug\"
+ xcopy /r /d /y $(MG_OEM_GEOS_BIN_DIR)\GEOSd.dll "..\..\bin\debug\"
+ xcopy /r /d /y $(MG_OEM_GEOS_BIN_DIR)\GEOSd.pdb "..\..\bin\debug\"
+ xcopy /r /d /y $(MG_OEM_DBXML_BIN_DIR)\libdb48d.dll "..\..\bin\debug\"
+ xcopy /r /d /y $(MG_OEM_DBXML_BIN_DIR)\libdb48d.pdb "..\..\bin\debug\"
+ xcopy /r /d /y $(MG_OEM_DBXML_BIN_DIR)\libdbxml25d.dll "..\..\bin\debug\"
+ xcopy /r /d /y $(MG_OEM_DBXML_BIN_DIR)\libdbxml25d.pdb "..\..\bin\debug\"
+ xcopy /r /d /y $(MG_OEM_DBXML_BIN_DIR)\xqilla24d.dll "..\..\bin\debug\"
+ xcopy /r /d /y $(MG_OEM_DBXML_BIN_DIR)\xqilla24d.pdb "..\..\bin\debug\"
+ xcopy /r /d /y $(MG_OEM_DBXML_BIN_DIR)\xerces-c_3_1mgD.dll "..\..\bin\debug\"
+ xcopy /r /d /y $(MG_OEM_DBXML_BIN_DIR)\xerces-c_3_1mgD.pdb "..\..\bin\debug\"
+ xcopy /r /d /y ..\..\src\Core\serverconfig.ini "..\..\bin\debug\"
-..\..\bin\debug\MgFoundationd.pdb : ..\..\..\Common\bin\debug\MgFoundationd.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug\MgFoundationd.pdb ..\..\bin\debug\
-
-..\..\bin\debug\MgPlatformBased.dll : ..\..\..\Common\bin\debug\MgPlatformBased.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug\MgPlatformBased.dll ..\..\bin\debug\
-
-..\..\bin\debug\MgPlatformBased.pdb : ..\..\..\Common\bin\debug\MgPlatformBased.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug\MgPlatformBased.pdb ..\..\bin\debug\
-
-..\..\bin\debug\MgGeometryd.dll : ..\..\..\Common\bin\debug\MgGeometryd.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug\MgGeometryd.dll ..\..\bin\debug\
-
-..\..\bin\debug\MgGeometryd.pdb : ..\..\..\Common\bin\debug\MgGeometryd.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug\MgGeometryd.pdb ..\..\bin\debug\
-
-..\..\bin\debug\MgMapGuideCommond.dll : ..\..\..\Common\bin\debug\MgMapGuideCommond.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug\MgMapGuideCommond.dll ..\..\bin\debug\
-
-..\..\bin\debug\MgMapGuideCommond.pdb : ..\..\..\Common\bin\debug\MgMapGuideCommond.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug\MgMapGuideCommond.pdb ..\..\bin\debug\
-
-..\..\bin\debug\MgMdfModeld.dll : ..\..\..\Common\bin\debug\MgMdfModeld.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug\MgMdfModeld.dll ..\..\bin\debug\
-
-..\..\bin\debug\MgMdfModeld.pdb : ..\..\..\Common\bin\debug\MgMdfModeld.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug\MgMdfModeld.pdb ..\..\bin\debug\
-
-..\..\bin\debug\MgMdfParserd.dll : ..\..\..\Common\bin\debug\MgMdfParserd.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug\MgMdfParserd.dll ..\..\bin\debug\
-
-..\..\bin\debug\MgMdfParserd.pdb : ..\..\..\Common\bin\debug\MgMdfParserd.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug\MgMdfParserd.pdb ..\..\bin\debug\
-
-..\..\bin\debug\MgStylizationd.dll : ..\..\..\Common\bin\debug\MgStylizationd.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug\MgStylizationd.dll ..\..\bin\debug\
-
-..\..\bin\debug\MgStylizationd.pdb : ..\..\..\Common\bin\debug\MgStylizationd.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug\MgStylizationd.pdb ..\..\bin\debug\
-
-..\..\bin\debug\MgRenderersd.dll : ..\..\..\Common\bin\debug\MgRenderersd.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug\MgRenderersd.dll ..\..\bin\debug\
-
-..\..\bin\debug\MgRenderersd.pdb : ..\..\..\Common\bin\debug\MgRenderersd.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug\MgRenderersd.pdb ..\..\bin\debug\
-
-..\..\bin\debug\ACEd.dll : ..\..\..\Oem\ACE\ACE_wrappers\lib\debug\ACEd.dll
- xcopy /r /d /y ..\..\..\Oem\ACE\ACE_wrappers\lib\debug\ACEd.dll ..\..\bin\debug\
-
-..\..\bin\debug\ACEd.pdb : ..\..\..\Oem\ACE\ACE_wrappers\lib\debug\ACEd.pdb
- xcopy /r /d /y ..\..\..\Oem\ACE\ACE_wrappers\lib\debug\ACEd.pdb ..\..\bin\debug\
-
-..\..\bin\debug\gd.dll : ..\..\..\Oem\gd\build\win32\gd\Debug\gd.dll
- xcopy /r /d /y ..\..\..\Oem\gd\build\win32\gd\Debug\gd.dll ..\..\bin\debug\
-
-..\..\bin\debug\gd.pdb : ..\..\..\Oem\gd\build\win32\gd\Debug\gd.pdb
- xcopy /r /d /y ..\..\..\Oem\gd\build\win32\gd\Debug\gd.pdb ..\..\bin\debug\
-
-..\..\bin\debug\GEOSd.dll : ..\..\..\Oem\geos\VisualStudio\Debug\GEOSd.dll
- xcopy /r /d /y ..\..\..\Oem\geos\VisualStudio\Debug\GEOSd.dll ..\..\bin\debug\
-
-..\..\bin\debug\GEOSd.pdb : ..\..\..\Oem\geos\VisualStudio\Debug\GEOSd.pdb
- xcopy /r /d /y ..\..\..\Oem\geos\VisualStudio\Debug\GEOSd.pdb ..\..\bin\debug\
-
-..\..\bin\debug\libdb48d.dll : ..\..\..\Oem\dbxml\bin\debug\libdb48d.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\debug\libdb48d.dll ..\..\bin\debug\
-
-..\..\bin\debug\libdb48d.pdb : ..\..\..\Oem\dbxml\bin\debug\libdb48d.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\debug\libdb48d.pdb ..\..\bin\debug\
-
-..\..\bin\debug\libdbxml25d.dll : ..\..\..\Oem\dbxml\bin\debug\libdbxml25d.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\debug\libdbxml25d.dll ..\..\bin\debug\
-
-..\..\bin\debug\libdbxml25d.pdb : ..\..\..\Oem\dbxml\bin\debug\libdbxml25d.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\debug\libdbxml25d.pdb ..\..\bin\debug\
-
-..\..\bin\debug\xqilla24d.dll : ..\..\..\Oem\dbxml\bin\debug\xqilla24d.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\debug\xqilla24d.dll ..\..\bin\debug\
-
-..\..\bin\debug\xqilla24d.pdb : ..\..\..\Oem\dbxml\bin\debug\xqilla24d.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\debug\xqilla24d.pdb ..\..\bin\debug\
-
-..\..\bin\debug\xerces-c_3_1mgD.dll : ..\..\..\Oem\dbxml\bin\debug\xerces-c_3_1mgD.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\debug\xerces-c_3_1mgD.dll ..\..\bin\debug\
-
-..\..\bin\debug\xerces-c_3_1mgD.pdb : ..\..\..\Oem\dbxml\bin\debug\xerces-c_3_1mgD.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\debug\xerces-c_3_1mgD.pdb ..\..\bin\debug\
-
-..\..\bin\debug\serverconfig.ini : ..\..\src\Core\serverconfig.ini
- xcopy /r /d /y ..\..\src\Core\serverconfig.ini ..\..\bin\debug\
-
-CopyFdoComponentsDebug : ..\..\..\Oem\FDO\*.*
+CopyFdoComponentsDebug:
if NOT EXIST ..\..\bin\debug\FDO\nul mkdir ..\..\bin\debug\FDO
- xcopy /r /d /y /s ..\..\..\Oem\FDO\bin\Release ..\..\bin\debug\FDO\
+ xcopy /r /d /y /s $(MG_OEM_FDO_ROOT)\bin\Release ..\..\bin\debug\FDO\
-CopyFdoProvidersDebug : ..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml
- xcopy /r /d /y "..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml" ..\..\bin\debug\FDO\
+CopyFdoProvidersDebug:
+ xcopy /r /d /y "$(MG_OEM_FDO_ROOT)\ProviderList\ServerCommunity\providers.xml" ..\..\bin\debug\FDO\
-CopySchemaDebug : ..\..\..\Common\Schema\*.xsd
+CopySchemaDebug:
if NOT EXIST ..\..\bin\debug\Schema\nul mkdir ..\..\bin\debug\Schema
xcopy /r /d /y ..\..\..\Common\Schema\*.xsd ..\..\bin\debug\Schema
-CopyResourcesDebug : ..\..\..\Common\MapGuideCommon\Resources\mapguide_en.res
+CopyResourcesDebug:
if NOT EXIST ..\..\bin\debug\Resources\nul mkdir ..\..\bin\debug\Resources
xcopy /r /d /y "..\..\..\Common\MapGuideCommon\Resources\mapguide_en.res" ..\..\bin\debug\Resources\
-CopyOgcFilesDebug : ..\..\src\wms\*.awd ..\..\src\wfs\*.awd
+CopyOgcFilesDebug:
if NOT EXIST ..\..\bin\debug\wms\nul mkdir ..\..\bin\debug\wms
xcopy /r /d /y "..\..\src\wms\*.awd" ..\..\bin\debug\wms
if NOT EXIST ..\..\bin\debug\wfs\nul mkdir ..\..\bin\debug\wfs
xcopy /r /d /y "..\..\src\wfs\*.awd" ..\..\bin\debug\wfs
-CreatePathsDebug :
+CreatePathsDebug:
if NOT EXIST ..\..\bin\debug\Logs\nul mkdir ..\..\bin\debug\Logs
if NOT EXIST ..\..\bin\debug\Packages\nul mkdir ..\..\bin\debug\Packages
if NOT EXIST ..\..\bin\debug\Temp\nul mkdir ..\..\bin\debug\Temp
@@ -126,269 +51,55 @@
if NOT EXIST ..\..\bin\debug\Repositories\Site\nul mkdir ..\..\bin\debug\Repositories\Site
if NOT EXIST ..\..\bin\debug\Repositories\TileCache\nul mkdir ..\..\bin\debug\Repositories\TileCache
-debug : ..\..\bin\debug\MgFoundationd.dll \
- ..\..\bin\debug\MgFoundationd.pdb \
- ..\..\bin\debug\MgGeometryd.dll \
- ..\..\bin\debug\MgGeometryd.pdb \
- ..\..\bin\debug\MgPlatformBased.dll \
- ..\..\bin\debug\MgPlatformBased.pdb \
- ..\..\bin\debug\MgMapGuideCommond.dll \
- ..\..\bin\debug\MgMapGuideCommond.pdb \
- ..\..\bin\debug\MgMdfModeld.dll \
- ..\..\bin\debug\MgMdfModeld.pdb \
- ..\..\bin\debug\MgMdfParserd.dll \
- ..\..\bin\debug\MgMdfParserd.pdb \
- ..\..\bin\debug\MgStylizationd.dll \
- ..\..\bin\debug\MgStylizationd.pdb \
- ..\..\bin\debug\MgRenderersd.dll \
- ..\..\bin\debug\MgRenderersd.pdb \
- ..\..\bin\debug\ACEd.dll \
- ..\..\bin\debug\ACEd.pdb \
- ..\..\bin\debug\gd.dll \
- ..\..\bin\debug\gd.pdb \
- ..\..\bin\debug\GEOSd.dll \
- ..\..\bin\debug\GEOSd.pdb \
- ..\..\bin\debug\libdb48d.dll \
- ..\..\bin\debug\libdb48d.pdb \
- ..\..\bin\debug\libdbxml25d.dll \
- ..\..\bin\debug\libdbxml25d.pdb \
- ..\..\bin\debug\xqilla24d.dll \
- ..\..\bin\debug\xqilla24d.pdb \
- ..\..\bin\debug\xerces-c_3_1mgD.dll \
- ..\..\bin\debug\xerces-c_3_1mgD.pdb \
- ..\..\bin\debug\serverconfig.ini \
- ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml \
- ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml \
- ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml \
- ..\..\bin\UnitTestFiles\TEST.LayerDefinition \
- ..\..\bin\UnitTestFiles\TEST.FeatureSource \
- ..\..\bin\UnitTestFiles\TEST.sdf \
- ..\..\bin\UnitTestFiles\UT_BaseMap.mdf \
- ..\..\bin\UnitTestFiles\UT_BaseMap.tsd \
- ..\..\bin\UnitTestFiles\UT_XYZ.tsd \
- ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf \
- ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf \
- ..\..\bin\UnitTestFiles\UT_Parcels.fs \
- ..\..\bin\UnitTestFiles\UT_Parcels.ldf \
- ..\..\bin\UnitTestFiles\UT_Parcels.sdf \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.fs \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf \
- ..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf \
- ..\..\bin\UnitTestFiles\UT_AllElements.pl \
- ..\..\bin\UnitTestFiles\UT_NoLegend.pl \
- ..\..\bin\UnitTestFiles\UT_SymbolMart.sl \
- ..\..\bin\UnitTestFiles\UT_Symbols.dwf \
- ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf \
- ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf \
- ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf \
- ..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf \
- ..\..\bin\UnitTestFiles\UT_Rail.sdf \
- ..\..\bin\UnitTestFiles\UT_Rail.fs \
- ..\..\bin\UnitTestFiles\UT_Rail.ldf \
- ..\..\bin\UnitTestFiles\UT_Rail.wdf \
- ..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf \
- ..\..\bin\UnitTestFiles\UT_MultiCTS.ldf \
- ..\..\bin\UnitTestFiles\UT_MultiCTSWithTheme.ldf \
- ..\..\bin\UnitTestFiles\UT_MultiFTS.ldf \
- ..\..\bin\UnitTestFiles\UT_MultiFTSSingleCTS.ldf \
- ..\..\bin\UnitTestFiles\UT_MultiFTSWithTheme.ldf \
- ..\..\bin\UnitTestFiles\UT_SingleFTSMultiCTS.ldf \
- ..\..\bin\UnitTestFiles\UT_RotatedPointStyles.ldf \
- ..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf \
- ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf \
- ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf \
- ..\..\bin\UnitTestFiles\Empty.FeatureSource \
- ..\..\bin\UnitTestFiles\Empty.sdf \
- ..\..\bin\UnitTestFiles\World.mgp \
- ..\..\bin\UnitTestFiles\World_Countries.sdf \
- ..\..\bin\UnitTestFiles\Shuttle.zip \
- ..\..\bin\UnitTestFiles\test.dwf \
- ..\..\bin\UnitTestFiles\SpaceShip.dwf \
- ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml \
- ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml \
- ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource \
- ..\..\bin\UnitTestFiles\Redding_Parcels.shp \
- ..\..\bin\UnitTestFiles\Redding_Parcels.dbf \
- ..\..\bin\UnitTestFiles\Redding_Parcels.shx \
- ..\..\bin\UnitTestFiles\1.1.1.mgd \
- ..\..\bin\UnitTestFiles\epsgcodes.txt \
- ..\..\bin\UnitTestFiles\ogcwkts.txt \
- ..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt \
- ..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt \
- ..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt \
- ..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource \
- ..\..\bin\UnitTestFiles\MdfTestMap.mdf \
- ..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf \
- ..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd \
- ..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd \
- ..\..\bin\UnitTestFiles\areasymbol.sd \
- ..\..\bin\UnitTestFiles\linesymbol.sd \
- ..\..\bin\UnitTestFiles\symbol.sd \
- ..\..\bin\UnitTestFiles\symbolp.sd \
- ..\..\bin\UnitTestFiles\MTYP1500a.sd \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation1.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation1.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation2.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation2.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation3.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation3.mdf \
- ..\..\bin\UnitTestFiles\SavePointTest.sqlite \
- ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource \
- ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource \
- ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource \
- ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite \
- ..\..\bin\UnitTestFiles\JoinTest.sqlite \
- CopyFdoComponentsDebug \
- CopyFdoProvidersDebug \
- CopySchemaDebug \
- CopyResourcesDebug \
- CreatePathsDebug \
- CopyOgcFilesDebug
+debug: CopyBinariesDebug \
+ CopyTestData \
+ CopyFdoComponentsDebug \
+ CopyFdoProvidersDebug \
+ CopySchemaDebug \
+ CopyResourcesDebug \
+ CreatePathsDebug \
+ CopyOgcFilesDebug
+CopyBinariesDebug64:
+ xcopy /r /d /y ..\..\..\Common\bin\debug64\*.* "..\..\bin\debug64\"
+ xcopy /r /d /y $(MG_OEM_ACE_BIN_DIR)\ACEd.dll "..\..\bin\debug64\"
+ xcopy /r /d /y $(MG_OEM_ACE_BIN_DIR)\ACEd.pdb "..\..\bin\debug64\"
+ xcopy /r /d /y $(MG_OEM_GD_BIN_DIR)\gd.dll "..\..\bin\debug64\"
+ xcopy /r /d /y $(MG_OEM_GD_BIN_DIR)\gd.pdb "..\..\bin\debug64\"
+ xcopy /r /d /y $(MG_OEM_GEOS_BIN_DIR)\GEOSd.dll "..\..\bin\debug64\"
+ xcopy /r /d /y $(MG_OEM_GEOS_BIN_DIR)\GEOSd.pdb "..\..\bin\debug64\"
+ xcopy /r /d /y $(MG_OEM_DBXML_BIN_DIR)\libdb48d.dll "..\..\bin\debug64\"
+ xcopy /r /d /y $(MG_OEM_DBXML_BIN_DIR)\libdb48d.pdb "..\..\bin\debug64\"
+ xcopy /r /d /y $(MG_OEM_DBXML_BIN_DIR)\libdbxml25d.dll "..\..\bin\debug64\"
+ xcopy /r /d /y $(MG_OEM_DBXML_BIN_DIR)\libdbxml25d.pdb "..\..\bin\debug64\"
+ xcopy /r /d /y $(MG_OEM_DBXML_BIN_DIR)\xqilla24d.dll "..\..\bin\debug64\"
+ xcopy /r /d /y $(MG_OEM_DBXML_BIN_DIR)\xqilla24d.pdb "..\..\bin\debug64\"
+ xcopy /r /d /y $(MG_OEM_DBXML_BIN_DIR)\xerces-c_3_1mgD.dll "..\..\bin\debug64\"
+ xcopy /r /d /y $(MG_OEM_DBXML_BIN_DIR)\xerces-c_3_1mgD.pdb "..\..\bin\debug64\"
+ xcopy /r /d /y ..\..\src\Core\serverconfig.ini "..\..\bin\debug64\"
-..\..\bin\debug64\MgFoundationd.dll : ..\..\..\Common\bin\debug64\MgFoundationd.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug64\MgFoundationd.dll ..\..\bin\debug64\
-
-..\..\bin\debug64\MgFoundationd.pdb : ..\..\..\Common\bin\debug64\MgFoundationd.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug64\MgFoundationd.pdb ..\..\bin\debug64\
-
-..\..\bin\debug64\MgPlatformBased.dll : ..\..\..\Common\bin\debug64\MgPlatformBased.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug64\MgPlatformBased.dll ..\..\bin\debug64\
-
-..\..\bin\debug64\MgPlatformBased.pdb : ..\..\..\Common\bin\debug64\MgPlatformBased.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug64\MgPlatformBased.pdb ..\..\bin\debug64\
-
-..\..\bin\debug64\MgGeometryd.dll : ..\..\..\Common\bin\debug64\MgGeometryd.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug64\MgGeometryd.dll ..\..\bin\debug64\
-
-..\..\bin\debug64\MgGeometryd.pdb : ..\..\..\Common\bin\debug64\MgGeometryd.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug64\MgGeometryd.pdb ..\..\bin\debug64\
-
-..\..\bin\debug64\MgMapGuideCommond.dll : ..\..\..\Common\bin\debug64\MgMapGuideCommond.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug64\MgMapGuideCommond.dll ..\..\bin\debug64\
-
-..\..\bin\debug64\MgMapGuideCommond.pdb : ..\..\..\Common\bin\debug64\MgMapGuideCommond.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug64\MgMapGuideCommond.pdb ..\..\bin\debug64\
-
-..\..\bin\debug64\MgMdfModeld.dll : ..\..\..\Common\bin\debug64\MgMdfModeld.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug64\MgMdfModeld.dll ..\..\bin\debug64\
-
-..\..\bin\debug64\MgMdfModeld.pdb : ..\..\..\Common\bin\debug64\MgMdfModeld.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug64\MgMdfModeld.pdb ..\..\bin\debug64\
-
-..\..\bin\debug64\MgMdfParserd.dll : ..\..\..\Common\bin\debug64\MgMdfParserd.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug64\MgMdfParserd.dll ..\..\bin\debug64\
-
-..\..\bin\debug64\MgMdfParserd.pdb : ..\..\..\Common\bin\debug64\MgMdfParserd.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug64\MgMdfParserd.pdb ..\..\bin\debug64\
-
-..\..\bin\debug64\MgStylizationd.dll : ..\..\..\Common\bin\debug64\MgStylizationd.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug64\MgStylizationd.dll ..\..\bin\debug64\
-
-..\..\bin\debug64\MgStylizationd.pdb : ..\..\..\Common\bin\debug64\MgStylizationd.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug64\MgStylizationd.pdb ..\..\bin\debug64\
-
-..\..\bin\debug64\MgRenderersd.dll : ..\..\..\Common\bin\debug64\MgRenderersd.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug64\MgRenderersd.dll ..\..\bin\debug64\
-
-..\..\bin\debug64\MgRenderersd.pdb : ..\..\..\Common\bin\debug64\MgRenderersd.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug64\MgRenderersd.pdb ..\..\bin\debug64\
-
-..\..\bin\debug64\ACEd.dll : ..\..\..\Oem\ACE\ACE_wrappers\lib64\debug\ACEd.dll
- xcopy /r /d /y ..\..\..\Oem\ACE\ACE_wrappers\lib64\debug\ACEd.dll ..\..\bin\debug64\
-
-..\..\bin\debug64\ACEd.pdb : ..\..\..\Oem\ACE\ACE_wrappers\lib64\debug\ACEd.pdb
- xcopy /r /d /y ..\..\..\Oem\ACE\ACE_wrappers\lib64\debug\ACEd.pdb ..\..\bin\debug64\
-
-..\..\bin\debug64\gd.dll : ..\..\..\Oem\gd\build\win32\gd\debug64\gd.dll
- xcopy /r /d /y ..\..\..\Oem\gd\build\win32\gd\debug64\gd.dll ..\..\bin\debug64\
-
-..\..\bin\debug64\gd.pdb : ..\..\..\Oem\gd\build\win32\gd\debug64\gd.pdb
- xcopy /r /d /y ..\..\..\Oem\gd\build\win32\gd\debug64\gd.pdb ..\..\bin\debug64\
-
-..\..\bin\debug64\GEOSd.dll : ..\..\..\Oem\geos\VisualStudio\Debug64\GEOSd.dll
- xcopy /r /d /y ..\..\..\Oem\geos\VisualStudio\Debug64\GEOSd.dll ..\..\bin\debug64\
-
-..\..\bin\debug64\GEOSd.pdb : ..\..\..\Oem\geos\VisualStudio\Debug64\GEOSd.pdb
- xcopy /r /d /y ..\..\..\Oem\geos\VisualStudio\Debug64\GEOSd.pdb ..\..\bin\debug64\
-
-..\..\bin\debug64\libdb48d.dll : ..\..\..\Oem\dbxml\bin64\debug\libdb48d.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\debug\libdb48d.dll ..\..\bin\debug64\
-
-..\..\bin\debug64\libdb48d.pdb : ..\..\..\Oem\dbxml\bin64\debug\libdb48d.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\debug\libdb48d.pdb ..\..\bin\debug64\
-
-..\..\bin\debug64\libdbxml25d.dll : ..\..\..\Oem\dbxml\bin64\debug\libdbxml25d.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\debug\libdbxml25d.dll ..\..\bin\debug64\
-
-..\..\bin\debug64\libdbxml25d.pdb : ..\..\..\Oem\dbxml\bin64\debug\libdbxml25d.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\debug\libdbxml25d.pdb ..\..\bin\debug64\
-
-..\..\bin\debug64\xqilla24d.dll : ..\..\..\Oem\dbxml\bin64\debug\xqilla24d.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\debug\xqilla24d.dll ..\..\bin\debug64\
-
-..\..\bin\debug64\xqilla24d.pdb : ..\..\..\Oem\dbxml\bin64\debug\xqilla24d.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\debug\xqilla24d.pdb ..\..\bin\debug64\
-
-..\..\bin\debug64\xerces-c_3_1mgD.dll : ..\..\..\Oem\dbxml\bin64\debug\xerces-c_3_1mgD.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\debug\xerces-c_3_1mgD.dll ..\..\bin\debug64\
-
-..\..\bin\debug64\xerces-c_3_1mgD.pdb : ..\..\..\Oem\dbxml\bin64\debug\xerces-c_3_1mgD.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\debug\xerces-c_3_1mgD.pdb ..\..\bin\debug64\
-
-..\..\bin\debug64\serverconfig.ini : ..\..\src\Core\serverconfig.ini
- xcopy /r /d /y ..\..\src\Core\serverconfig.ini ..\..\bin\debug64\
-
-CopyFdoComponentsDebug64 : ..\..\..\Oem\FDO\*.*
+CopyFdoComponentsDebug64:
if NOT EXIST ..\..\bin\debug64\FDO\nul mkdir ..\..\bin\debug64\FDO
- xcopy /r /d /y /s ..\..\..\Oem\FDO\bin\release64 ..\..\bin\debug64\FDO\
+ xcopy /r /d /y /s $(MG_OEM_FDO_ROOT)\bin\release64 ..\..\bin\debug64\FDO\
-CopyFdoProvidersDebug64 : ..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml
- xcopy /r /d /y "..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml" ..\..\bin\debug64\FDO\
+CopyFdoProvidersDebug64:
+ xcopy /r /d /y "$(MG_OEM_FDO_ROOT)\ProviderList\ServerCommunity\providers.xml" ..\..\bin\debug64\FDO\
-CopySchemaDebug64 : ..\..\..\Common\Schema\*.xsd
+CopySchemaDebug64:
if NOT EXIST ..\..\bin\debug64\Schema\nul mkdir ..\..\bin\debug64\Schema
xcopy /r /d /y ..\..\..\Common\Schema\*.xsd ..\..\bin\debug64\Schema
-CopyResourcesDebug64 : ..\..\..\Common\MapGuideCommon\Resources\mapguide_en.res
+CopyResourcesDebug64:
if NOT EXIST ..\..\bin\debug64\Resources\nul mkdir ..\..\bin\debug64\Resources
xcopy /r /d /y "..\..\..\Common\MapGuideCommon\Resources\mapguide_en.res" ..\..\bin\debug64\Resources\
-CopyOgcFilesDebug64 : ..\..\src\wms\*.awd ..\..\src\wfs\*.awd
+CopyOgcFilesDebug64:
if NOT EXIST ..\..\bin\debug64\wms\nul mkdir ..\..\bin\debug64\wms
xcopy /r /d /y "..\..\src\wms\*.awd" ..\..\bin\debug64\wms
if NOT EXIST ..\..\bin\debug64\wfs\nul mkdir ..\..\bin\debug64\wfs
xcopy /r /d /y "..\..\src\wfs\*.awd" ..\..\bin\debug64\wfs
-CreatePathsDebug64 :
+CreatePathsDebug64:
if NOT EXIST ..\..\bin\debug64\Logs\nul mkdir ..\..\bin\debug64\Logs
if NOT EXIST ..\..\bin\debug64\Packages\nul mkdir ..\..\bin\debug64\Packages
if NOT EXIST ..\..\bin\debug64\Temp\nul mkdir ..\..\bin\debug64\Temp
@@ -402,269 +113,55 @@
if NOT EXIST ..\..\bin\debug64\Repositories\Site\nul mkdir ..\..\bin\debug64\Repositories\Site
if NOT EXIST ..\..\bin\debug64\Repositories\TileCache\nul mkdir ..\..\bin\debug64\Repositories\TileCache
-debug64 : ..\..\bin\debug64\MgFoundationd.dll \
- ..\..\bin\debug64\MgFoundationd.pdb \
- ..\..\bin\debug64\MgGeometryd.dll \
- ..\..\bin\debug64\MgGeometryd.pdb \
- ..\..\bin\debug64\MgPlatformBased.dll \
- ..\..\bin\debug64\MgPlatformBased.pdb \
- ..\..\bin\debug64\MgMapGuideCommond.dll \
- ..\..\bin\debug64\MgMapGuideCommond.pdb \
- ..\..\bin\debug64\MgMdfModeld.dll \
- ..\..\bin\debug64\MgMdfModeld.pdb \
- ..\..\bin\debug64\MgMdfParserd.dll \
- ..\..\bin\debug64\MgMdfParserd.pdb \
- ..\..\bin\debug64\MgStylizationd.dll \
- ..\..\bin\debug64\MgStylizationd.pdb \
- ..\..\bin\debug64\MgRenderersd.dll \
- ..\..\bin\debug64\MgRenderersd.pdb \
- ..\..\bin\debug64\ACEd.dll \
- ..\..\bin\debug64\ACEd.pdb \
- ..\..\bin\debug64\gd.dll \
- ..\..\bin\debug64\gd.pdb \
- ..\..\bin\debug64\GEOSd.dll \
- ..\..\bin\debug64\GEOSd.pdb \
- ..\..\bin\debug64\libdb48d.dll \
- ..\..\bin\debug64\libdb48d.pdb \
- ..\..\bin\debug64\libdbxml25d.dll \
- ..\..\bin\debug64\libdbxml25d.pdb \
- ..\..\bin\debug64\xqilla24d.dll \
- ..\..\bin\debug64\xqilla24d.pdb \
- ..\..\bin\debug64\xerces-c_3_1mgD.dll \
- ..\..\bin\debug64\xerces-c_3_1mgD.pdb \
- ..\..\bin\debug64\serverconfig.ini \
- ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml \
- ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml \
- ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml \
- ..\..\bin\UnitTestFiles\TEST.LayerDefinition \
- ..\..\bin\UnitTestFiles\TEST.FeatureSource \
- ..\..\bin\UnitTestFiles\TEST.sdf \
- ..\..\bin\UnitTestFiles\UT_BaseMap.mdf \
- ..\..\bin\UnitTestFiles\UT_BaseMap.tsd \
- ..\..\bin\UnitTestFiles\UT_XYZ.tsd \
- ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf \
- ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf \
- ..\..\bin\UnitTestFiles\UT_Parcels.fs \
- ..\..\bin\UnitTestFiles\UT_Parcels.ldf \
- ..\..\bin\UnitTestFiles\UT_Parcels.sdf \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.fs \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf \
- ..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf \
- ..\..\bin\UnitTestFiles\UT_AllElements.pl \
- ..\..\bin\UnitTestFiles\UT_NoLegend.pl \
- ..\..\bin\UnitTestFiles\UT_SymbolMart.sl \
- ..\..\bin\UnitTestFiles\UT_Symbols.dwf \
- ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf \
- ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf \
- ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf \
- ..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf \
- ..\..\bin\UnitTestFiles\UT_Rail.sdf \
- ..\..\bin\UnitTestFiles\UT_Rail.fs \
- ..\..\bin\UnitTestFiles\UT_Rail.ldf \
- ..\..\bin\UnitTestFiles\UT_Rail.wdf \
- ..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf \
- ..\..\bin\UnitTestFiles\UT_MultiCTS.ldf \
- ..\..\bin\UnitTestFiles\UT_MultiCTSWithTheme.ldf \
- ..\..\bin\UnitTestFiles\UT_MultiFTS.ldf \
- ..\..\bin\UnitTestFiles\UT_MultiFTSSingleCTS.ldf \
- ..\..\bin\UnitTestFiles\UT_MultiFTSWithTheme.ldf \
- ..\..\bin\UnitTestFiles\UT_SingleFTSMultiCTS.ldf \
- ..\..\bin\UnitTestFiles\UT_RotatedPointStyles.ldf \
- ..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf \
- ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf \
- ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf \
- ..\..\bin\UnitTestFiles\Empty.FeatureSource \
- ..\..\bin\UnitTestFiles\Empty.sdf \
- ..\..\bin\UnitTestFiles\World.mgp \
- ..\..\bin\UnitTestFiles\World_Countries.sdf \
- ..\..\bin\UnitTestFiles\Shuttle.zip \
- ..\..\bin\UnitTestFiles\test.dwf \
- ..\..\bin\UnitTestFiles\SpaceShip.dwf \
- ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml \
- ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml \
- ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource \
- ..\..\bin\UnitTestFiles\Redding_Parcels.shp \
- ..\..\bin\UnitTestFiles\Redding_Parcels.dbf \
- ..\..\bin\UnitTestFiles\Redding_Parcels.shx \
- ..\..\bin\UnitTestFiles\1.1.1.mgd \
- ..\..\bin\UnitTestFiles\epsgcodes.txt \
- ..\..\bin\UnitTestFiles\ogcwkts.txt \
- ..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt \
- ..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt \
- ..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt \
- ..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource \
- ..\..\bin\UnitTestFiles\MdfTestMap.mdf \
- ..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf \
- ..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd \
- ..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd \
- ..\..\bin\UnitTestFiles\areasymbol.sd \
- ..\..\bin\UnitTestFiles\linesymbol.sd \
- ..\..\bin\UnitTestFiles\symbol.sd \
- ..\..\bin\UnitTestFiles\symbolp.sd \
- ..\..\bin\UnitTestFiles\MTYP1500a.sd \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation1.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation1.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation2.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation2.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation3.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation3.mdf \
- ..\..\bin\UnitTestFiles\SavePointTest.sqlite \
- ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource \
- ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource \
- ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource \
- ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite \
- ..\..\bin\UnitTestFiles\JoinTest.sqlite \
- CopyFdoComponentsDebug64 \
- CopyFdoProvidersDebug64 \
- CopySchemaDebug64 \
- CopyResourcesDebug64 \
- CreatePathsDebug64 \
- CopyOgcFilesDebug64
+debug64: CopyBinariesDebug64 \
+ CopyTestData \
+ CopyFdoComponentsDebug64 \
+ CopyFdoProvidersDebug64 \
+ CopySchemaDebug64 \
+ CopyResourcesDebug64 \
+ CreatePathsDebug64 \
+ CopyOgcFilesDebug64
+CopyBinariesRelease:
+ xcopy /r /d /y ..\..\..\Common\bin\release\*.* "..\..\bin\release\"
+ xcopy /r /d /y $(MG_OEM_ACE_BIN_DIR)\ACE.dll "..\..\bin\release\"
+ xcopy /r /d /y $(MG_OEM_ACE_BIN_DIR)\ACE.pdb "..\..\bin\release\"
+ xcopy /r /d /y $(MG_OEM_GD_BIN_DIR)\gd.dll "..\..\bin\release\"
+ xcopy /r /d /y $(MG_OEM_GD_BIN_DIR)\gd.pdb "..\..\bin\release\"
+ xcopy /r /d /y $(MG_OEM_GEOS_BIN_DIR)\GEOS.dll "..\..\bin\release\"
+ xcopy /r /d /y $(MG_OEM_GEOS_BIN_DIR)\GEOS.pdb "..\..\bin\release\"
+ xcopy /r /d /y $(MG_OEM_DBXML_BIN_DIR)\libdb48.dll "..\..\bin\release\"
+ xcopy /r /d /y $(MG_OEM_DBXML_BIN_DIR)\libdb48.pdb "..\..\bin\release\"
+ xcopy /r /d /y $(MG_OEM_DBXML_BIN_DIR)\libdbxml25.dll "..\..\bin\release\"
+ xcopy /r /d /y $(MG_OEM_DBXML_BIN_DIR)\libdbxml25.pdb "..\..\bin\release\"
+ xcopy /r /d /y $(MG_OEM_DBXML_BIN_DIR)\xqilla24.dll "..\..\bin\release\"
+ xcopy /r /d /y $(MG_OEM_DBXML_BIN_DIR)\xqilla24.pdb "..\..\bin\release\"
+ xcopy /r /d /y $(MG_OEM_DBXML_BIN_DIR)\xerces-c_3_1mg.dll "..\..\bin\release\"
+ xcopy /r /d /y $(MG_OEM_DBXML_BIN_DIR)\xerces-c_3_1mg.pdb "..\..\bin\release\"
+ xcopy /r /d /y ..\..\src\Core\serverconfig.ini "..\..\bin\release\"
-..\..\bin\release\MgFoundation.dll : ..\..\..\Common\bin\release\MgFoundation.dll
- xcopy /r /d /y ..\..\..\Common\bin\release\MgFoundation.dll ..\..\bin\release\
-
-..\..\bin\release\MgFoundation.pdb : ..\..\..\Common\bin\release\MgFoundation.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release\MgFoundation.pdb ..\..\bin\release\
-
-..\..\bin\release\MgPlatformBase.dll : ..\..\..\Common\bin\release\MgPlatformBase.dll
- xcopy /r /d /y ..\..\..\Common\bin\release\MgPlatformBase.dll ..\..\bin\release\
-
-..\..\bin\release\MgPlatformBase.pdb : ..\..\..\Common\bin\release\MgPlatformBase.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release\MgPlatformBase.pdb ..\..\bin\release\
-
-..\..\bin\release\MgGeometry.dll : ..\..\..\Common\bin\release\MgGeometry.dll
- xcopy /r /d /y ..\..\..\Common\bin\release\MgGeometry.dll ..\..\bin\release\
-
-..\..\bin\release\MgGeometry.pdb : ..\..\..\Common\bin\release\MgGeometry.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release\MgGeometry.pdb ..\..\bin\release\
-
-..\..\bin\release\MgMapGuideCommon.dll : ..\..\..\Common\bin\release\MgMapGuideCommon.dll
- xcopy /r /d /y ..\..\..\Common\bin\release\MgMapGuideCommon.dll ..\..\bin\release\
-
-..\..\bin\release\MgMapGuideCommon.pdb : ..\..\..\Common\bin\release\MgMapGuideCommon.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release\MgMapGuideCommon.pdb ..\..\bin\release\
-
-..\..\bin\release\MgMdfModel.dll : ..\..\..\Common\bin\release\MgMdfModel.dll
- xcopy /r /d /y ..\..\..\Common\bin\release\MgMdfModel.dll ..\..\bin\release\
-
-..\..\bin\release\MgMdfModel.pdb : ..\..\..\Common\bin\release\MgMdfModel.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release\MgMdfModel.pdb ..\..\bin\release\
-
-..\..\bin\release\MgMdfParser.dll : ..\..\..\Common\bin\release\MgMdfParser.dll
- xcopy /r /d /y ..\..\..\Common\bin\release\MgMdfParser.dll ..\..\bin\release\
-
-..\..\bin\release\MgMdfParser.pdb : ..\..\..\Common\bin\release\MgMdfParser.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release\MgMdfParser.pdb ..\..\bin\release\
-
-..\..\bin\release\MgStylization.dll : ..\..\..\Common\bin\release\MgStylization.dll
- xcopy /r /d /y ..\..\..\Common\bin\release\MgStylization.dll ..\..\bin\release\
-
-..\..\bin\release\MgStylization.pdb : ..\..\..\Common\bin\release\MgStylization.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release\MgStylization.pdb ..\..\bin\release\
-
-..\..\bin\release\MgRenderers.dll : ..\..\..\Common\bin\release\MgRenderers.dll
- xcopy /r /d /y ..\..\..\Common\bin\release\MgRenderers.dll ..\..\bin\release\
-
-..\..\bin\release\MgRenderers.pdb : ..\..\..\Common\bin\release\MgRenderers.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release\MgRenderers.pdb ..\..\bin\release\
-
-..\..\bin\release\ACE.dll : ..\..\..\Oem\ACE\ACE_wrappers\lib\release\ACE.dll
- xcopy /r /d /y ..\..\..\Oem\ACE\ACE_wrappers\lib\release\ACE.dll ..\..\bin\release\
-
-..\..\bin\release\ACE.pdb : ..\..\..\Oem\ACE\ACE_wrappers\lib\release\ACE.pdb
- xcopy /r /d /y ..\..\..\Oem\ACE\ACE_wrappers\lib\release\ACE.pdb ..\..\bin\release\
-
-..\..\bin\release\gd.dll : ..\..\..\Oem\gd\build\win32\gd\Release\gd.dll
- xcopy /r /d /y ..\..\..\Oem\gd\build\win32\gd\Release\gd.dll ..\..\bin\release\
-
-..\..\bin\release\gd.pdb : ..\..\..\Oem\gd\build\win32\gd\Release\gd.pdb
- xcopy /r /d /y ..\..\..\Oem\gd\build\win32\gd\Release\gd.pdb ..\..\bin\release\
-
-..\..\bin\release\GEOS.dll : ..\..\..\Oem\geos\VisualStudio\Release\GEOS.dll
- xcopy /r /d /y ..\..\..\Oem\geos\VisualStudio\Release\GEOS.dll ..\..\bin\release\
-
-..\..\bin\release\GEOS.pdb : ..\..\..\Oem\geos\VisualStudio\Release\GEOS.pdb
- xcopy /r /d /y ..\..\..\Oem\geos\VisualStudio\Release\GEOS.pdb ..\..\bin\release\
-
-..\..\bin\release\libdb48.dll : ..\..\..\Oem\dbxml\bin\release\libdb48.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\release\libdb48.dll ..\..\bin\release\
-
-..\..\bin\release\libdb48.pdb : ..\..\..\Oem\dbxml\bin\release\libdb48.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\release\libdb48.pdb ..\..\bin\release\
-
-..\..\bin\release\libdbxml25.dll : ..\..\..\Oem\dbxml\bin\release\libdbxml25.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\release\libdbxml25.dll ..\..\bin\release\
-
-..\..\bin\release\libdbxml25.pdb : ..\..\..\Oem\dbxml\bin\release\libdbxml25.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\release\libdbxml25.pdb ..\..\bin\release\
-
-..\..\bin\release\xqilla24.dll : ..\..\..\Oem\dbxml\bin\release\xqilla24.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\release\xqilla24.dll ..\..\bin\release\
-
-..\..\bin\release\xqilla24.pdb : ..\..\..\Oem\dbxml\bin\release\xqilla24.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\release\xqilla24.pdb ..\..\bin\release\
-
-..\..\bin\release\xerces-c_3_1mg.dll : ..\..\..\Oem\dbxml\bin\release\xerces-c_3_1mg.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\release\xerces-c_3_1mg.dll ..\..\bin\release\
-
-..\..\bin\release\xerces-c_3_1mg.pdb : ..\..\..\Oem\dbxml\bin\release\xerces-c_3_1mg.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\release\xerces-c_3_1mg.pdb ..\..\bin\release\
-
-..\..\bin\release\serverconfig.ini : ..\..\src\Core\serverconfig.ini
- xcopy /r /d /y ..\..\src\Core\serverconfig.ini ..\..\bin\release\
-
-CopyFdoComponentsRelease : ..\..\..\Oem\FDO\*.*
+CopyFdoComponentsRelease:
if NOT EXIST ..\..\bin\release\FDO\nul mkdir ..\..\bin\release\FDO
- xcopy /r /d /y /s ..\..\..\Oem\FDO\bin\Release ..\..\bin\release\FDO\
+ xcopy /r /d /y /s $(MG_OEM_FDO_ROOT)\bin\Release ..\..\bin\release\FDO\
-CopyFdoProvidersRelease : ..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml
- xcopy /r /d /y "..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml" ..\..\bin\release\FDO\
+CopyFdoProvidersRelease:
+ xcopy /r /d /y "$(MG_OEM_FDO_ROOT)\ProviderList\ServerCommunity\providers.xml" ..\..\bin\release\FDO\
-CopySchemaRelease : ..\..\..\Common\Schema\*.xsd
+CopySchemaRelease:
if NOT EXIST ..\..\bin\release\Schema\nul mkdir ..\..\bin\release\Schema
xcopy /r /d /y ..\..\..\Common\Schema\*.xsd ..\..\bin\release\Schema
-CopyResourcesRelease : ..\..\..\Common\MapGuideCommon\Resources\mapguide_en.res
+CopyResourcesRelease:
if NOT EXIST ..\..\bin\release\Resources\nul mkdir ..\..\bin\release\Resources
xcopy /r /d /y "..\..\..\Common\MapGuideCommon\Resources\mapguide_en.res" ..\..\bin\release\Resources\
-CopyOgcFilesRelease : ..\..\src\wms\*.awd ..\..\src\wfs\*.awd
+CopyOgcFilesRelease:
if NOT EXIST ..\..\bin\release\wms\nul mkdir ..\..\bin\release\wms
xcopy /r /d /y "..\..\src\wms\*.awd" ..\..\bin\release\wms
if NOT EXIST ..\..\bin\release\wfs\nul mkdir ..\..\bin\release\wfs
xcopy /r /d /y "..\..\src\wfs\*.awd" ..\..\bin\release\wfs
-CreatePathsRelease :
+CreatePathsRelease:
if NOT EXIST ..\..\bin\release\Logs\nul mkdir ..\..\bin\release\Logs
if NOT EXIST ..\..\bin\release\Packages\nul mkdir ..\..\bin\release\Packages
if NOT EXIST ..\..\bin\release\Temp\nul mkdir ..\..\bin\release\Temp
@@ -678,269 +175,55 @@
if NOT EXIST ..\..\bin\release\Repositories\Site\nul mkdir ..\..\bin\release\Repositories\Site
if NOT EXIST ..\..\bin\release\Repositories\TileCache\nul mkdir ..\..\bin\release\Repositories\TileCache
-release : ..\..\bin\release\MgFoundation.dll \
- ..\..\bin\release\MgFoundation.pdb \
- ..\..\bin\release\MgGeometry.dll \
- ..\..\bin\release\MgGeometry.pdb \
- ..\..\bin\release\MgPlatformBase.dll \
- ..\..\bin\release\MgPlatformBase.pdb \
- ..\..\bin\release\MgMapGuideCommon.dll \
- ..\..\bin\release\MgMapGuideCommon.pdb \
- ..\..\bin\release\MgMdfModel.dll \
- ..\..\bin\release\MgMdfModel.pdb \
- ..\..\bin\release\MgMdfParser.dll \
- ..\..\bin\release\MgMdfParser.pdb \
- ..\..\bin\release\MgStylization.dll \
- ..\..\bin\release\MgStylization.pdb \
- ..\..\bin\release\MgRenderers.dll \
- ..\..\bin\release\MgRenderers.pdb \
- ..\..\bin\release\ACE.dll \
- ..\..\bin\release\ACE.pdb \
- ..\..\bin\release\gd.dll \
- ..\..\bin\release\gd.pdb \
- ..\..\bin\release\GEOS.dll \
- ..\..\bin\release\GEOS.pdb \
- ..\..\bin\release\libdb48.dll \
- ..\..\bin\release\libdb48.pdb \
- ..\..\bin\release\libdbxml25.dll \
- ..\..\bin\release\libdbxml25.pdb \
- ..\..\bin\release\xqilla24.dll \
- ..\..\bin\release\xqilla24.pdb \
- ..\..\bin\release\xerces-c_3_1mg.dll \
- ..\..\bin\release\xerces-c_3_1mg.pdb \
- ..\..\bin\release\serverconfig.ini \
- ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml \
- ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml \
- ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml \
- ..\..\bin\UnitTestFiles\TEST.LayerDefinition \
- ..\..\bin\UnitTestFiles\TEST.FeatureSource \
- ..\..\bin\UnitTestFiles\TEST.sdf \
- ..\..\bin\UnitTestFiles\UT_BaseMap.mdf \
- ..\..\bin\UnitTestFiles\UT_BaseMap.tsd \
- ..\..\bin\UnitTestFiles\UT_XYZ.tsd \
- ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf \
- ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf \
- ..\..\bin\UnitTestFiles\UT_Parcels.fs \
- ..\..\bin\UnitTestFiles\UT_Parcels.ldf \
- ..\..\bin\UnitTestFiles\UT_Parcels.sdf \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.fs \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf \
- ..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf \
- ..\..\bin\UnitTestFiles\UT_AllElements.pl \
- ..\..\bin\UnitTestFiles\UT_NoLegend.pl \
- ..\..\bin\UnitTestFiles\UT_SymbolMart.sl \
- ..\..\bin\UnitTestFiles\UT_Symbols.dwf \
- ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf \
- ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf \
- ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf \
- ..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf \
- ..\..\bin\UnitTestFiles\UT_Rail.sdf \
- ..\..\bin\UnitTestFiles\UT_Rail.fs \
- ..\..\bin\UnitTestFiles\UT_Rail.ldf \
- ..\..\bin\UnitTestFiles\UT_Rail.wdf \
- ..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf \
- ..\..\bin\UnitTestFiles\UT_MultiCTS.ldf \
- ..\..\bin\UnitTestFiles\UT_MultiCTSWithTheme.ldf \
- ..\..\bin\UnitTestFiles\UT_MultiFTS.ldf \
- ..\..\bin\UnitTestFiles\UT_MultiFTSSingleCTS.ldf \
- ..\..\bin\UnitTestFiles\UT_MultiFTSWithTheme.ldf \
- ..\..\bin\UnitTestFiles\UT_SingleFTSMultiCTS.ldf \
- ..\..\bin\UnitTestFiles\UT_RotatedPointStyles.ldf \
- ..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf \
- ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf \
- ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf \
- ..\..\bin\UnitTestFiles\Empty.FeatureSource \
- ..\..\bin\UnitTestFiles\Empty.sdf \
- ..\..\bin\UnitTestFiles\World.mgp \
- ..\..\bin\UnitTestFiles\World_Countries.sdf \
- ..\..\bin\UnitTestFiles\Shuttle.zip \
- ..\..\bin\UnitTestFiles\test.dwf \
- ..\..\bin\UnitTestFiles\SpaceShip.dwf \
- ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml \
- ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml \
- ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource \
- ..\..\bin\UnitTestFiles\Redding_Parcels.shp \
- ..\..\bin\UnitTestFiles\Redding_Parcels.dbf \
- ..\..\bin\UnitTestFiles\Redding_Parcels.shx \
- ..\..\bin\UnitTestFiles\1.1.1.mgd \
- ..\..\bin\UnitTestFiles\epsgcodes.txt \
- ..\..\bin\UnitTestFiles\ogcwkts.txt \
- ..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt \
- ..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt \
- ..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt \
- ..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource \
- ..\..\bin\UnitTestFiles\MdfTestMap.mdf \
- ..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf \
- ..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd \
- ..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd \
- ..\..\bin\UnitTestFiles\areasymbol.sd \
- ..\..\bin\UnitTestFiles\linesymbol.sd \
- ..\..\bin\UnitTestFiles\symbol.sd \
- ..\..\bin\UnitTestFiles\symbolp.sd \
- ..\..\bin\UnitTestFiles\MTYP1500a.sd \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation1.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation1.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation2.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation2.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation3.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation3.mdf \
- ..\..\bin\UnitTestFiles\SavePointTest.sqlite \
- ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource \
- ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource \
- ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource \
- ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite \
- ..\..\bin\UnitTestFiles\JoinTest.sqlite \
- CopyFdoComponentsRelease \
- CopyFdoProvidersRelease \
- CopySchemaRelease \
- CopyResourcesRelease \
- CreatePathsRelease \
- CopyOgcFilesRelease
+release: CopyBinariesRelease \
+ CopyTestData \
+ CopyFdoComponentsRelease \
+ CopyFdoProvidersRelease \
+ CopySchemaRelease \
+ CopyResourcesRelease \
+ CreatePathsRelease \
+ CopyOgcFilesRelease
+CopyBinariesRelease64:
+ xcopy /r /d /y ..\..\..\Common\bin\release64\*.* "..\..\bin\release64\"
+ xcopy /r /d /y $(MG_OEM_ACE_BIN_DIR)\ACE.dll "..\..\bin\release64\"
+ xcopy /r /d /y $(MG_OEM_ACE_BIN_DIR)\ACE.pdb "..\..\bin\release64\"
+ xcopy /r /d /y $(MG_OEM_GD_BIN_DIR)\gd.dll "..\..\bin\release64\"
+ xcopy /r /d /y $(MG_OEM_GD_BIN_DIR)\gd.pdb "..\..\bin\release64\"
+ xcopy /r /d /y $(MG_OEM_GEOS_BIN_DIR)\GEOS.dll "..\..\bin\release64\"
+ xcopy /r /d /y $(MG_OEM_GEOS_BIN_DIR)\GEOS.pdb "..\..\bin\release64\"
+ xcopy /r /d /y $(MG_OEM_DBXML_BIN_DIR)\libdb48.dll "..\..\bin\release64\"
+ xcopy /r /d /y $(MG_OEM_DBXML_BIN_DIR)\libdb48.pdb "..\..\bin\release64\"
+ xcopy /r /d /y $(MG_OEM_DBXML_BIN_DIR)\libdbxml25.dll "..\..\bin\release64\"
+ xcopy /r /d /y $(MG_OEM_DBXML_BIN_DIR)\libdbxml25.pdb "..\..\bin\release64\"
+ xcopy /r /d /y $(MG_OEM_DBXML_BIN_DIR)\xqilla24.dll "..\..\bin\release64\"
+ xcopy /r /d /y $(MG_OEM_DBXML_BIN_DIR)\xqilla24.pdb "..\..\bin\release64\"
+ xcopy /r /d /y $(MG_OEM_DBXML_BIN_DIR)\xerces-c_3_1mg.dll "..\..\bin\release64\"
+ xcopy /r /d /y $(MG_OEM_DBXML_BIN_DIR)\xerces-c_3_1mg.pdb "..\..\bin\release64\"
+ xcopy /r /d /y ..\..\src\Core\serverconfig.ini "..\..\bin\release64\"
-..\..\bin\release64\MgFoundation.dll : ..\..\..\Common\bin\release64\MgFoundation.dll
- xcopy /r /d /y ..\..\..\Common\bin\release64\MgFoundation.dll ..\..\bin\release64\
-
-..\..\bin\release64\MgFoundation.pdb : ..\..\..\Common\bin\release64\MgFoundation.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release64\MgFoundation.pdb ..\..\bin\release64\
-
-..\..\bin\release64\MgPlatformBase.dll : ..\..\..\Common\bin\release64\MgPlatformBase.dll
- xcopy /r /d /y ..\..\..\Common\bin\release64\MgPlatformBase.dll ..\..\bin\release64\
-
-..\..\bin\release64\MgPlatformBase.pdb : ..\..\..\Common\bin\release64\MgPlatformBase.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release64\MgPlatformBase.pdb ..\..\bin\release64\
-
-..\..\bin\release64\MgGeometry.dll : ..\..\..\Common\bin\release64\MgGeometry.dll
- xcopy /r /d /y ..\..\..\Common\bin\release64\MgGeometry.dll ..\..\bin\release64\
-
-..\..\bin\release64\MgGeometry.pdb : ..\..\..\Common\bin\release64\MgGeometry.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release64\MgGeometry.pdb ..\..\bin\release64\
-
-..\..\bin\release64\MgMapGuideCommon.dll : ..\..\..\Common\bin\release64\MgMapGuideCommon.dll
- xcopy /r /d /y ..\..\..\Common\bin\release64\MgMapGuideCommon.dll ..\..\bin\release64\
-
-..\..\bin\release64\MgMapGuideCommon.pdb : ..\..\..\Common\bin\release64\MgMapGuideCommon.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release64\MgMapGuideCommon.pdb ..\..\bin\release64\
-
-..\..\bin\release64\MgMdfModel.dll : ..\..\..\Common\bin\release64\MgMdfModel.dll
- xcopy /r /d /y ..\..\..\Common\bin\release64\MgMdfModel.dll ..\..\bin\release64\
-
-..\..\bin\release64\MgMdfModel.pdb : ..\..\..\Common\bin\release64\MgMdfModel.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release64\MgMdfModel.pdb ..\..\bin\release64\
-
-..\..\bin\release64\MgMdfParser.dll : ..\..\..\Common\bin\release64\MgMdfParser.dll
- xcopy /r /d /y ..\..\..\Common\bin\release64\MgMdfParser.dll ..\..\bin\release64\
-
-..\..\bin\release64\MgMdfParser.pdb : ..\..\..\Common\bin\release64\MgMdfParser.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release64\MgMdfParser.pdb ..\..\bin\release64\
-
-..\..\bin\release64\MgStylization.dll : ..\..\..\Common\bin\release64\MgStylization.dll
- xcopy /r /d /y ..\..\..\Common\bin\release64\MgStylization.dll ..\..\bin\release64\
-
-..\..\bin\release64\MgStylization.pdb : ..\..\..\Common\bin\release64\MgStylization.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release64\MgStylization.pdb ..\..\bin\release64\
-
-..\..\bin\release64\MgRenderers.dll : ..\..\..\Common\bin\release64\MgRenderers.dll
- xcopy /r /d /y ..\..\..\Common\bin\release64\MgRenderers.dll ..\..\bin\release64\
-
-..\..\bin\release64\MgRenderers.pdb : ..\..\..\Common\bin\release64\MgRenderers.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release64\MgRenderers.pdb ..\..\bin\release64\
-
-..\..\bin\release64\ACE.dll : ..\..\..\Oem\ACE\ACE_wrappers\lib64\release\ACE.dll
- xcopy /r /d /y ..\..\..\Oem\ACE\ACE_wrappers\lib64\release\ACE.dll ..\..\bin\release64\
-
-..\..\bin\release64\ACE.pdb : ..\..\..\Oem\ACE\ACE_wrappers\lib64\release\ACE.pdb
- xcopy /r /d /y ..\..\..\Oem\ACE\ACE_wrappers\lib64\release\ACE.pdb ..\..\bin\release64\
-
-..\..\bin\release64\gd.dll : ..\..\..\Oem\gd\build\win32\gd\release64\gd.dll
- xcopy /r /d /y ..\..\..\Oem\gd\build\win32\gd\release64\gd.dll ..\..\bin\release64\
-
-..\..\bin\release64\gd.pdb : ..\..\..\Oem\gd\build\win32\gd\release64\gd.pdb
- xcopy /r /d /y ..\..\..\Oem\gd\build\win32\gd\release64\gd.pdb ..\..\bin\release64\
-
-..\..\bin\release64\GEOS.dll : ..\..\..\Oem\geos\VisualStudio\Release64\GEOS.dll
- xcopy /r /d /y ..\..\..\Oem\geos\VisualStudio\Release64\GEOS.dll ..\..\bin\release64\
-
-..\..\bin\release64\GEOS.pdb : ..\..\..\Oem\geos\VisualStudio\Release64\GEOS.pdb
- xcopy /r /d /y ..\..\..\Oem\geos\VisualStudio\Release64\GEOS.pdb ..\..\bin\release64\
-
-..\..\bin\release64\libdb48.dll : ..\..\..\Oem\dbxml\bin64\release\libdb48.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\release\libdb48.dll ..\..\bin\release64\
-
-..\..\bin\release64\libdb48.pdb : ..\..\..\Oem\dbxml\bin64\release\libdb48.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\release\libdb48.pdb ..\..\bin\release64\
-
-..\..\bin\release64\libdbxml25.dll : ..\..\..\Oem\dbxml\bin64\release\libdbxml25.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\release\libdbxml25.dll ..\..\bin\release64\
-
-..\..\bin\release64\libdbxml25.pdb : ..\..\..\Oem\dbxml\bin64\release\libdbxml25.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\release\libdbxml25.pdb ..\..\bin\release64\
-
-..\..\bin\release64\xqilla24.dll : ..\..\..\Oem\dbxml\bin64\release\xqilla24.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\release\xqilla24.dll ..\..\bin\release64\
-
-..\..\bin\release64\xqilla24.pdb : ..\..\..\Oem\dbxml\bin64\release\xqilla24.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\release\xqilla24.pdb ..\..\bin\release64\
-
-..\..\bin\release64\xerces-c_3_1mg.dll : ..\..\..\Oem\dbxml\bin64\release\xerces-c_3_1mg.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\release\xerces-c_3_1mg.dll ..\..\bin\release64\
-
-..\..\bin\release64\xerces-c_3_1mg.pdb : ..\..\..\Oem\dbxml\bin64\release\xerces-c_3_1mg.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\release\xerces-c_3_1mg.pdb ..\..\bin\release64\
-
-..\..\bin\release64\serverconfig.ini : ..\..\src\Core\serverconfig.ini
- xcopy /r /d /y ..\..\src\Core\serverconfig.ini ..\..\bin\release64\
-
-CopyFdoComponentsRelease64 : ..\..\..\Oem\FDO\*.*
+CopyFdoComponentsRelease64:
if NOT EXIST ..\..\bin\release64\FDO\nul mkdir ..\..\bin\release64\FDO
- xcopy /r /d /y /s ..\..\..\Oem\FDO\bin\release64 ..\..\bin\release64\FDO\
+ xcopy /r /d /y /s $(MG_OEM_FDO_ROOT)\bin\release64 ..\..\bin\release64\FDO\
-CopyFdoProvidersRelease64 : ..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml
- xcopy /r /d /y "..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml" ..\..\bin\release64\FDO\
+CopyFdoProvidersRelease64:
+ xcopy /r /d /y "$(MG_OEM_FDO_ROOT)\ProviderList\ServerCommunity\providers.xml" ..\..\bin\release64\FDO\
-CopySchemaRelease64 : ..\..\..\Common\Schema\*.xsd
+CopySchemaRelease64:
if NOT EXIST ..\..\bin\release64\Schema\nul mkdir ..\..\bin\release64\Schema
xcopy /r /d /y ..\..\..\Common\Schema\*.xsd ..\..\bin\release64\Schema
-CopyResourcesRelease64 : ..\..\..\Common\MapGuideCommon\Resources\mapguide_en.res
+CopyResourcesRelease64:
if NOT EXIST ..\..\bin\release64\Resources\nul mkdir ..\..\bin\release64\Resources
xcopy /r /d /y "..\..\..\Common\MapGuideCommon\Resources\mapguide_en.res" ..\..\bin\release64\Resources\
-CopyOgcFilesRelease64 : ..\..\src\wms\*.awd ..\..\src\wfs\*.awd
+CopyOgcFilesRelease64:
if NOT EXIST ..\..\bin\release64\wms\nul mkdir ..\..\bin\release64\wms
xcopy /r /d /y "..\..\src\wms\*.awd" ..\..\bin\release64\wms
if NOT EXIST ..\..\bin\release64\wfs\nul mkdir ..\..\bin\release64\wfs
xcopy /r /d /y "..\..\src\wfs\*.awd" ..\..\bin\release64\wfs
-CreatePathsRelease64 :
+CreatePathsRelease64:
if NOT EXIST ..\..\bin\release64\Logs\nul mkdir ..\..\bin\release64\Logs
if NOT EXIST ..\..\bin\release64\Packages\nul mkdir ..\..\bin\release64\Packages
if NOT EXIST ..\..\bin\release64\Temp\nul mkdir ..\..\bin\release64\Temp
@@ -954,186 +237,16 @@
if NOT EXIST ..\..\bin\release64\Repositories\Site\nul mkdir ..\..\bin\release64\Repositories\Site
if NOT EXIST ..\..\bin\release64\Repositories\TileCache\nul mkdir ..\..\bin\release64\Repositories\TileCache
-release64 : ..\..\bin\release64\MgFoundation.dll \
- ..\..\bin\release64\MgFoundation.pdb \
- ..\..\bin\release64\MgGeometry.dll \
- ..\..\bin\release64\MgGeometry.pdb \
- ..\..\bin\release64\MgPlatformBase.dll \
- ..\..\bin\release64\MgPlatformBase.pdb \
- ..\..\bin\release64\MgMapGuideCommon.dll \
- ..\..\bin\release64\MgMapGuideCommon.pdb \
- ..\..\bin\release64\MgMdfModel.dll \
- ..\..\bin\release64\MgMdfModel.pdb \
- ..\..\bin\release64\MgMdfParser.dll \
- ..\..\bin\release64\MgMdfParser.pdb \
- ..\..\bin\release64\MgStylization.dll \
- ..\..\bin\release64\MgStylization.pdb \
- ..\..\bin\release64\MgRenderers.dll \
- ..\..\bin\release64\MgRenderers.pdb \
- ..\..\bin\release64\ACE.dll \
- ..\..\bin\release64\ACE.pdb \
- ..\..\bin\release64\gd.dll \
- ..\..\bin\release64\gd.pdb \
- ..\..\bin\release64\GEOS.dll \
- ..\..\bin\release64\GEOS.pdb \
- ..\..\bin\release64\libdb48.dll \
- ..\..\bin\release64\libdb48.pdb \
- ..\..\bin\release64\libdbxml25.dll \
- ..\..\bin\release64\libdbxml25.pdb \
- ..\..\bin\release64\xqilla24.dll \
- ..\..\bin\release64\xqilla24.pdb \
- ..\..\bin\release64\xerces-c_3_1mg.dll \
- ..\..\bin\release64\xerces-c_3_1mg.pdb \
- ..\..\bin\release64\serverconfig.ini \
- ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml \
- ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml \
- ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml \
- ..\..\bin\UnitTestFiles\TEST.LayerDefinition \
- ..\..\bin\UnitTestFiles\TEST.FeatureSource \
- ..\..\bin\UnitTestFiles\TEST.sdf \
- ..\..\bin\UnitTestFiles\UT_BaseMap.mdf \
- ..\..\bin\UnitTestFiles\UT_BaseMap.tsd \
- ..\..\bin\UnitTestFiles\UT_XYZ.tsd \
- ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf \
- ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf \
- ..\..\bin\UnitTestFiles\UT_Parcels.fs \
- ..\..\bin\UnitTestFiles\UT_Parcels.ldf \
- ..\..\bin\UnitTestFiles\UT_Parcels.sdf \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.fs \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf \
- ..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf \
- ..\..\bin\UnitTestFiles\UT_AllElements.pl \
- ..\..\bin\UnitTestFiles\UT_NoLegend.pl \
- ..\..\bin\UnitTestFiles\UT_SymbolMart.sl \
- ..\..\bin\UnitTestFiles\UT_Symbols.dwf \
- ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf \
- ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf \
- ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf \
- ..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf \
- ..\..\bin\UnitTestFiles\UT_Rail.sdf \
- ..\..\bin\UnitTestFiles\UT_Rail.fs \
- ..\..\bin\UnitTestFiles\UT_Rail.ldf \
- ..\..\bin\UnitTestFiles\UT_Rail.wdf \
- ..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf \
- ..\..\bin\UnitTestFiles\UT_MultiCTS.ldf \
- ..\..\bin\UnitTestFiles\UT_MultiCTSWithTheme.ldf \
- ..\..\bin\UnitTestFiles\UT_MultiFTS.ldf \
- ..\..\bin\UnitTestFiles\UT_MultiFTSSingleCTS.ldf \
- ..\..\bin\UnitTestFiles\UT_MultiFTSWithTheme.ldf \
- ..\..\bin\UnitTestFiles\UT_SingleFTSMultiCTS.ldf \
- ..\..\bin\UnitTestFiles\UT_RotatedPointStyles.ldf \
- ..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf \
- ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf \
- ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf \
- ..\..\bin\UnitTestFiles\Empty.FeatureSource \
- ..\..\bin\UnitTestFiles\Empty.sdf \
- ..\..\bin\UnitTestFiles\World.mgp \
- ..\..\bin\UnitTestFiles\World_Countries.sdf \
- ..\..\bin\UnitTestFiles\Shuttle.zip \
- ..\..\bin\UnitTestFiles\test.dwf \
- ..\..\bin\UnitTestFiles\SpaceShip.dwf \
- ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml \
- ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml \
- ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource \
- ..\..\bin\UnitTestFiles\Redding_Parcels.shp \
- ..\..\bin\UnitTestFiles\Redding_Parcels.dbf \
- ..\..\bin\UnitTestFiles\Redding_Parcels.shx \
- ..\..\bin\UnitTestFiles\1.1.1.mgd \
- ..\..\bin\UnitTestFiles\epsgcodes.txt \
- ..\..\bin\UnitTestFiles\ogcwkts.txt \
- ..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt \
- ..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt \
- ..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt \
- ..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource \
- ..\..\bin\UnitTestFiles\MdfTestMap.mdf \
- ..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf \
- ..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd \
- ..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd \
- ..\..\bin\UnitTestFiles\areasymbol.sd \
- ..\..\bin\UnitTestFiles\linesymbol.sd \
- ..\..\bin\UnitTestFiles\symbol.sd \
- ..\..\bin\UnitTestFiles\symbolp.sd \
- ..\..\bin\UnitTestFiles\MTYP1500a.sd \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation1.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation1.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation2.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation2.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation3.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation3.mdf \
- ..\..\bin\UnitTestFiles\SavePointTest.sqlite \
- ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource \
- ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource \
- ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource \
- ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite \
- ..\..\bin\UnitTestFiles\JoinTest.sqlite \
- CopyFdoComponentsRelease64 \
- CopyFdoProvidersRelease64 \
- CopySchemaRelease64 \
- CopyResourcesRelease64 \
- CreatePathsRelease64 \
- CopyOgcFilesRelease64
+release64: CopyBinariesRelease64 \
+ CopyTestData \
+ CopyFdoComponentsRelease64 \
+ CopyFdoProvidersRelease64 \
+ CopySchemaRelease64 \
+ CopyResourcesRelease64 \
+ CreatePathsRelease64 \
+ CopyOgcFilesRelease64
-
-cleandebug:
- if EXIST ..\..\bin\debug\MgFoundationd.dll del /F ..\..\bin\debug\MgFoundationd.dll
- if EXIST ..\..\bin\debug\MgFoundationd.pdb del /F ..\..\bin\debug\MgFoundationd.pdb
- if EXIST ..\..\bin\debug\MgGeometryd.dll del /F ..\..\bin\debug\MgGeometryd.dll
- if EXIST ..\..\bin\debug\MgGeometryd.pdb del /F ..\..\bin\debug\MgGeometryd.pdb
- if EXIST ..\..\bin\debug\MgPlatformBased.dll del /F ..\..\bin\debug\MgPlatformBased.dll
- if EXIST ..\..\bin\debug\MgPlatformBased.pdb del /F ..\..\bin\debug\MgPlatformBased.pdb
- if EXIST ..\..\bin\debug\MgMapGuideCommond.dll del /F ..\..\bin\debug\MgMapGuideCommond.dll
- if EXIST ..\..\bin\debug\MgMapGuideCommond.pdb del /F ..\..\bin\debug\MgMapGuideCommond.pdb
- if EXIST ..\..\bin\debug\MgMdfModeld.dll del /F ..\..\bin\debug\MgMdfModeld.dll
- if EXIST ..\..\bin\debug\MgMdfModeld.pdb del /F ..\..\bin\debug\MgMdfModeld.pdb
- if EXIST ..\..\bin\debug\MgMdfParserd.dll del /F ..\..\bin\debug\MgMdfParserd.dll
- if EXIST ..\..\bin\debug\MgMdfParserd.pdb del /F ..\..\bin\debug\MgMdfParserd.pdb
- if EXIST ..\..\bin\debug\MgStylizationd.dll del /F ..\..\bin\debug\MgStylizationd.dll
- if EXIST ..\..\bin\debug\MgStylizationd.pdb del /F ..\..\bin\debug\MgStylizationd.pdb
- if EXIST ..\..\bin\debug\MgRenderersd.dll del /F ..\..\bin\debug\MgRenderersd.dll
- if EXIST ..\..\bin\debug\MgRenderersd.pdb del /F ..\..\bin\debug\MgRenderersd.pdb
- if EXIST ..\..\bin\debug\ACEd.dll del /F ..\..\bin\debug\ACEd.dll
- if EXIST ..\..\bin\debug\ACEd.pdb del /F ..\..\bin\debug\ACEd.pdb
- if EXIST ..\..\bin\debug\gd.dll del /F ..\..\bin\debug\gd.dll
- if EXIST ..\..\bin\debug\gd.pdb del /F ..\..\bin\debug\gd.pdb
- if EXIST ..\..\bin\debug\GEOSd.dll del /F ..\..\bin\debug\GEOSd.dll
- if EXIST ..\..\bin\debug\GEOSd.pdb del /F ..\..\bin\debug\GEOSd.pdb
- if EXIST ..\..\bin\debug\libdb48d.dll del /F ..\..\bin\debug\libdb48d.dll
- if EXIST ..\..\bin\debug\libdb48d.pdb del /F ..\..\bin\debug\libdb48d.pdb
- if EXIST ..\..\bin\debug\libdbxml25d.dll del /F ..\..\bin\debug\libdbxml25d.dll
- if EXIST ..\..\bin\debug\libdbxml25d.pdb del /F ..\..\bin\debug\libdbxml25d.pdb
- if EXIST ..\..\bin\debug\xqilla24d.dll del /F ..\..\bin\debug\xqilla24d.dll
- if EXIST ..\..\bin\debug\xqilla24d.pdb del /F ..\..\bin\debug\xqilla24d.pdb
- if EXIST ..\..\bin\debug\xerces-c_3_1mgD.dll del /F ..\..\bin\debug\xerces-c_3_1mgD.dll
- if EXIST ..\..\bin\debug\xerces-c_3_1mgD.pdb del /F ..\..\bin\debug\xerces-c_3_1mgD.pdb
- if EXIST ..\..\bin\debug\serverconfig.ini del /F ..\..\bin\debug\serverconfig.ini
+cleantestdata:
if EXIST ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml
if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml
if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml
@@ -1142,7 +255,7 @@
if EXIST ..\..\bin\UnitTestFiles\TEST.sdf del /F ..\..\bin\UnitTestFiles\TEST.sdf
if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.mdf del /F ..\..\bin\UnitTestFiles\UT_BaseMap.mdf
if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_XYZ.tsd del /F ..\..\bin\UnitTestFiles\UT_XYZ.tsd
+ if EXIST ..\..\bin\UnitTestFiles\UT_XYZ.tsd del /F ..\..\bin\UnitTestFiles\UT_XYZ.tsd
if EXIST ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf del /F ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf
if EXIST ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf del /F ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf
if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.fs del /F ..\..\bin\UnitTestFiles\UT_Parcels.fs
@@ -1240,13 +353,51 @@
if EXIST ..\..\bin\UnitTestFiles\SavePointTest.sqlite del /F ..\..\bin\UnitTestFiles\SavePointTest.sqlite
if EXIST ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource del /F ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource
if EXIST ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource
+ if EXIST ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource
if EXIST ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite del /F ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite
if EXIST ..\..\bin\UnitTestFiles\JoinTest.sqlite del /F ..\..\bin\UnitTestFiles\JoinTest.FeatureSource
+
+cleandebug: cleantestdata \
+ cleanbinariesrelease
+
+cleandebug:
+ if EXIST ..\..\bin\debug\MgFoundationd.dll del /F ..\..\bin\debug\MgFoundationd.dll
+ if EXIST ..\..\bin\debug\MgFoundationd.pdb del /F ..\..\bin\debug\MgFoundationd.pdb
+ if EXIST ..\..\bin\debug\MgGeometryd.dll del /F ..\..\bin\debug\MgGeometryd.dll
+ if EXIST ..\..\bin\debug\MgGeometryd.pdb del /F ..\..\bin\debug\MgGeometryd.pdb
+ if EXIST ..\..\bin\debug\MgPlatformBased.dll del /F ..\..\bin\debug\MgPlatformBased.dll
+ if EXIST ..\..\bin\debug\MgPlatformBased.pdb del /F ..\..\bin\debug\MgPlatformBased.pdb
+ if EXIST ..\..\bin\debug\MgMapGuideCommond.dll del /F ..\..\bin\debug\MgMapGuideCommond.dll
+ if EXIST ..\..\bin\debug\MgMapGuideCommond.pdb del /F ..\..\bin\debug\MgMapGuideCommond.pdb
+ if EXIST ..\..\bin\debug\MgMdfModeld.dll del /F ..\..\bin\debug\MgMdfModeld.dll
+ if EXIST ..\..\bin\debug\MgMdfModeld.pdb del /F ..\..\bin\debug\MgMdfModeld.pdb
+ if EXIST ..\..\bin\debug\MgMdfParserd.dll del /F ..\..\bin\debug\MgMdfParserd.dll
+ if EXIST ..\..\bin\debug\MgMdfParserd.pdb del /F ..\..\bin\debug\MgMdfParserd.pdb
+ if EXIST ..\..\bin\debug\MgStylizationd.dll del /F ..\..\bin\debug\MgStylizationd.dll
+ if EXIST ..\..\bin\debug\MgStylizationd.pdb del /F ..\..\bin\debug\MgStylizationd.pdb
+ if EXIST ..\..\bin\debug\MgRenderersd.dll del /F ..\..\bin\debug\MgRenderersd.dll
+ if EXIST ..\..\bin\debug\MgRenderersd.pdb del /F ..\..\bin\debug\MgRenderersd.pdb
+ if EXIST ..\..\bin\debug\ACEd.dll del /F ..\..\bin\debug\ACEd.dll
+ if EXIST ..\..\bin\debug\ACEd.pdb del /F ..\..\bin\debug\ACEd.pdb
+ if EXIST ..\..\bin\debug\gd.dll del /F ..\..\bin\debug\gd.dll
+ if EXIST ..\..\bin\debug\gd.pdb del /F ..\..\bin\debug\gd.pdb
+ if EXIST ..\..\bin\debug\GEOSd.dll del /F ..\..\bin\debug\GEOSd.dll
+ if EXIST ..\..\bin\debug\GEOSd.pdb del /F ..\..\bin\debug\GEOSd.pdb
+ if EXIST ..\..\bin\debug\libdb48d.dll del /F ..\..\bin\debug\libdb48d.dll
+ if EXIST ..\..\bin\debug\libdb48d.pdb del /F ..\..\bin\debug\libdb48d.pdb
+ if EXIST ..\..\bin\debug\libdbxml25d.dll del /F ..\..\bin\debug\libdbxml25d.dll
+ if EXIST ..\..\bin\debug\libdbxml25d.pdb del /F ..\..\bin\debug\libdbxml25d.pdb
+ if EXIST ..\..\bin\debug\xqilla24d.dll del /F ..\..\bin\debug\xqilla24d.dll
+ if EXIST ..\..\bin\debug\xqilla24d.pdb del /F ..\..\bin\debug\xqilla24d.pdb
+ if EXIST ..\..\bin\debug\xerces-c_3_1mgD.dll del /F ..\..\bin\debug\xerces-c_3_1mgD.dll
+ if EXIST ..\..\bin\debug\xerces-c_3_1mgD.pdb del /F ..\..\bin\debug\xerces-c_3_1mgD.pdb
+ if EXIST ..\..\bin\debug\serverconfig.ini del /F ..\..\bin\debug\serverconfig.ini
del /F ..\..\bin\debug\*.ilk
+cleandebug64: cleantestdata \
+ cleanbinariesrelease64
-cleandebug64:
+cleanbinariesdebug64:
if EXIST ..\..\bin\debug64\MgFoundationd.dll del /F ..\..\bin\debug64\MgFoundationd.dll
if EXIST ..\..\bin\debug64\MgFoundationd.pdb del /F ..\..\bin\debug64\MgFoundationd.pdb
if EXIST ..\..\bin\debug64\MgGeometryd.dll del /F ..\..\bin\debug64\MgGeometryd.dll
@@ -1278,119 +429,12 @@
if EXIST ..\..\bin\debug64\xerces-c_3_1mgD.dll del /F ..\..\bin\debug64\xerces-c_3_1mgD.dll
if EXIST ..\..\bin\debug64\xerces-c_3_1mgD.pdb del /F ..\..\bin\debug64\xerces-c_3_1mgD.pdb
if EXIST ..\..\bin\debug64\serverconfig.ini del /F ..\..\bin\debug64\serverconfig.ini
- if EXIST ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml
- if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml
- if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml
- if EXIST ..\..\bin\UnitTestFiles\TEST.LayerDefinition del /F ..\..\bin\UnitTestFiles\TEST.LayerDefinition
- if EXIST ..\..\bin\UnitTestFiles\TEST.FeatureSource del /F ..\..\bin\UnitTestFiles\TEST.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\TEST.sdf del /F ..\..\bin\UnitTestFiles\TEST.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.mdf del /F ..\..\bin\UnitTestFiles\UT_BaseMap.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_XYZ.tsd del /F ..\..\bin\UnitTestFiles\UT_XYZ.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf del /F ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf del /F ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.fs del /F ..\..\bin\UnitTestFiles\UT_Parcels.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.ldf del /F ..\..\bin\UnitTestFiles\UT_Parcels.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.sdf del /F ..\..\bin\UnitTestFiles\UT_Parcels.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs del /F ..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf del /F ..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf del /F ..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistricts.fs del /F ..\..\bin\UnitTestFiles\UT_VotingDistricts.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf del /F ..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf del /F ..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf del /F ..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_AllElements.pl del /F ..\..\bin\UnitTestFiles\UT_AllElements.pl
- if EXIST ..\..\bin\UnitTestFiles\UT_NoLegend.pl del /F ..\..\bin\UnitTestFiles\UT_NoLegend.pl
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbolMart.sl del /F ..\..\bin\UnitTestFiles\UT_SymbolMart.sl
- if EXIST ..\..\bin\UnitTestFiles\UT_Symbols.dwf del /F ..\..\bin\UnitTestFiles\UT_Symbols.dwf
- if EXIST ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf del /F ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf del /F ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf del /F ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf del /F ..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.sdf del /F ..\..\bin\UnitTestFiles\UT_Rail.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.fs del /F ..\..\bin\UnitTestFiles\UT_Rail.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.ldf del /F ..\..\bin\UnitTestFiles\UT_Rail.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.wdf del /F ..\..\bin\UnitTestFiles\UT_Rail.wdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf del /F ..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_MultiCTS.ldf del /F ..\..\bin\UnitTestFiles\UT_MultiCTS.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_MultiCTSWithTheme.ldf del /F ..\..\bin\UnitTestFiles\UT_MultiCTSWithTheme.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_MultiFTS.ldf del /F ..\..\bin\UnitTestFiles\UT_MultiFTS.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_MultiFTSSingleCTS.ldf del /F ..\..\bin\UnitTestFiles\UT_MultiFTSSingleCTS.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_MultiFTSWithTheme.ldf del /F ..\..\bin\UnitTestFiles\UT_MultiFTSWithTheme.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SingleFTSMultiCTS.ldf del /F ..\..\bin\UnitTestFiles\UT_SingleFTSMultiCTS.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_RotatedPointStyles.ldf del /F ..\..\bin\UnitTestFiles\UT_RotatedPointStyles.ldf
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource del /F ..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf del /F ..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource del /F ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf del /F ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource del /F ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf del /F ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf
- if EXIST ..\..\bin\UnitTestFiles\Empty.FeatureSource del /F ..\..\bin\UnitTestFiles\Empty.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Empty.sdf del /F ..\..\bin\UnitTestFiles\Empty.sdf
- if EXIST ..\..\bin\UnitTestFiles\World.mgp del /F ..\..\bin\UnitTestFiles\World.mgp
- if EXIST ..\..\bin\UnitTestFiles\World_Countries.sdf del /F ..\..\bin\UnitTestFiles\World_Countries.sdf
- if EXIST ..\..\bin\UnitTestFiles\Shuttle.zip del /F ..\..\bin\UnitTestFiles\Shuttle.zip
- if EXIST ..\..\bin\UnitTestFiles\test.dwf del /F ..\..\bin\UnitTestFiles\test.dwf
- if EXIST ..\..\bin\UnitTestFiles\SpaceShip.dwf del /F ..\..\bin\UnitTestFiles\SpaceShip.dwf
- if EXIST ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml del /F ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml
- if EXIST ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml del /F ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource del /F ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.shp del /F ..\..\bin\UnitTestFiles\Redding_Parcels.shp
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.dbf del /F ..\..\bin\UnitTestFiles\Redding_Parcels.dbf
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.shx del /F ..\..\bin\UnitTestFiles\Redding_Parcels.shx
- if EXIST ..\..\bin\UnitTestFiles\1.1.1.mgd del /F ..\..\bin\UnitTestFiles\1.1.1.mgd
- if EXIST ..\..\bin\UnitTestFiles\epsgcodes.txt del /F ..\..\bin\UnitTestFiles\epsgcodes.txt
- if EXIST ..\..\bin\UnitTestFiles\ogcwkts.txt del /F ..\..\bin\UnitTestFiles\ogcwkts.txt
- if EXIST ..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt del /F ..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt
- if EXIST ..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt del /F ..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt
- if EXIST ..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt del /F ..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt
- if EXIST ..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\MdfTestMap.mdf del /F ..\..\bin\UnitTestFiles\MdfTestMap.mdf
- if EXIST ..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf del /F ..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf
- if EXIST ..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd del /F ..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd del /F ..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\areasymbol.sd del /F ..\..\bin\UnitTestFiles\areasymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\linesymbol.sd del /F ..\..\bin\UnitTestFiles\linesymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\symbol.sd del /F ..\..\bin\UnitTestFiles\symbol.sd
- if EXIST ..\..\bin\UnitTestFiles\symbolp.sd del /F ..\..\bin\UnitTestFiles\symbolp.sd
- if EXIST ..\..\bin\UnitTestFiles\MTYP1500a.sd del /F ..\..\bin\UnitTestFiles\MTYP1500a.sd
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.fs del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation1.ldf del /F ..\..\bin\UnitTestFiles\UT_Annotation1.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation1.mdf del /F ..\..\bin\UnitTestFiles\UT_Annotation1.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation2.ldf del /F ..\..\bin\UnitTestFiles\UT_Annotation2.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation2.mdf del /F ..\..\bin\UnitTestFiles\UT_Annotation2.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation3.ldf del /F ..\..\bin\UnitTestFiles\UT_Annotation3.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation3.mdf del /F ..\..\bin\UnitTestFiles\UT_Annotation3.mdf
- if EXIST ..\..\bin\UnitTestFiles\SavePointTest.sqlite del /F ..\..\bin\UnitTestFiles\SavePointTest.sqlite
- if EXIST ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource del /F ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite del /F ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite
- if EXIST ..\..\bin\UnitTestFiles\JoinTest.sqlite del /F ..\..\bin\UnitTestFiles\JoinTest.FeatureSource
del /F ..\..\bin\debug64\*.ilk
+cleanrelease: cleantestdata \
+ cleanbinariesrelease
-cleanrelease:
+cleanbinariesrelease:
if EXIST ..\..\bin\release\MgFoundation.dll del /F ..\..\bin\release\MgFoundation.dll
if EXIST ..\..\bin\release\MgFoundation.pdb del /F ..\..\bin\release\MgFoundation.pdb
if EXIST ..\..\bin\release\MgGeometry.dll del /F ..\..\bin\release\MgGeometry.dll
@@ -1422,117 +466,11 @@
if EXIST ..\..\bin\release\xerces-c_3_1mg.dll del /F ..\..\bin\release\xerces-c_3_1mg.dll
if EXIST ..\..\bin\release\xerces-c_3_1mg.pdb del /F ..\..\bin\release\xerces-c_3_1mg.pdb
if EXIST ..\..\bin\release\serverconfig.ini del /F ..\..\bin\release\serverconfig.ini
- if EXIST ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml
- if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml
- if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml
- if EXIST ..\..\bin\UnitTestFiles\TEST.LayerDefinition del /F ..\..\bin\UnitTestFiles\TEST.LayerDefinition
- if EXIST ..\..\bin\UnitTestFiles\TEST.FeatureSource del /F ..\..\bin\UnitTestFiles\TEST.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\TEST.sdf del /F ..\..\bin\UnitTestFiles\TEST.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.mdf del /F ..\..\bin\UnitTestFiles\UT_BaseMap.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_XYZ.tsd del /F ..\..\bin\UnitTestFiles\UT_XYZ.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf del /F ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf del /F ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.fs del /F ..\..\bin\UnitTestFiles\UT_Parcels.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.ldf del /F ..\..\bin\UnitTestFiles\UT_Parcels.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.sdf del /F ..\..\bin\UnitTestFiles\UT_Parcels.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs del /F ..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf del /F ..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf del /F ..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistricts.fs del /F ..\..\bin\UnitTestFiles\UT_VotingDistricts.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf del /F ..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf del /F ..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf del /F ..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_AllElements.pl del /F ..\..\bin\UnitTestFiles\UT_AllElements.pl
- if EXIST ..\..\bin\UnitTestFiles\UT_NoLegend.pl del /F ..\..\bin\UnitTestFiles\UT_NoLegend.pl
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbolMart.sl del /F ..\..\bin\UnitTestFiles\UT_SymbolMart.sl
- if EXIST ..\..\bin\UnitTestFiles\UT_Symbols.dwf del /F ..\..\bin\UnitTestFiles\UT_Symbols.dwf
- if EXIST ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf del /F ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf del /F ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf del /F ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf del /F ..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.sdf del /F ..\..\bin\UnitTestFiles\UT_Rail.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.fs del /F ..\..\bin\UnitTestFiles\UT_Rail.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.ldf del /F ..\..\bin\UnitTestFiles\UT_Rail.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.wdf del /F ..\..\bin\UnitTestFiles\UT_Rail.wdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf del /F ..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_MultiCTS.ldf del /F ..\..\bin\UnitTestFiles\UT_MultiCTS.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_MultiCTSWithTheme.ldf del /F ..\..\bin\UnitTestFiles\UT_MultiCTSWithTheme.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_MultiFTS.ldf del /F ..\..\bin\UnitTestFiles\UT_MultiFTS.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_MultiFTSSingleCTS.ldf del /F ..\..\bin\UnitTestFiles\UT_MultiFTSSingleCTS.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_MultiFTSWithTheme.ldf del /F ..\..\bin\UnitTestFiles\UT_MultiFTSWithTheme.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SingleFTSMultiCTS.ldf del /F ..\..\bin\UnitTestFiles\UT_SingleFTSMultiCTS.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_RotatedPointStyles.ldf del /F ..\..\bin\UnitTestFiles\UT_RotatedPointStyles.ldf
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource del /F ..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf del /F ..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource del /F ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf del /F ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource del /F ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf del /F ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf
- if EXIST ..\..\bin\UnitTestFiles\Empty.FeatureSource del /F ..\..\bin\UnitTestFiles\Empty.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Empty.sdf del /F ..\..\bin\UnitTestFiles\Empty.sdf
- if EXIST ..\..\bin\UnitTestFiles\World.mgp del /F ..\..\bin\UnitTestFiles\World.mgp
- if EXIST ..\..\bin\UnitTestFiles\World_Countries.sdf del /F ..\..\bin\UnitTestFiles\World_Countries.sdf
- if EXIST ..\..\bin\UnitTestFiles\Shuttle.zip del /F ..\..\bin\UnitTestFiles\Shuttle.zip
- if EXIST ..\..\bin\UnitTestFiles\test.dwf del /F ..\..\bin\UnitTestFiles\test.dwf
- if EXIST ..\..\bin\UnitTestFiles\SpaceShip.dwf del /F ..\..\bin\UnitTestFiles\SpaceShip.dwf
- if EXIST ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml del /F ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml
- if EXIST ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml del /F ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource del /F ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.shp del /F ..\..\bin\UnitTestFiles\Redding_Parcels.shp
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.dbf del /F ..\..\bin\UnitTestFiles\Redding_Parcels.dbf
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.shx del /F ..\..\bin\UnitTestFiles\Redding_Parcels.shx
- if EXIST ..\..\bin\UnitTestFiles\1.1.1.mgd del /F ..\..\bin\UnitTestFiles\1.1.1.mgd
- if EXIST ..\..\bin\UnitTestFiles\epsgcodes.txt del /F ..\..\bin\UnitTestFiles\epsgcodes.txt
- if EXIST ..\..\bin\UnitTestFiles\ogcwkts.txt del /F ..\..\bin\UnitTestFiles\ogcwkts.txt
- if EXIST ..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt del /F ..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt
- if EXIST ..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt del /F ..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt
- if EXIST ..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt del /F ..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt
- if EXIST ..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\MdfTestMap.mdf del /F ..\..\bin\UnitTestFiles\MdfTestMap.mdf
- if EXIST ..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf del /F ..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf
- if EXIST ..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd del /F ..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd del /F ..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\areasymbol.sd del /F ..\..\bin\UnitTestFiles\areasymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\linesymbol.sd del /F ..\..\bin\UnitTestFiles\linesymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\symbol.sd del /F ..\..\bin\UnitTestFiles\symbol.sd
- if EXIST ..\..\bin\UnitTestFiles\symbolp.sd del /F ..\..\bin\UnitTestFiles\symbolp.sd
- if EXIST ..\..\bin\UnitTestFiles\MTYP1500a.sd del /F ..\..\bin\UnitTestFiles\MTYP1500a.sd
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.fs del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation1.ldf del /F ..\..\bin\UnitTestFiles\UT_Annotation1.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation1.mdf del /F ..\..\bin\UnitTestFiles\UT_Annotation1.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation2.ldf del /F ..\..\bin\UnitTestFiles\UT_Annotation2.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation2.mdf del /F ..\..\bin\UnitTestFiles\UT_Annotation2.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation3.ldf del /F ..\..\bin\UnitTestFiles\UT_Annotation3.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation3.mdf del /F ..\..\bin\UnitTestFiles\UT_Annotation3.mdf
- if EXIST ..\..\bin\UnitTestFiles\SavePointTest.sqlite del /F ..\..\bin\UnitTestFiles\SavePointTest.sqlite
- if EXIST ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource del /F ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite del /F ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite
- if EXIST ..\..\bin\UnitTestFiles\JoinTest.sqlite del /F ..\..\bin\UnitTestFiles\JoinTest.FeatureSource
+
+cleanrelease64: cleantestdata \
+ cleanbinariesrelease64
-cleanrelease64:
+cleanbinariesrelease64:
if EXIST ..\..\bin\release64\MgFoundation.dll del /F ..\..\bin\release64\MgFoundation.dll
if EXIST ..\..\bin\release64\MgFoundation.pdb del /F ..\..\bin\release64\MgFoundation.pdb
if EXIST ..\..\bin\release64\MgGeometry.dll del /F ..\..\bin\release64\MgGeometry.dll
@@ -1564,2276 +502,115 @@
if EXIST ..\..\bin\release64\xerces-c_3_1mg.dll del /F ..\..\bin\release64\xerces-c_3_1mg.dll
if EXIST ..\..\bin\release64\xerces-c_3_1mg.pdb del /F ..\..\bin\release64\xerces-c_3_1mg.pdb
if EXIST ..\..\bin\release64\serverconfig.ini del /F ..\..\bin\release64\serverconfig.ini
- if EXIST ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml
- if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml
- if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml
- if EXIST ..\..\bin\UnitTestFiles\TEST.LayerDefinition del /F ..\..\bin\UnitTestFiles\TEST.LayerDefinition
- if EXIST ..\..\bin\UnitTestFiles\TEST.FeatureSource del /F ..\..\bin\UnitTestFiles\TEST.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\TEST.sdf del /F ..\..\bin\UnitTestFiles\TEST.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.mdf del /F ..\..\bin\UnitTestFiles\UT_BaseMap.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_XYZ.tsd del /F ..\..\bin\UnitTestFiles\UT_XYZ.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf del /F ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf del /F ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.fs del /F ..\..\bin\UnitTestFiles\UT_Parcels.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.ldf del /F ..\..\bin\UnitTestFiles\UT_Parcels.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.sdf del /F ..\..\bin\UnitTestFiles\UT_Parcels.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs del /F ..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf del /F ..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf del /F ..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistricts.fs del /F ..\..\bin\UnitTestFiles\UT_VotingDistricts.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf del /F ..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf del /F ..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf del /F ..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_AllElements.pl del /F ..\..\bin\UnitTestFiles\UT_AllElements.pl
- if EXIST ..\..\bin\UnitTestFiles\UT_NoLegend.pl del /F ..\..\bin\UnitTestFiles\UT_NoLegend.pl
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbolMart.sl del /F ..\..\bin\UnitTestFiles\UT_SymbolMart.sl
- if EXIST ..\..\bin\UnitTestFiles\UT_Symbols.dwf del /F ..\..\bin\UnitTestFiles\UT_Symbols.dwf
- if EXIST ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf del /F ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf del /F ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf del /F ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf del /F ..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.sdf del /F ..\..\bin\UnitTestFiles\UT_Rail.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.fs del /F ..\..\bin\UnitTestFiles\UT_Rail.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.ldf del /F ..\..\bin\UnitTestFiles\UT_Rail.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.wdf del /F ..\..\bin\UnitTestFiles\UT_Rail.wdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf del /F ..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_MultiCTS.ldf del /F ..\..\bin\UnitTestFiles\UT_MultiCTS.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_MultiCTSWithTheme.ldf del /F ..\..\bin\UnitTestFiles\UT_MultiCTSWithTheme.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_MultiFTS.ldf del /F ..\..\bin\UnitTestFiles\UT_MultiFTS.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_MultiFTSSingleCTS.ldf del /F ..\..\bin\UnitTestFiles\UT_MultiFTSSingleCTS.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_MultiFTSWithTheme.ldf del /F ..\..\bin\UnitTestFiles\UT_MultiFTSWithTheme.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SingleFTSMultiCTS.ldf del /F ..\..\bin\UnitTestFiles\UT_SingleFTSMultiCTS.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_RotatedPointStyles.ldf del /F ..\..\bin\UnitTestFiles\UT_RotatedPointStyles.ldf
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource del /F ..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf del /F ..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource del /F ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf del /F ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource del /F ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf del /F ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf
- if EXIST ..\..\bin\UnitTestFiles\Empty.FeatureSource del /F ..\..\bin\UnitTestFiles\Empty.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Empty.sdf del /F ..\..\bin\UnitTestFiles\Empty.sdf
- if EXIST ..\..\bin\UnitTestFiles\World.mgp del /F ..\..\bin\UnitTestFiles\World.mgp
- if EXIST ..\..\bin\UnitTestFiles\World_Countries.sdf del /F ..\..\bin\UnitTestFiles\World_Countries.sdf
- if EXIST ..\..\bin\UnitTestFiles\Shuttle.zip del /F ..\..\bin\UnitTestFiles\Shuttle.zip
- if EXIST ..\..\bin\UnitTestFiles\test.dwf del /F ..\..\bin\UnitTestFiles\test.dwf
- if EXIST ..\..\bin\UnitTestFiles\SpaceShip.dwf del /F ..\..\bin\UnitTestFiles\SpaceShip.dwf
- if EXIST ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml del /F ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml
- if EXIST ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml del /F ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource del /F ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.shp del /F ..\..\bin\UnitTestFiles\Redding_Parcels.shp
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.dbf del /F ..\..\bin\UnitTestFiles\Redding_Parcels.dbf
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.shx del /F ..\..\bin\UnitTestFiles\Redding_Parcels.shx
- if EXIST ..\..\bin\UnitTestFiles\1.1.1.mgd del /F ..\..\bin\UnitTestFiles\1.1.1.mgd
- if EXIST ..\..\bin\UnitTestFiles\epsgcodes.txt del /F ..\..\bin\UnitTestFiles\epsgcodes.txt
- if EXIST ..\..\bin\UnitTestFiles\ogcwkts.txt del /F ..\..\bin\UnitTestFiles\ogcwkts.txt
- if EXIST ..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt del /F ..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt
- if EXIST ..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt del /F ..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt
- if EXIST ..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt del /F ..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt
- if EXIST ..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\MdfTestMap.mdf del /F ..\..\bin\UnitTestFiles\MdfTestMap.mdf
- if EXIST ..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf del /F ..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf
- if EXIST ..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd del /F ..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd del /F ..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\areasymbol.sd del /F ..\..\bin\UnitTestFiles\areasymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\linesymbol.sd del /F ..\..\bin\UnitTestFiles\linesymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\symbol.sd del /F ..\..\bin\UnitTestFiles\symbol.sd
- if EXIST ..\..\bin\UnitTestFiles\symbolp.sd del /F ..\..\bin\UnitTestFiles\symbolp.sd
- if EXIST ..\..\bin\UnitTestFiles\MTYP1500a.sd del /F ..\..\bin\UnitTestFiles\MTYP1500a.sd
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.fs del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation1.ldf del /F ..\..\bin\UnitTestFiles\UT_Annotation1.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation1.mdf del /F ..\..\bin\UnitTestFiles\UT_Annotation1.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation2.ldf del /F ..\..\bin\UnitTestFiles\UT_Annotation2.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation2.mdf del /F ..\..\bin\UnitTestFiles\UT_Annotation2.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation3.ldf del /F ..\..\bin\UnitTestFiles\UT_Annotation3.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation3.mdf del /F ..\..\bin\UnitTestFiles\UT_Annotation3.mdf
- if EXIST ..\..\bin\UnitTestFiles\SavePointTest.sqlite del /F ..\..\bin\UnitTestFiles\SavePointTest.sqlite
- if EXIST ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource del /F ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite del /F ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite
- if EXIST ..\..\bin\UnitTestFiles\JoinTest.sqlite del /F ..\..\bin\UnitTestFiles\JoinTest.FeatureSource
-..\..\bin\debug(v100)\MgFoundationd.dll : ..\..\..\Common\bin\debug(v100)\MgFoundationd.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)\MgFoundationd.dll ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\MgFoundationd.pdb : ..\..\..\Common\bin\debug(v100)\MgFoundationd.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)\MgFoundationd.pdb ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\MgPlatformBased.dll : ..\..\..\Common\bin\debug(v100)\MgPlatformBased.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)\MgPlatformBased.dll ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\MgPlatformBased.pdb : ..\..\..\Common\bin\debug(v100)\MgPlatformBased.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)\MgPlatformBased.pdb ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\MgGeometryd.dll : ..\..\..\Common\bin\debug(v100)\MgGeometryd.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)\MgGeometryd.dll ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\MgGeometryd.pdb : ..\..\..\Common\bin\debug(v100)\MgGeometryd.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)\MgGeometryd.pdb ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\MgMapGuideCommond.dll : ..\..\..\Common\bin\debug(v100)\MgMapGuideCommond.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)\MgMapGuideCommond.dll ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\MgMapGuideCommond.pdb : ..\..\..\Common\bin\debug(v100)\MgMapGuideCommond.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)\MgMapGuideCommond.pdb ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\MgMdfModeld.dll : ..\..\..\Common\bin\debug(v100)\MgMdfModeld.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)\MgMdfModeld.dll ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\MgMdfModeld.pdb : ..\..\..\Common\bin\debug(v100)\MgMdfModeld.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)\MgMdfModeld.pdb ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\MgMdfParserd.dll : ..\..\..\Common\bin\debug(v100)\MgMdfParserd.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)\MgMdfParserd.dll ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\MgMdfParserd.pdb : ..\..\..\Common\bin\debug(v100)\MgMdfParserd.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)\MgMdfParserd.pdb ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\MgStylizationd.dll : ..\..\..\Common\bin\debug(v100)\MgStylizationd.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)\MgStylizationd.dll ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\MgStylizationd.pdb : ..\..\..\Common\bin\debug(v100)\MgStylizationd.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)\MgStylizationd.pdb ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\MgRenderersd.dll : ..\..\..\Common\bin\debug(v100)\MgRenderersd.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)\MgRenderersd.dll ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\MgRenderersd.pdb : ..\..\..\Common\bin\debug(v100)\MgRenderersd.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)\MgRenderersd.pdb ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\ACEd.dll : ..\..\..\Oem\ACE\ACE_wrappers\lib\debug(v100)\ACEd.dll
- xcopy /r /d /y ..\..\..\Oem\ACE\ACE_wrappers\lib\debug(v100)\ACEd.dll ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\ACEd.pdb : ..\..\..\Oem\ACE\ACE_wrappers\lib\debug(v100)\ACEd.pdb
- xcopy /r /d /y ..\..\..\Oem\ACE\ACE_wrappers\lib\debug(v100)\ACEd.pdb ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\gd.dll : ..\..\..\Oem\gd\build\win32\gd\debug(v100)\gd.dll
- xcopy /r /d /y ..\..\..\Oem\gd\build\win32\gd\debug(v100)\gd.dll ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\gd.pdb : ..\..\..\Oem\gd\build\win32\gd\debug(v100)\gd.pdb
- xcopy /r /d /y ..\..\..\Oem\gd\build\win32\gd\debug(v100)\gd.pdb ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\GEOSd.dll : ..\..\..\Oem\geos\VisualStudio\debug(v100)\GEOSd.dll
- xcopy /r /d /y ..\..\..\Oem\geos\VisualStudio\debug(v100)\GEOSd.dll ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\GEOSd.pdb : ..\..\..\Oem\geos\VisualStudio\debug(v100)\GEOSd.pdb
- xcopy /r /d /y ..\..\..\Oem\geos\VisualStudio\debug(v100)\GEOSd.pdb ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\libdb48d.dll : ..\..\..\Oem\dbxml\bin\debug(v100)\libdb48d.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\debug(v100)\libdb48d.dll ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\libdb48d.pdb : ..\..\..\Oem\dbxml\bin\debug(v100)\libdb48d.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\debug(v100)\libdb48d.pdb ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\libdbxml25d.dll : ..\..\..\Oem\dbxml\bin\debug(v100)\libdbxml25d.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\debug(v100)\libdbxml25d.dll ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\libdbxml25d.pdb : ..\..\..\Oem\dbxml\bin\debug(v100)\libdbxml25d.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\debug(v100)\libdbxml25d.pdb ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\xqilla24d.dll : ..\..\..\Oem\dbxml\bin\debug(v100)\xqilla24d.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\debug(v100)\xqilla24d.dll ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\xqilla24d.pdb : ..\..\..\Oem\dbxml\bin\debug(v100)\xqilla24d.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\debug(v100)\xqilla24d.pdb ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\xerces-c_3_1mgD.dll : ..\..\..\Oem\dbxml\bin\debug(v100)\xerces-c_3_1mgD.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\debug(v100)\xerces-c_3_1mgD.dll ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\xerces-c_3_1mgD.pdb : ..\..\..\Oem\dbxml\bin\debug(v100)\xerces-c_3_1mgD.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\debug(v100)\xerces-c_3_1mgD.pdb ..\..\bin\debug(v100)\
-
-..\..\bin\debug(v100)\serverconfig.ini : ..\..\src\Core\serverconfig.ini
- xcopy /r /d /y ..\..\src\Core\serverconfig.ini ..\..\bin\debug(v100)\
-
-CopyFdoComponentsdebug(v100) : ..\..\..\Oem\FDO\*.*
- if NOT EXIST ..\..\bin\debug(v100)\FDO\nul mkdir ..\..\bin\debug(v100)\FDO
- xcopy /r /d /y /s ..\..\..\Oem\FDO\bin\release ..\..\bin\debug(v100)\FDO\
-
-CopyFdoProvidersdebug(v100) : ..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml
- xcopy /r /d /y "..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml" ..\..\bin\debug(v100)\FDO\
-
-CopySchemadebug(v100) : ..\..\..\Common\Schema\*.xsd
- if NOT EXIST ..\..\bin\debug(v100)\Schema\nul mkdir ..\..\bin\debug(v100)\Schema
- xcopy /r /d /y ..\..\..\Common\Schema\*.xsd ..\..\bin\debug(v100)\Schema
-
-CopyResourcesdebug(v100) : ..\..\..\Common\MapGuideCommon\Resources\mapguide_en.res
- if NOT EXIST ..\..\bin\debug(v100)\Resources\nul mkdir ..\..\bin\debug(v100)\Resources
- xcopy /r /d /y "..\..\..\Common\MapGuideCommon\Resources\mapguide_en.res" ..\..\bin\debug(v100)\Resources\
-
-CopyOgcFilesdebug(v100) : ..\..\src\wms\*.awd ..\..\src\wfs\*.awd
- if NOT EXIST ..\..\bin\debug(v100)\wms\nul mkdir ..\..\bin\debug(v100)\wms
- xcopy /r /d /y "..\..\src\wms\*.awd" ..\..\bin\debug(v100)\wms
- if NOT EXIST ..\..\bin\debug(v100)\wfs\nul mkdir ..\..\bin\debug(v100)\wfs
- xcopy /r /d /y "..\..\src\wfs\*.awd" ..\..\bin\debug(v100)\wfs
-
-CreatePathsdebug(v100) :
- if NOT EXIST ..\..\bin\debug(v100)\Logs\nul mkdir ..\..\bin\debug(v100)\Logs
- if NOT EXIST ..\..\bin\debug(v100)\Packages\nul mkdir ..\..\bin\debug(v100)\Packages
- if NOT EXIST ..\..\bin\debug(v100)\Temp\nul mkdir ..\..\bin\debug(v100)\Temp
- if NOT EXIST ..\..\bin\debug(v100)\wms\nul mkdir ..\..\bin\debug(v100)\wms
- if NOT EXIST ..\..\bin\debug(v100)\wfs\nul mkdir ..\..\bin\debug(v100)\wfs
- if NOT EXIST ..\..\bin\debug(v100)\Repositories\nul mkdir ..\..\bin\debug(v100)\Repositories
- if NOT EXIST ..\..\bin\debug(v100)\Repositories\Library\nul mkdir ..\..\bin\debug(v100)\Repositories\Library
- if NOT EXIST ..\..\bin\debug(v100)\Repositories\Library\DataFiles\nul mkdir ..\..\bin\debug(v100)\Repositories\Library\DataFiles
- if NOT EXIST ..\..\bin\debug(v100)\Repositories\Session\nul mkdir ..\..\bin\debug(v100)\Repositories\Session
- if NOT EXIST ..\..\bin\debug(v100)\Repositories\Session\DataFiles\nul mkdir ..\..\bin\debug(v100)\Repositories\Session\DataFiles
- if NOT EXIST ..\..\bin\debug(v100)\Repositories\Site\nul mkdir ..\..\bin\debug(v100)\Repositories\Site
- if NOT EXIST ..\..\bin\debug(v100)\Repositories\TileCache\nul mkdir ..\..\bin\debug(v100)\Repositories\TileCache
-
-debug(v100) : ..\..\bin\debug(v100)\MgFoundationd.dll \
- ..\..\bin\debug(v100)\MgFoundationd.pdb \
- ..\..\bin\debug(v100)\MgGeometryd.dll \
- ..\..\bin\debug(v100)\MgGeometryd.pdb \
- ..\..\bin\debug(v100)\MgPlatformBased.dll \
- ..\..\bin\debug(v100)\MgPlatformBased.pdb \
- ..\..\bin\debug(v100)\MgMapGuideCommond.dll \
- ..\..\bin\debug(v100)\MgMapGuideCommond.pdb \
- ..\..\bin\debug(v100)\MgMdfModeld.dll \
- ..\..\bin\debug(v100)\MgMdfModeld.pdb \
- ..\..\bin\debug(v100)\MgMdfParserd.dll \
- ..\..\bin\debug(v100)\MgMdfParserd.pdb \
- ..\..\bin\debug(v100)\MgStylizationd.dll \
- ..\..\bin\debug(v100)\MgStylizationd.pdb \
- ..\..\bin\debug(v100)\MgRenderersd.dll \
- ..\..\bin\debug(v100)\MgRenderersd.pdb \
- ..\..\bin\debug(v100)\ACEd.dll \
- ..\..\bin\debug(v100)\ACEd.pdb \
- ..\..\bin\debug(v100)\gd.dll \
- ..\..\bin\debug(v100)\gd.pdb \
- ..\..\bin\debug(v100)\GEOSd.dll \
- ..\..\bin\debug(v100)\GEOSd.pdb \
- ..\..\bin\debug(v100)\libdb48d.dll \
- ..\..\bin\debug(v100)\libdb48d.pdb \
- ..\..\bin\debug(v100)\libdbxml25d.dll \
- ..\..\bin\debug(v100)\libdbxml25d.pdb \
- ..\..\bin\debug(v100)\xqilla24d.dll \
- ..\..\bin\debug(v100)\xqilla24d.pdb \
- ..\..\bin\debug(v100)\xerces-c_3_1mgD.dll \
- ..\..\bin\debug(v100)\xerces-c_3_1mgD.pdb \
- ..\..\bin\debug(v100)\serverconfig.ini \
- ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml \
- ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml \
- ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml \
- ..\..\bin\UnitTestFiles\TEST.LayerDefinition \
- ..\..\bin\UnitTestFiles\TEST.FeatureSource \
- ..\..\bin\UnitTestFiles\TEST.sdf \
- ..\..\bin\UnitTestFiles\UT_BaseMap.mdf \
- ..\..\bin\UnitTestFiles\UT_BaseMap.tsd \
- ..\..\bin\UnitTestFiles\UT_XYZ.tsd \
- ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf \
- ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf \
- ..\..\bin\UnitTestFiles\UT_Parcels.fs \
- ..\..\bin\UnitTestFiles\UT_Parcels.ldf \
- ..\..\bin\UnitTestFiles\UT_Parcels.sdf \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.fs \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf \
- ..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf \
- ..\..\bin\UnitTestFiles\UT_AllElements.pl \
- ..\..\bin\UnitTestFiles\UT_NoLegend.pl \
- ..\..\bin\UnitTestFiles\UT_SymbolMart.sl \
- ..\..\bin\UnitTestFiles\UT_Symbols.dwf \
- ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf \
- ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf \
- ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf \
- ..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf \
- ..\..\bin\UnitTestFiles\UT_Rail.sdf \
- ..\..\bin\UnitTestFiles\UT_Rail.fs \
- ..\..\bin\UnitTestFiles\UT_Rail.ldf \
- ..\..\bin\UnitTestFiles\UT_Rail.wdf \
- ..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf \
- ..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf \
- ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf \
- ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf \
- ..\..\bin\UnitTestFiles\Empty.FeatureSource \
- ..\..\bin\UnitTestFiles\Empty.sdf \
- ..\..\bin\UnitTestFiles\World.mgp \
- ..\..\bin\UnitTestFiles\World_Countries.sdf \
- ..\..\bin\UnitTestFiles\Shuttle.zip \
- ..\..\bin\UnitTestFiles\test.dwf \
- ..\..\bin\UnitTestFiles\SpaceShip.dwf \
- ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml \
- ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml \
- ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource \
- ..\..\bin\UnitTestFiles\Redding_Parcels.shp \
- ..\..\bin\UnitTestFiles\Redding_Parcels.dbf \
- ..\..\bin\UnitTestFiles\Redding_Parcels.shx \
- ..\..\bin\UnitTestFiles\1.1.1.mgd \
- ..\..\bin\UnitTestFiles\epsgcodes.txt \
- ..\..\bin\UnitTestFiles\ogcwkts.txt \
- ..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt \
- ..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt \
- ..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt \
- ..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource \
- ..\..\bin\UnitTestFiles\MdfTestMap.mdf \
- ..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf \
- ..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd \
- ..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd \
- ..\..\bin\UnitTestFiles\areasymbol.sd \
- ..\..\bin\UnitTestFiles\linesymbol.sd \
- ..\..\bin\UnitTestFiles\symbol.sd \
- ..\..\bin\UnitTestFiles\symbolp.sd \
- ..\..\bin\UnitTestFiles\MTYP1500a.sd \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation1.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation1.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation2.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation2.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation3.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation3.mdf \
- ..\..\bin\UnitTestFiles\SavePointTest.sqlite \
- ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource \
- ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource \
- ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource \
- ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite \
- ..\..\bin\UnitTestFiles\JoinTest.sqlite \
- CopyFdoComponentsdebug(v100) \
- CopyFdoProvidersdebug(v100) \
- CopySchemadebug(v100) \
- CopyResourcesdebug(v100) \
- CreatePathsdebug(v100) \
- CopyOgcFilesdebug(v100)
-
-
-..\..\bin\debug(v100)64\MgFoundationd.dll : ..\..\..\Common\bin\debug(v100)64\MgFoundationd.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)64\MgFoundationd.dll ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\MgFoundationd.pdb : ..\..\..\Common\bin\debug(v100)64\MgFoundationd.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)64\MgFoundationd.pdb ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\MgPlatformBased.dll : ..\..\..\Common\bin\debug(v100)64\MgPlatformBased.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)64\MgPlatformBased.dll ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\MgPlatformBased.pdb : ..\..\..\Common\bin\debug(v100)64\MgPlatformBased.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)64\MgPlatformBased.pdb ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\MgGeometryd.dll : ..\..\..\Common\bin\debug(v100)64\MgGeometryd.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)64\MgGeometryd.dll ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\MgGeometryd.pdb : ..\..\..\Common\bin\debug(v100)64\MgGeometryd.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)64\MgGeometryd.pdb ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\MgMapGuideCommond.dll : ..\..\..\Common\bin\debug(v100)64\MgMapGuideCommond.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)64\MgMapGuideCommond.dll ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\MgMapGuideCommond.pdb : ..\..\..\Common\bin\debug(v100)64\MgMapGuideCommond.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)64\MgMapGuideCommond.pdb ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\MgMdfModeld.dll : ..\..\..\Common\bin\debug(v100)64\MgMdfModeld.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)64\MgMdfModeld.dll ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\MgMdfModeld.pdb : ..\..\..\Common\bin\debug(v100)64\MgMdfModeld.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)64\MgMdfModeld.pdb ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\MgMdfParserd.dll : ..\..\..\Common\bin\debug(v100)64\MgMdfParserd.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)64\MgMdfParserd.dll ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\MgMdfParserd.pdb : ..\..\..\Common\bin\debug(v100)64\MgMdfParserd.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)64\MgMdfParserd.pdb ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\MgStylizationd.dll : ..\..\..\Common\bin\debug(v100)64\MgStylizationd.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)64\MgStylizationd.dll ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\MgStylizationd.pdb : ..\..\..\Common\bin\debug(v100)64\MgStylizationd.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)64\MgStylizationd.pdb ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\MgRenderersd.dll : ..\..\..\Common\bin\debug(v100)64\MgRenderersd.dll
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)64\MgRenderersd.dll ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\MgRenderersd.pdb : ..\..\..\Common\bin\debug(v100)64\MgRenderersd.pdb
- xcopy /r /d /y ..\..\..\Common\bin\debug(v100)64\MgRenderersd.pdb ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\ACEd.dll : ..\..\..\Oem\ACE\ACE_wrappers\lib64\debug(v100)\ACEd.dll
- xcopy /r /d /y ..\..\..\Oem\ACE\ACE_wrappers\lib64\debug(v100)\ACEd.dll ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\ACEd.pdb : ..\..\..\Oem\ACE\ACE_wrappers\lib64\debug(v100)\ACEd.pdb
- xcopy /r /d /y ..\..\..\Oem\ACE\ACE_wrappers\lib64\debug(v100)\ACEd.pdb ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\gd.dll : ..\..\..\Oem\gd\build\win32\gd\debug(v100)64\gd.dll
- xcopy /r /d /y ..\..\..\Oem\gd\build\win32\gd\debug(v100)64\gd.dll ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\gd.pdb : ..\..\..\Oem\gd\build\win32\gd\debug(v100)64\gd.pdb
- xcopy /r /d /y ..\..\..\Oem\gd\build\win32\gd\debug(v100)64\gd.pdb ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\GEOSd.dll : ..\..\..\Oem\geos\VisualStudio\debug(v100)64\GEOSd.dll
- xcopy /r /d /y ..\..\..\Oem\geos\VisualStudio\debug(v100)64\GEOSd.dll ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\GEOSd.pdb : ..\..\..\Oem\geos\VisualStudio\debug(v100)64\GEOSd.pdb
- xcopy /r /d /y ..\..\..\Oem\geos\VisualStudio\debug(v100)64\GEOSd.pdb ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\libdb48d.dll : ..\..\..\Oem\dbxml\bin64\debug(v100)\libdb48d.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\debug(v100)\libdb48d.dll ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\libdb48d.pdb : ..\..\..\Oem\dbxml\bin64\debug(v100)\libdb48d.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\debug(v100)\libdb48d.pdb ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\libdbxml25d.dll : ..\..\..\Oem\dbxml\bin64\debug(v100)\libdbxml25d.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\debug(v100)\libdbxml25d.dll ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\libdbxml25d.pdb : ..\..\..\Oem\dbxml\bin64\debug(v100)\libdbxml25d.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\debug(v100)\libdbxml25d.pdb ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\xqilla24d.dll : ..\..\..\Oem\dbxml\bin64\debug(v100)\xqilla24d.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\debug(v100)\xqilla24d.dll ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\xqilla24d.pdb : ..\..\..\Oem\dbxml\bin64\debug(v100)\xqilla24d.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\debug(v100)\xqilla24d.pdb ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\xerces-c_3_1mgD.dll : ..\..\..\Oem\dbxml\bin64\debug(v100)\xerces-c_3_1mgD.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\debug(v100)\xerces-c_3_1mgD.dll ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\xerces-c_3_1mgD.pdb : ..\..\..\Oem\dbxml\bin64\debug(v100)\xerces-c_3_1mgD.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\debug(v100)\xerces-c_3_1mgD.pdb ..\..\bin\debug(v100)64\
-
-..\..\bin\debug(v100)64\serverconfig.ini : ..\..\src\Core\serverconfig.ini
- xcopy /r /d /y ..\..\src\Core\serverconfig.ini ..\..\bin\debug(v100)64\
-
-CopyFdoComponentsdebug(v100)64 : ..\..\..\Oem\FDO\*.*
- if NOT EXIST ..\..\bin\debug(v100)64\FDO\nul mkdir ..\..\bin\debug(v100)64\FDO
- xcopy /r /d /y /s ..\..\..\Oem\FDO\bin\release64 ..\..\bin\debug(v100)64\FDO\
-
-CopyFdoProvidersdebug(v100)64 : ..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml
- xcopy /r /d /y "..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml" ..\..\bin\debug(v100)64\FDO\
-
-CopySchemadebug(v100)64 : ..\..\..\Common\Schema\*.xsd
- if NOT EXIST ..\..\bin\debug(v100)64\Schema\nul mkdir ..\..\bin\debug(v100)64\Schema
- xcopy /r /d /y ..\..\..\Common\Schema\*.xsd ..\..\bin\debug(v100)64\Schema
-
-CopyResourcesdebug(v100)64 : ..\..\..\Common\MapGuideCommon\Resources\mapguide_en.res
- if NOT EXIST ..\..\bin\debug(v100)64\Resources\nul mkdir ..\..\bin\debug(v100)64\Resources
- xcopy /r /d /y "..\..\..\Common\MapGuideCommon\Resources\mapguide_en.res" ..\..\bin\debug(v100)64\Resources\
-
-CopyOgcFilesdebug(v100)64 : ..\..\src\wms\*.awd ..\..\src\wfs\*.awd
- if NOT EXIST ..\..\bin\debug(v100)64\wms\nul mkdir ..\..\bin\debug(v100)64\wms
- xcopy /r /d /y "..\..\src\wms\*.awd" ..\..\bin\debug(v100)64\wms
- if NOT EXIST ..\..\bin\debug(v100)64\wfs\nul mkdir ..\..\bin\debug(v100)64\wfs
- xcopy /r /d /y "..\..\src\wfs\*.awd" ..\..\bin\debug(v100)64\wfs
-
-CreatePathsdebug(v100)64 :
- if NOT EXIST ..\..\bin\debug(v100)64\Logs\nul mkdir ..\..\bin\debug(v100)64\Logs
- if NOT EXIST ..\..\bin\debug(v100)64\Packages\nul mkdir ..\..\bin\debug(v100)64\Packages
- if NOT EXIST ..\..\bin\debug(v100)64\Temp\nul mkdir ..\..\bin\debug(v100)64\Temp
- if NOT EXIST ..\..\bin\debug(v100)64\wms\nul mkdir ..\..\bin\debug(v100)64\wms
- if NOT EXIST ..\..\bin\debug(v100)64\wfs\nul mkdir ..\..\bin\debug(v100)64\wfs
- if NOT EXIST ..\..\bin\debug(v100)64\Repositories\nul mkdir ..\..\bin\debug(v100)64\Repositories
- if NOT EXIST ..\..\bin\debug(v100)64\Repositories\Library\nul mkdir ..\..\bin\debug(v100)64\Repositories\Library
- if NOT EXIST ..\..\bin\debug(v100)64\Repositories\Library\DataFiles\nul mkdir ..\..\bin\debug(v100)64\Repositories\Library\DataFiles
- if NOT EXIST ..\..\bin\debug(v100)64\Repositories\Session\nul mkdir ..\..\bin\debug(v100)64\Repositories\Session
- if NOT EXIST ..\..\bin\debug(v100)64\Repositories\Session\DataFiles\nul mkdir ..\..\bin\debug(v100)64\Repositories\Session\DataFiles
- if NOT EXIST ..\..\bin\debug(v100)64\Repositories\Site\nul mkdir ..\..\bin\debug(v100)64\Repositories\Site
- if NOT EXIST ..\..\bin\debug(v100)64\Repositories\TileCache\nul mkdir ..\..\bin\debug(v100)64\Repositories\TileCache
-
-debug(v100)64 : ..\..\bin\debug(v100)64\MgFoundationd.dll \
- ..\..\bin\debug(v100)64\MgFoundationd.pdb \
- ..\..\bin\debug(v100)64\MgGeometryd.dll \
- ..\..\bin\debug(v100)64\MgGeometryd.pdb \
- ..\..\bin\debug(v100)64\MgPlatformBased.dll \
- ..\..\bin\debug(v100)64\MgPlatformBased.pdb \
- ..\..\bin\debug(v100)64\MgMapGuideCommond.dll \
- ..\..\bin\debug(v100)64\MgMapGuideCommond.pdb \
- ..\..\bin\debug(v100)64\MgMdfModeld.dll \
- ..\..\bin\debug(v100)64\MgMdfModeld.pdb \
- ..\..\bin\debug(v100)64\MgMdfParserd.dll \
- ..\..\bin\debug(v100)64\MgMdfParserd.pdb \
- ..\..\bin\debug(v100)64\MgStylizationd.dll \
- ..\..\bin\debug(v100)64\MgStylizationd.pdb \
- ..\..\bin\debug(v100)64\MgRenderersd.dll \
- ..\..\bin\debug(v100)64\MgRenderersd.pdb \
- ..\..\bin\debug(v100)64\ACEd.dll \
- ..\..\bin\debug(v100)64\ACEd.pdb \
- ..\..\bin\debug(v100)64\gd.dll \
- ..\..\bin\debug(v100)64\gd.pdb \
- ..\..\bin\debug(v100)64\GEOSd.dll \
- ..\..\bin\debug(v100)64\GEOSd.pdb \
- ..\..\bin\debug(v100)64\libdb48d.dll \
- ..\..\bin\debug(v100)64\libdb48d.pdb \
- ..\..\bin\debug(v100)64\libdbxml25d.dll \
- ..\..\bin\debug(v100)64\libdbxml25d.pdb \
- ..\..\bin\debug(v100)64\xqilla24d.dll \
- ..\..\bin\debug(v100)64\xqilla24d.pdb \
- ..\..\bin\debug(v100)64\xerces-c_3_1mgD.dll \
- ..\..\bin\debug(v100)64\xerces-c_3_1mgD.pdb \
- ..\..\bin\debug(v100)64\serverconfig.ini \
- ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml \
- ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml \
- ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml \
- ..\..\bin\UnitTestFiles\TEST.LayerDefinition \
- ..\..\bin\UnitTestFiles\TEST.FeatureSource \
- ..\..\bin\UnitTestFiles\TEST.sdf \
- ..\..\bin\UnitTestFiles\UT_BaseMap.mdf \
- ..\..\bin\UnitTestFiles\UT_BaseMap.tsd \
- ..\..\bin\UnitTestFiles\UT_XYZ.tsd \
- ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf \
- ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf \
- ..\..\bin\UnitTestFiles\UT_Parcels.fs \
- ..\..\bin\UnitTestFiles\UT_Parcels.ldf \
- ..\..\bin\UnitTestFiles\UT_Parcels.sdf \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.fs \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf \
- ..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf \
- ..\..\bin\UnitTestFiles\UT_AllElements.pl \
- ..\..\bin\UnitTestFiles\UT_NoLegend.pl \
- ..\..\bin\UnitTestFiles\UT_SymbolMart.sl \
- ..\..\bin\UnitTestFiles\UT_Symbols.dwf \
- ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf \
- ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf \
- ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf \
- ..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf \
- ..\..\bin\UnitTestFiles\UT_Rail.sdf \
- ..\..\bin\UnitTestFiles\UT_Rail.fs \
- ..\..\bin\UnitTestFiles\UT_Rail.ldf \
- ..\..\bin\UnitTestFiles\UT_Rail.wdf \
- ..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf \
- ..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf \
- ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf \
- ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf \
- ..\..\bin\UnitTestFiles\Empty.FeatureSource \
- ..\..\bin\UnitTestFiles\Empty.sdf \
- ..\..\bin\UnitTestFiles\World.mgp \
- ..\..\bin\UnitTestFiles\World_Countries.sdf \
- ..\..\bin\UnitTestFiles\Shuttle.zip \
- ..\..\bin\UnitTestFiles\test.dwf \
- ..\..\bin\UnitTestFiles\SpaceShip.dwf \
- ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml \
- ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml \
- ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource \
- ..\..\bin\UnitTestFiles\Redding_Parcels.shp \
- ..\..\bin\UnitTestFiles\Redding_Parcels.dbf \
- ..\..\bin\UnitTestFiles\Redding_Parcels.shx \
- ..\..\bin\UnitTestFiles\1.1.1.mgd \
- ..\..\bin\UnitTestFiles\epsgcodes.txt \
- ..\..\bin\UnitTestFiles\ogcwkts.txt \
- ..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt \
- ..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt \
- ..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt \
- ..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource \
- ..\..\bin\UnitTestFiles\MdfTestMap.mdf \
- ..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf \
- ..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd \
- ..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd \
- ..\..\bin\UnitTestFiles\areasymbol.sd \
- ..\..\bin\UnitTestFiles\linesymbol.sd \
- ..\..\bin\UnitTestFiles\symbol.sd \
- ..\..\bin\UnitTestFiles\symbolp.sd \
- ..\..\bin\UnitTestFiles\MTYP1500a.sd \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation1.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation1.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation2.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation2.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation3.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation3.mdf \
- ..\..\bin\UnitTestFiles\SavePointTest.sqlite \
- ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource \
- ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource \
- ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource \
- ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite \
- ..\..\bin\UnitTestFiles\JoinTest.sqlite \
- CopyFdoComponentsdebug(v100)64 \
- CopyFdoProvidersdebug(v100)64 \
- CopySchemadebug(v100)64 \
- CopyResourcesdebug(v100)64 \
- CreatePathsdebug(v100)64 \
- CopyOgcFilesdebug(v100)64
-
-
-..\..\bin\release(v100)\MgFoundation.dll : ..\..\..\Common\bin\release(v100)\MgFoundation.dll
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)\MgFoundation.dll ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\MgFoundation.pdb : ..\..\..\Common\bin\release(v100)\MgFoundation.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)\MgFoundation.pdb ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\MgPlatformBase.dll : ..\..\..\Common\bin\release(v100)\MgPlatformBase.dll
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)\MgPlatformBase.dll ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\MgPlatformBase.pdb : ..\..\..\Common\bin\release(v100)\MgPlatformBase.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)\MgPlatformBase.pdb ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\MgGeometry.dll : ..\..\..\Common\bin\release(v100)\MgGeometry.dll
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)\MgGeometry.dll ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\MgGeometry.pdb : ..\..\..\Common\bin\release(v100)\MgGeometry.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)\MgGeometry.pdb ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\MgMapGuideCommon.dll : ..\..\..\Common\bin\release(v100)\MgMapGuideCommon.dll
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)\MgMapGuideCommon.dll ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\MgMapGuideCommon.pdb : ..\..\..\Common\bin\release(v100)\MgMapGuideCommon.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)\MgMapGuideCommon.pdb ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\MgMdfModel.dll : ..\..\..\Common\bin\release(v100)\MgMdfModel.dll
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)\MgMdfModel.dll ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\MgMdfModel.pdb : ..\..\..\Common\bin\release(v100)\MgMdfModel.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)\MgMdfModel.pdb ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\MgMdfParser.dll : ..\..\..\Common\bin\release(v100)\MgMdfParser.dll
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)\MgMdfParser.dll ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\MgMdfParser.pdb : ..\..\..\Common\bin\release(v100)\MgMdfParser.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)\MgMdfParser.pdb ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\MgStylization.dll : ..\..\..\Common\bin\release(v100)\MgStylization.dll
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)\MgStylization.dll ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\MgStylization.pdb : ..\..\..\Common\bin\release(v100)\MgStylization.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)\MgStylization.pdb ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\MgRenderers.dll : ..\..\..\Common\bin\release(v100)\MgRenderers.dll
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)\MgRenderers.dll ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\MgRenderers.pdb : ..\..\..\Common\bin\release(v100)\MgRenderers.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)\MgRenderers.pdb ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\ACE.dll : ..\..\..\Oem\ACE\ACE_wrappers\lib\release(v100)\ACE.dll
- xcopy /r /d /y ..\..\..\Oem\ACE\ACE_wrappers\lib\release(v100)\ACE.dll ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\ACE.pdb : ..\..\..\Oem\ACE\ACE_wrappers\lib\release(v100)\ACE.pdb
- xcopy /r /d /y ..\..\..\Oem\ACE\ACE_wrappers\lib\release(v100)\ACE.pdb ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\gd.dll : ..\..\..\Oem\gd\build\win32\gd\release(v100)\gd.dll
- xcopy /r /d /y ..\..\..\Oem\gd\build\win32\gd\release(v100)\gd.dll ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\gd.pdb : ..\..\..\Oem\gd\build\win32\gd\release(v100)\gd.pdb
- xcopy /r /d /y ..\..\..\Oem\gd\build\win32\gd\release(v100)\gd.pdb ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\GEOS.dll : ..\..\..\Oem\geos\VisualStudio\release(v100)\GEOS.dll
- xcopy /r /d /y ..\..\..\Oem\geos\VisualStudio\release(v100)\GEOS.dll ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\GEOS.pdb : ..\..\..\Oem\geos\VisualStudio\release(v100)\GEOS.pdb
- xcopy /r /d /y ..\..\..\Oem\geos\VisualStudio\release(v100)\GEOS.pdb ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\libdb48.dll : ..\..\..\Oem\dbxml\bin\release(v100)\libdb48.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\release(v100)\libdb48.dll ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\libdb48.pdb : ..\..\..\Oem\dbxml\bin\release(v100)\libdb48.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\release(v100)\libdb48.pdb ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\libdbxml25.dll : ..\..\..\Oem\dbxml\bin\release(v100)\libdbxml25.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\release(v100)\libdbxml25.dll ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\libdbxml25.pdb : ..\..\..\Oem\dbxml\bin\release(v100)\libdbxml25.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\release(v100)\libdbxml25.pdb ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\xqilla24.dll : ..\..\..\Oem\dbxml\bin\release(v100)\xqilla24.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\release(v100)\xqilla24.dll ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\xqilla24.pdb : ..\..\..\Oem\dbxml\bin\release(v100)\xqilla24.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\release(v100)\xqilla24.pdb ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\xerces-c_3_1mg.dll : ..\..\..\Oem\dbxml\bin\release(v100)\xerces-c_3_1mg.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\release(v100)\xerces-c_3_1mg.dll ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\xerces-c_3_1mg.pdb : ..\..\..\Oem\dbxml\bin\release(v100)\xerces-c_3_1mg.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin\release(v100)\xerces-c_3_1mg.pdb ..\..\bin\release(v100)\
-
-..\..\bin\release(v100)\serverconfig.ini : ..\..\src\Core\serverconfig.ini
- xcopy /r /d /y ..\..\src\Core\serverconfig.ini ..\..\bin\release(v100)\
-
-CopyFdoComponentsrelease(v100) : ..\..\..\Oem\FDO\*.*
- if NOT EXIST ..\..\bin\release(v100)\FDO\nul mkdir ..\..\bin\release(v100)\FDO
- xcopy /r /d /y /s ..\..\..\Oem\FDO\bin\release ..\..\bin\release(v100)\FDO\
-
-CopyFdoProvidersrelease(v100) : ..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml
- xcopy /r /d /y "..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml" ..\..\bin\release(v100)\FDO\
-
-CopySchemarelease(v100) : ..\..\..\Common\Schema\*.xsd
- if NOT EXIST ..\..\bin\release(v100)\Schema\nul mkdir ..\..\bin\release(v100)\Schema
- xcopy /r /d /y ..\..\..\Common\Schema\*.xsd ..\..\bin\release(v100)\Schema
-
-CopyResourcesrelease(v100) : ..\..\..\Common\MapGuideCommon\Resources\mapguide_en.res
- if NOT EXIST ..\..\bin\release(v100)\Resources\nul mkdir ..\..\bin\release(v100)\Resources
- xcopy /r /d /y "..\..\..\Common\MapGuideCommon\Resources\mapguide_en.res" ..\..\bin\release(v100)\Resources\
-
-CopyOgcFilesrelease(v100) : ..\..\src\wms\*.awd ..\..\src\wfs\*.awd
- if NOT EXIST ..\..\bin\release(v100)\wms\nul mkdir ..\..\bin\release(v100)\wms
- xcopy /r /d /y "..\..\src\wms\*.awd" ..\..\bin\release(v100)\wms
- if NOT EXIST ..\..\bin\release(v100)\wfs\nul mkdir ..\..\bin\release(v100)\wfs
- xcopy /r /d /y "..\..\src\wfs\*.awd" ..\..\bin\release(v100)\wfs
-
-CreatePathsrelease(v100) :
- if NOT EXIST ..\..\bin\release(v100)\Logs\nul mkdir ..\..\bin\release(v100)\Logs
- if NOT EXIST ..\..\bin\release(v100)\Packages\nul mkdir ..\..\bin\release(v100)\Packages
- if NOT EXIST ..\..\bin\release(v100)\Temp\nul mkdir ..\..\bin\release(v100)\Temp
- if NOT EXIST ..\..\bin\release(v100)\wms\nul mkdir ..\..\bin\release(v100)\wms
- if NOT EXIST ..\..\bin\release(v100)\wfs\nul mkdir ..\..\bin\release(v100)\wfs
- if NOT EXIST ..\..\bin\release(v100)\Repositories\nul mkdir ..\..\bin\release(v100)\Repositories
- if NOT EXIST ..\..\bin\release(v100)\Repositories\Library\nul mkdir ..\..\bin\release(v100)\Repositories\Library
- if NOT EXIST ..\..\bin\release(v100)\Repositories\Library\DataFiles\nul mkdir ..\..\bin\release(v100)\Repositories\Library\DataFiles
- if NOT EXIST ..\..\bin\release(v100)\Repositories\Session\nul mkdir ..\..\bin\release(v100)\Repositories\Session
- if NOT EXIST ..\..\bin\release(v100)\Repositories\Session\DataFiles\nul mkdir ..\..\bin\release(v100)\Repositories\Session\DataFiles
- if NOT EXIST ..\..\bin\release(v100)\Repositories\Site\nul mkdir ..\..\bin\release(v100)\Repositories\Site
- if NOT EXIST ..\..\bin\release(v100)\Repositories\TileCache\nul mkdir ..\..\bin\release(v100)\Repositories\TileCache
-
-release(v100) : ..\..\bin\release(v100)\MgFoundation.dll \
- ..\..\bin\release(v100)\MgFoundation.pdb \
- ..\..\bin\release(v100)\MgGeometry.dll \
- ..\..\bin\release(v100)\MgGeometry.pdb \
- ..\..\bin\release(v100)\MgPlatformBase.dll \
- ..\..\bin\release(v100)\MgPlatformBase.pdb \
- ..\..\bin\release(v100)\MgMapGuideCommon.dll \
- ..\..\bin\release(v100)\MgMapGuideCommon.pdb \
- ..\..\bin\release(v100)\MgMdfModel.dll \
- ..\..\bin\release(v100)\MgMdfModel.pdb \
- ..\..\bin\release(v100)\MgMdfParser.dll \
- ..\..\bin\release(v100)\MgMdfParser.pdb \
- ..\..\bin\release(v100)\MgStylization.dll \
- ..\..\bin\release(v100)\MgStylization.pdb \
- ..\..\bin\release(v100)\MgRenderers.dll \
- ..\..\bin\release(v100)\MgRenderers.pdb \
- ..\..\bin\release(v100)\ACE.dll \
- ..\..\bin\release(v100)\ACE.pdb \
- ..\..\bin\release(v100)\gd.dll \
- ..\..\bin\release(v100)\gd.pdb \
- ..\..\bin\release(v100)\GEOS.dll \
- ..\..\bin\release(v100)\GEOS.pdb \
- ..\..\bin\release(v100)\libdb48.dll \
- ..\..\bin\release(v100)\libdb48.pdb \
- ..\..\bin\release(v100)\libdbxml25.dll \
- ..\..\bin\release(v100)\libdbxml25.pdb \
- ..\..\bin\release(v100)\xqilla24.dll \
- ..\..\bin\release(v100)\xqilla24.pdb \
- ..\..\bin\release(v100)\xerces-c_3_1mg.dll \
- ..\..\bin\release(v100)\xerces-c_3_1mg.pdb \
- ..\..\bin\release(v100)\serverconfig.ini \
- ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml \
- ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml \
- ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml \
- ..\..\bin\UnitTestFiles\TEST.LayerDefinition \
- ..\..\bin\UnitTestFiles\TEST.FeatureSource \
- ..\..\bin\UnitTestFiles\TEST.sdf \
- ..\..\bin\UnitTestFiles\UT_BaseMap.mdf \
- ..\..\bin\UnitTestFiles\UT_BaseMap.tsd \
- ..\..\bin\UnitTestFiles\UT_XYZ.tsd \
- ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf \
- ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf \
- ..\..\bin\UnitTestFiles\UT_Parcels.fs \
- ..\..\bin\UnitTestFiles\UT_Parcels.ldf \
- ..\..\bin\UnitTestFiles\UT_Parcels.sdf \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.fs \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf \
- ..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf \
- ..\..\bin\UnitTestFiles\UT_AllElements.pl \
- ..\..\bin\UnitTestFiles\UT_NoLegend.pl \
- ..\..\bin\UnitTestFiles\UT_SymbolMart.sl \
- ..\..\bin\UnitTestFiles\UT_Symbols.dwf \
- ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf \
- ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf \
- ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf \
- ..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf \
- ..\..\bin\UnitTestFiles\UT_Rail.sdf \
- ..\..\bin\UnitTestFiles\UT_Rail.fs \
- ..\..\bin\UnitTestFiles\UT_Rail.ldf \
- ..\..\bin\UnitTestFiles\UT_Rail.wdf \
- ..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf \
- ..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf \
- ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf \
- ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf \
- ..\..\bin\UnitTestFiles\Empty.FeatureSource \
- ..\..\bin\UnitTestFiles\Empty.sdf \
- ..\..\bin\UnitTestFiles\World.mgp \
- ..\..\bin\UnitTestFiles\World_Countries.sdf \
- ..\..\bin\UnitTestFiles\Shuttle.zip \
- ..\..\bin\UnitTestFiles\test.dwf \
- ..\..\bin\UnitTestFiles\SpaceShip.dwf \
- ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml \
- ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml \
- ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource \
- ..\..\bin\UnitTestFiles\Redding_Parcels.shp \
- ..\..\bin\UnitTestFiles\Redding_Parcels.dbf \
- ..\..\bin\UnitTestFiles\Redding_Parcels.shx \
- ..\..\bin\UnitTestFiles\1.1.1.mgd \
- ..\..\bin\UnitTestFiles\epsgcodes.txt \
- ..\..\bin\UnitTestFiles\ogcwkts.txt \
- ..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt \
- ..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt \
- ..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt \
- ..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource \
- ..\..\bin\UnitTestFiles\MdfTestMap.mdf \
- ..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf \
- ..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd \
- ..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd \
- ..\..\bin\UnitTestFiles\areasymbol.sd \
- ..\..\bin\UnitTestFiles\linesymbol.sd \
- ..\..\bin\UnitTestFiles\symbol.sd \
- ..\..\bin\UnitTestFiles\symbolp.sd \
- ..\..\bin\UnitTestFiles\MTYP1500a.sd \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation1.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation1.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation2.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation2.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation3.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation3.mdf \
- ..\..\bin\UnitTestFiles\SavePointTest.sqlite \
- ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource \
- ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource \
- ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource \
- ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite \
- ..\..\bin\UnitTestFiles\JoinTest.sqlite \
- CopyFdoComponentsrelease(v100) \
- CopyFdoProvidersrelease(v100) \
- CopySchemarelease(v100) \
- CopyResourcesrelease(v100) \
- CreatePathsrelease(v100) \
- CopyOgcFilesrelease(v100)
-
-
-..\..\bin\release(v100)64\MgFoundation.dll : ..\..\..\Common\bin\release(v100)64\MgFoundation.dll
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)64\MgFoundation.dll ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\MgFoundation.pdb : ..\..\..\Common\bin\release(v100)64\MgFoundation.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)64\MgFoundation.pdb ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\MgPlatformBase.dll : ..\..\..\Common\bin\release(v100)64\MgPlatformBase.dll
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)64\MgPlatformBase.dll ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\MgPlatformBase.pdb : ..\..\..\Common\bin\release(v100)64\MgPlatformBase.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)64\MgPlatformBase.pdb ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\MgGeometry.dll : ..\..\..\Common\bin\release(v100)64\MgGeometry.dll
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)64\MgGeometry.dll ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\MgGeometry.pdb : ..\..\..\Common\bin\release(v100)64\MgGeometry.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)64\MgGeometry.pdb ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\MgMapGuideCommon.dll : ..\..\..\Common\bin\release(v100)64\MgMapGuideCommon.dll
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)64\MgMapGuideCommon.dll ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\MgMapGuideCommon.pdb : ..\..\..\Common\bin\release(v100)64\MgMapGuideCommon.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)64\MgMapGuideCommon.pdb ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\MgMdfModel.dll : ..\..\..\Common\bin\release(v100)64\MgMdfModel.dll
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)64\MgMdfModel.dll ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\MgMdfModel.pdb : ..\..\..\Common\bin\release(v100)64\MgMdfModel.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)64\MgMdfModel.pdb ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\MgMdfParser.dll : ..\..\..\Common\bin\release(v100)64\MgMdfParser.dll
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)64\MgMdfParser.dll ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\MgMdfParser.pdb : ..\..\..\Common\bin\release(v100)64\MgMdfParser.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)64\MgMdfParser.pdb ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\MgStylization.dll : ..\..\..\Common\bin\release(v100)64\MgStylization.dll
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)64\MgStylization.dll ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\MgStylization.pdb : ..\..\..\Common\bin\release(v100)64\MgStylization.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)64\MgStylization.pdb ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\MgRenderers.dll : ..\..\..\Common\bin\release(v100)64\MgRenderers.dll
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)64\MgRenderers.dll ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\MgRenderers.pdb : ..\..\..\Common\bin\release(v100)64\MgRenderers.pdb
- xcopy /r /d /y ..\..\..\Common\bin\release(v100)64\MgRenderers.pdb ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\ACE.dll : ..\..\..\Oem\ACE\ACE_wrappers\lib64\release(v100)\ACE.dll
- xcopy /r /d /y ..\..\..\Oem\ACE\ACE_wrappers\lib64\release(v100)\ACE.dll ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\ACE.pdb : ..\..\..\Oem\ACE\ACE_wrappers\lib64\release(v100)\ACE.pdb
- xcopy /r /d /y ..\..\..\Oem\ACE\ACE_wrappers\lib64\release(v100)\ACE.pdb ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\gd.dll : ..\..\..\Oem\gd\build\win32\gd\release(v100)64\gd.dll
- xcopy /r /d /y ..\..\..\Oem\gd\build\win32\gd\release(v100)64\gd.dll ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\gd.pdb : ..\..\..\Oem\gd\build\win32\gd\release(v100)64\gd.pdb
- xcopy /r /d /y ..\..\..\Oem\gd\build\win32\gd\release(v100)64\gd.pdb ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\GEOS.dll : ..\..\..\Oem\geos\VisualStudio\release(v100)64\GEOS.dll
- xcopy /r /d /y ..\..\..\Oem\geos\VisualStudio\release(v100)64\GEOS.dll ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\GEOS.pdb : ..\..\..\Oem\geos\VisualStudio\release(v100)64\GEOS.pdb
- xcopy /r /d /y ..\..\..\Oem\geos\VisualStudio\release(v100)64\GEOS.pdb ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\libdb48.dll : ..\..\..\Oem\dbxml\bin64\release(v100)\libdb48.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\release(v100)\libdb48.dll ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\libdb48.pdb : ..\..\..\Oem\dbxml\bin64\release(v100)\libdb48.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\release(v100)\libdb48.pdb ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\libdbxml25.dll : ..\..\..\Oem\dbxml\bin64\release(v100)\libdbxml25.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\release(v100)\libdbxml25.dll ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\libdbxml25.pdb : ..\..\..\Oem\dbxml\bin64\release(v100)\libdbxml25.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\release(v100)\libdbxml25.pdb ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\xqilla24.dll : ..\..\..\Oem\dbxml\bin64\release(v100)\xqilla24.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\release(v100)\xqilla24.dll ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\xqilla24.pdb : ..\..\..\Oem\dbxml\bin64\release(v100)\xqilla24.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\release(v100)\xqilla24.pdb ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\xerces-c_3_1mg.dll : ..\..\..\Oem\dbxml\bin64\release(v100)\xerces-c_3_1mg.dll
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\release(v100)\xerces-c_3_1mg.dll ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\xerces-c_3_1mg.pdb : ..\..\..\Oem\dbxml\bin64\release(v100)\xerces-c_3_1mg.pdb
- xcopy /r /d /y ..\..\..\Oem\dbxml\bin64\release(v100)\xerces-c_3_1mg.pdb ..\..\bin\release(v100)64\
-
-..\..\bin\release(v100)64\serverconfig.ini : ..\..\src\Core\serverconfig.ini
- xcopy /r /d /y ..\..\src\Core\serverconfig.ini ..\..\bin\release(v100)64\
-
-CopyFdoComponentsrelease(v100)64 : ..\..\..\Oem\FDO\*.*
- if NOT EXIST ..\..\bin\release(v100)64\FDO\nul mkdir ..\..\bin\release(v100)64\FDO
- xcopy /r /d /y /s ..\..\..\Oem\FDO\bin\release64 ..\..\bin\release(v100)64\FDO\
-
-CopyFdoProvidersrelease(v100)64 : ..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml
- xcopy /r /d /y "..\..\..\Oem\FDO\ProviderList\ServerCommunity\providers.xml" ..\..\bin\release(v100)64\FDO\
-
-CopySchemarelease(v100)64 : ..\..\..\Common\Schema\*.xsd
- if NOT EXIST ..\..\bin\release(v100)64\Schema\nul mkdir ..\..\bin\release(v100)64\Schema
- xcopy /r /d /y ..\..\..\Common\Schema\*.xsd ..\..\bin\release(v100)64\Schema
-
-CopyResourcesrelease(v100)64 : ..\..\..\Common\MapGuideCommon\Resources\mapguide_en.res
- if NOT EXIST ..\..\bin\release(v100)64\Resources\nul mkdir ..\..\bin\release(v100)64\Resources
- xcopy /r /d /y "..\..\..\Common\MapGuideCommon\Resources\mapguide_en.res" ..\..\bin\release(v100)64\Resources\
-
-CopyOgcFilesrelease(v100)64 : ..\..\src\wms\*.awd ..\..\src\wfs\*.awd
- if NOT EXIST ..\..\bin\release(v100)64\wms\nul mkdir ..\..\bin\release(v100)64\wms
- xcopy /r /d /y "..\..\src\wms\*.awd" ..\..\bin\release(v100)64\wms
- if NOT EXIST ..\..\bin\release(v100)64\wfs\nul mkdir ..\..\bin\release(v100)64\wfs
- xcopy /r /d /y "..\..\src\wfs\*.awd" ..\..\bin\release(v100)64\wfs
-
-CreatePathsrelease(v100)64 :
- if NOT EXIST ..\..\bin\release(v100)64\Logs\nul mkdir ..\..\bin\release(v100)64\Logs
- if NOT EXIST ..\..\bin\release(v100)64\Packages\nul mkdir ..\..\bin\release(v100)64\Packages
- if NOT EXIST ..\..\bin\release(v100)64\Temp\nul mkdir ..\..\bin\release(v100)64\Temp
- if NOT EXIST ..\..\bin\release(v100)64\wms\nul mkdir ..\..\bin\release(v100)64\wms
- if NOT EXIST ..\..\bin\release(v100)64\wfs\nul mkdir ..\..\bin\release(v100)64\wfs
- if NOT EXIST ..\..\bin\release(v100)64\Repositories\nul mkdir ..\..\bin\release(v100)64\Repositories
- if NOT EXIST ..\..\bin\release(v100)64\Repositories\Library\nul mkdir ..\..\bin\release(v100)64\Repositories\Library
- if NOT EXIST ..\..\bin\release(v100)64\Repositories\Library\DataFiles\nul mkdir ..\..\bin\release(v100)64\Repositories\Library\DataFiles
- if NOT EXIST ..\..\bin\release(v100)64\Repositories\Session\nul mkdir ..\..\bin\release(v100)64\Repositories\Session
- if NOT EXIST ..\..\bin\release(v100)64\Repositories\Session\DataFiles\nul mkdir ..\..\bin\release(v100)64\Repositories\Session\DataFiles
- if NOT EXIST ..\..\bin\release(v100)64\Repositories\Site\nul mkdir ..\..\bin\release(v100)64\Repositories\Site
- if NOT EXIST ..\..\bin\release(v100)64\Repositories\TileCache\nul mkdir ..\..\bin\release(v100)64\Repositories\TileCache
-
-release(v100)64 : ..\..\bin\release(v100)64\MgFoundation.dll \
- ..\..\bin\release(v100)64\MgFoundation.pdb \
- ..\..\bin\release(v100)64\MgGeometry.dll \
- ..\..\bin\release(v100)64\MgGeometry.pdb \
- ..\..\bin\release(v100)64\MgPlatformBase.dll \
- ..\..\bin\release(v100)64\MgPlatformBase.pdb \
- ..\..\bin\release(v100)64\MgMapGuideCommon.dll \
- ..\..\bin\release(v100)64\MgMapGuideCommon.pdb \
- ..\..\bin\release(v100)64\MgMdfModel.dll \
- ..\..\bin\release(v100)64\MgMdfModel.pdb \
- ..\..\bin\release(v100)64\MgMdfParser.dll \
- ..\..\bin\release(v100)64\MgMdfParser.pdb \
- ..\..\bin\release(v100)64\MgStylization.dll \
- ..\..\bin\release(v100)64\MgStylization.pdb \
- ..\..\bin\release(v100)64\MgRenderers.dll \
- ..\..\bin\release(v100)64\MgRenderers.pdb \
- ..\..\bin\release(v100)64\ACE.dll \
- ..\..\bin\release(v100)64\ACE.pdb \
- ..\..\bin\release(v100)64\gd.dll \
- ..\..\bin\release(v100)64\gd.pdb \
- ..\..\bin\release(v100)64\GEOS.dll \
- ..\..\bin\release(v100)64\GEOS.pdb \
- ..\..\bin\release(v100)64\libdb48.dll \
- ..\..\bin\release(v100)64\libdb48.pdb \
- ..\..\bin\release(v100)64\libdbxml25.dll \
- ..\..\bin\release(v100)64\libdbxml25.pdb \
- ..\..\bin\release(v100)64\xqilla24.dll \
- ..\..\bin\release(v100)64\xqilla24.pdb \
- ..\..\bin\release(v100)64\xerces-c_3_1mg.dll \
- ..\..\bin\release(v100)64\xerces-c_3_1mg.pdb \
- ..\..\bin\release(v100)64\serverconfig.ini \
- ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml \
- ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml \
- ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml \
- ..\..\bin\UnitTestFiles\TEST.LayerDefinition \
- ..\..\bin\UnitTestFiles\TEST.FeatureSource \
- ..\..\bin\UnitTestFiles\TEST.sdf \
- ..\..\bin\UnitTestFiles\UT_BaseMap.mdf \
- ..\..\bin\UnitTestFiles\UT_BaseMap.tsd \
- ..\..\bin\UnitTestFiles\UT_XYZ.tsd \
- ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf \
- ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf \
- ..\..\bin\UnitTestFiles\UT_Parcels.fs \
- ..\..\bin\UnitTestFiles\UT_Parcels.ldf \
- ..\..\bin\UnitTestFiles\UT_Parcels.sdf \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf \
- ..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.fs \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf \
- ..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf \
- ..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf \
- ..\..\bin\UnitTestFiles\UT_AllElements.pl \
- ..\..\bin\UnitTestFiles\UT_NoLegend.pl \
- ..\..\bin\UnitTestFiles\UT_SymbolMart.sl \
- ..\..\bin\UnitTestFiles\UT_Symbols.dwf \
- ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf \
- ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf \
- ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf \
- ..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs \
- ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf \
- ..\..\bin\UnitTestFiles\UT_Rail.sdf \
- ..\..\bin\UnitTestFiles\UT_Rail.fs \
- ..\..\bin\UnitTestFiles\UT_Rail.ldf \
- ..\..\bin\UnitTestFiles\UT_Rail.wdf \
- ..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf \
- ..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf \
- ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf \
- ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource \
- ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf \
- ..\..\bin\UnitTestFiles\Empty.FeatureSource \
- ..\..\bin\UnitTestFiles\Empty.sdf \
- ..\..\bin\UnitTestFiles\World.mgp \
- ..\..\bin\UnitTestFiles\World_Countries.sdf \
- ..\..\bin\UnitTestFiles\Shuttle.zip \
- ..\..\bin\UnitTestFiles\test.dwf \
- ..\..\bin\UnitTestFiles\SpaceShip.dwf \
- ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml \
- ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml \
- ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource \
- ..\..\bin\UnitTestFiles\Redding_Parcels.shp \
- ..\..\bin\UnitTestFiles\Redding_Parcels.dbf \
- ..\..\bin\UnitTestFiles\Redding_Parcels.shx \
- ..\..\bin\UnitTestFiles\1.1.1.mgd \
- ..\..\bin\UnitTestFiles\epsgcodes.txt \
- ..\..\bin\UnitTestFiles\ogcwkts.txt \
- ..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt \
- ..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt \
- ..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt \
- ..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource \
- ..\..\bin\UnitTestFiles\MdfTestMap.mdf \
- ..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf \
- ..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd \
- ..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd \
- ..\..\bin\UnitTestFiles\areasymbol.sd \
- ..\..\bin\UnitTestFiles\linesymbol.sd \
- ..\..\bin\UnitTestFiles\symbol.sd \
- ..\..\bin\UnitTestFiles\symbolp.sd \
- ..\..\bin\UnitTestFiles\MTYP1500a.sd \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf \
- ..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf \
- ..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation1.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation1.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation2.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation2.mdf \
- ..\..\bin\UnitTestFiles\UT_Annotation3.ldf \
- ..\..\bin\UnitTestFiles\UT_Annotation3.mdf \
- ..\..\bin\UnitTestFiles\SavePointTest.sqlite \
- ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource \
- ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource \
- ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource \
- ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite \
- ..\..\bin\UnitTestFiles\JoinTest.sqlite \
- CopyFdoComponentsrelease(v100)64 \
- CopyFdoProvidersrelease(v100)64 \
- CopySchemarelease(v100)64 \
- CopyResourcesrelease(v100)64 \
- CreatePathsrelease(v100)64 \
- CopyOgcFilesrelease(v100)64
-
-
-cleandebug(v100):
- if EXIST ..\..\bin\debug(v100)\MgFoundationd.dll del /F ..\..\bin\debug(v100)\MgFoundationd.dll
- if EXIST ..\..\bin\debug(v100)\MgFoundationd.pdb del /F ..\..\bin\debug(v100)\MgFoundationd.pdb
- if EXIST ..\..\bin\debug(v100)\MgGeometryd.dll del /F ..\..\bin\debug(v100)\MgGeometryd.dll
- if EXIST ..\..\bin\debug(v100)\MgGeometryd.pdb del /F ..\..\bin\debug(v100)\MgGeometryd.pdb
- if EXIST ..\..\bin\debug(v100)\MgPlatformBased.dll del /F ..\..\bin\debug(v100)\MgPlatformBased.dll
- if EXIST ..\..\bin\debug(v100)\MgPlatformBased.pdb del /F ..\..\bin\debug(v100)\MgPlatformBased.pdb
- if EXIST ..\..\bin\debug(v100)\MgMapGuideCommond.dll del /F ..\..\bin\debug(v100)\MgMapGuideCommond.dll
- if EXIST ..\..\bin\debug(v100)\MgMapGuideCommond.pdb del /F ..\..\bin\debug(v100)\MgMapGuideCommond.pdb
- if EXIST ..\..\bin\debug(v100)\MgMdfModeld.dll del /F ..\..\bin\debug(v100)\MgMdfModeld.dll
- if EXIST ..\..\bin\debug(v100)\MgMdfModeld.pdb del /F ..\..\bin\debug(v100)\MgMdfModeld.pdb
- if EXIST ..\..\bin\debug(v100)\MgMdfParserd.dll del /F ..\..\bin\debug(v100)\MgMdfParserd.dll
- if EXIST ..\..\bin\debug(v100)\MgMdfParserd.pdb del /F ..\..\bin\debug(v100)\MgMdfParserd.pdb
- if EXIST ..\..\bin\debug(v100)\MgStylizationd.dll del /F ..\..\bin\debug(v100)\MgStylizationd.dll
- if EXIST ..\..\bin\debug(v100)\MgStylizationd.pdb del /F ..\..\bin\debug(v100)\MgStylizationd.pdb
- if EXIST ..\..\bin\debug(v100)\MgRenderersd.dll del /F ..\..\bin\debug(v100)\MgRenderersd.dll
- if EXIST ..\..\bin\debug(v100)\MgRenderersd.pdb del /F ..\..\bin\debug(v100)\MgRenderersd.pdb
- if EXIST ..\..\bin\debug(v100)\ACEd.dll del /F ..\..\bin\debug(v100)\ACEd.dll
- if EXIST ..\..\bin\debug(v100)\ACEd.pdb del /F ..\..\bin\debug(v100)\ACEd.pdb
- if EXIST ..\..\bin\debug(v100)\gd.dll del /F ..\..\bin\debug(v100)\gd.dll
- if EXIST ..\..\bin\debug(v100)\gd.pdb del /F ..\..\bin\debug(v100)\gd.pdb
- if EXIST ..\..\bin\debug(v100)\GEOSd.dll del /F ..\..\bin\debug(v100)\GEOSd.dll
- if EXIST ..\..\bin\debug(v100)\GEOSd.pdb del /F ..\..\bin\debug(v100)\GEOSd.pdb
- if EXIST ..\..\bin\debug(v100)\libdb48d.dll del /F ..\..\bin\debug(v100)\libdb48d.dll
- if EXIST ..\..\bin\debug(v100)\libdb48d.pdb del /F ..\..\bin\debug(v100)\libdb48d.pdb
- if EXIST ..\..\bin\debug(v100)\libdbxml25d.dll del /F ..\..\bin\debug(v100)\libdbxml25d.dll
- if EXIST ..\..\bin\debug(v100)\libdbxml25d.pdb del /F ..\..\bin\debug(v100)\libdbxml25d.pdb
- if EXIST ..\..\bin\debug(v100)\xqilla24d.dll del /F ..\..\bin\debug(v100)\xqilla24d.dll
- if EXIST ..\..\bin\debug(v100)\xqilla24d.pdb del /F ..\..\bin\debug(v100)\xqilla24d.pdb
- if EXIST ..\..\bin\debug(v100)\xerces-c_3_1mgD.dll del /F ..\..\bin\debug(v100)\xerces-c_3_1mgD.dll
- if EXIST ..\..\bin\debug(v100)\xerces-c_3_1mgD.pdb del /F ..\..\bin\debug(v100)\xerces-c_3_1mgD.pdb
- if EXIST ..\..\bin\debug(v100)\serverconfig.ini del /F ..\..\bin\debug(v100)\serverconfig.ini
- if EXIST ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml
- if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml
- if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml
- if EXIST ..\..\bin\UnitTestFiles\TEST.LayerDefinition del /F ..\..\bin\UnitTestFiles\TEST.LayerDefinition
- if EXIST ..\..\bin\UnitTestFiles\TEST.FeatureSource del /F ..\..\bin\UnitTestFiles\TEST.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\TEST.sdf del /F ..\..\bin\UnitTestFiles\TEST.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.mdf del /F ..\..\bin\UnitTestFiles\UT_BaseMap.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_XYZ.tsd del /F ..\..\bin\UnitTestFiles\UT_XYZ.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf del /F ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf del /F ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.fs del /F ..\..\bin\UnitTestFiles\UT_Parcels.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.ldf del /F ..\..\bin\UnitTestFiles\UT_Parcels.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.sdf del /F ..\..\bin\UnitTestFiles\UT_Parcels.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs del /F ..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf del /F ..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf del /F ..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistricts.fs del /F ..\..\bin\UnitTestFiles\UT_VotingDistricts.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf del /F ..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf del /F ..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf del /F ..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_AllElements.pl del /F ..\..\bin\UnitTestFiles\UT_AllElements.pl
- if EXIST ..\..\bin\UnitTestFiles\UT_NoLegend.pl del /F ..\..\bin\UnitTestFiles\UT_NoLegend.pl
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbolMart.sl del /F ..\..\bin\UnitTestFiles\UT_SymbolMart.sl
- if EXIST ..\..\bin\UnitTestFiles\UT_Symbols.dwf del /F ..\..\bin\UnitTestFiles\UT_Symbols.dwf
- if EXIST ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf del /F ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf del /F ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf del /F ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf del /F ..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.sdf del /F ..\..\bin\UnitTestFiles\UT_Rail.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.fs del /F ..\..\bin\UnitTestFiles\UT_Rail.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.ldf del /F ..\..\bin\UnitTestFiles\UT_Rail.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.wdf del /F ..\..\bin\UnitTestFiles\UT_Rail.wdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf del /F ..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource del /F ..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf del /F ..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource del /F ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf del /F ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource del /F ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf del /F ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf
- if EXIST ..\..\bin\UnitTestFiles\Empty.FeatureSource del /F ..\..\bin\UnitTestFiles\Empty.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Empty.sdf del /F ..\..\bin\UnitTestFiles\Empty.sdf
- if EXIST ..\..\bin\UnitTestFiles\World.mgp del /F ..\..\bin\UnitTestFiles\World.mgp
- if EXIST ..\..\bin\UnitTestFiles\World_Countries.sdf del /F ..\..\bin\UnitTestFiles\World_Countries.sdf
- if EXIST ..\..\bin\UnitTestFiles\Shuttle.zip del /F ..\..\bin\UnitTestFiles\Shuttle.zip
- if EXIST ..\..\bin\UnitTestFiles\test.dwf del /F ..\..\bin\UnitTestFiles\test.dwf
- if EXIST ..\..\bin\UnitTestFiles\SpaceShip.dwf del /F ..\..\bin\UnitTestFiles\SpaceShip.dwf
- if EXIST ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml del /F ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml
- if EXIST ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml del /F ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource del /F ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.shp del /F ..\..\bin\UnitTestFiles\Redding_Parcels.shp
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.dbf del /F ..\..\bin\UnitTestFiles\Redding_Parcels.dbf
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.shx del /F ..\..\bin\UnitTestFiles\Redding_Parcels.shx
- if EXIST ..\..\bin\UnitTestFiles\1.1.1.mgd del /F ..\..\bin\UnitTestFiles\1.1.1.mgd
- if EXIST ..\..\bin\UnitTestFiles\epsgcodes.txt del /F ..\..\bin\UnitTestFiles\epsgcodes.txt
- if EXIST ..\..\bin\UnitTestFiles\ogcwkts.txt del /F ..\..\bin\UnitTestFiles\ogcwkts.txt
- if EXIST ..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt del /F ..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt
- if EXIST ..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt del /F ..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt
- if EXIST ..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt del /F ..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt
- if EXIST ..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\MdfTestMap.mdf del /F ..\..\bin\UnitTestFiles\MdfTestMap.mdf
- if EXIST ..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf del /F ..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf
- if EXIST ..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd del /F ..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd del /F ..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\areasymbol.sd del /F ..\..\bin\UnitTestFiles\areasymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\linesymbol.sd del /F ..\..\bin\UnitTestFiles\linesymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\symbol.sd del /F ..\..\bin\UnitTestFiles\symbol.sd
- if EXIST ..\..\bin\UnitTestFiles\symbolp.sd del /F ..\..\bin\UnitTestFiles\symbolp.sd
- if EXIST ..\..\bin\UnitTestFiles\MTYP1500a.sd del /F ..\..\bin\UnitTestFiles\MTYP1500a.sd
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.fs del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation1.ldf del /F ..\..\bin\UnitTestFiles\UT_Annotation1.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation1.mdf del /F ..\..\bin\UnitTestFiles\UT_Annotation1.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation2.ldf del /F ..\..\bin\UnitTestFiles\UT_Annotation2.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation2.mdf del /F ..\..\bin\UnitTestFiles\UT_Annotation2.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation3.ldf del /F ..\..\bin\UnitTestFiles\UT_Annotation3.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation3.mdf del /F ..\..\bin\UnitTestFiles\UT_Annotation3.mdf
- if EXIST ..\..\bin\UnitTestFiles\SavePointTest.sqlite del /F ..\..\bin\UnitTestFiles\SavePointTest.sqlite
- if EXIST ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource del /F ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite del /F ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite
- if EXIST ..\..\bin\UnitTestFiles\JoinTest.sqlite del /F ..\..\bin\UnitTestFiles\JoinTest.FeatureSource
- del /F ..\..\bin\debug(v100)\*.ilk
-
-
-cleandebug(v100)64:
- if EXIST ..\..\bin\debug(v100)64\MgFoundationd.dll del /F ..\..\bin\debug(v100)64\MgFoundationd.dll
- if EXIST ..\..\bin\debug(v100)64\MgFoundationd.pdb del /F ..\..\bin\debug(v100)64\MgFoundationd.pdb
- if EXIST ..\..\bin\debug(v100)64\MgGeometryd.dll del /F ..\..\bin\debug(v100)64\MgGeometryd.dll
- if EXIST ..\..\bin\debug(v100)64\MgGeometryd.pdb del /F ..\..\bin\debug(v100)64\MgGeometryd.pdb
- if EXIST ..\..\bin\debug(v100)64\MgPlatformBased.dll del /F ..\..\bin\debug(v100)64\MgPlatformBased.dll
- if EXIST ..\..\bin\debug(v100)64\MgPlatformBased.pdb del /F ..\..\bin\debug(v100)64\MgPlatformBased.pdb
- if EXIST ..\..\bin\debug(v100)64\MgMapGuideCommond.dll del /F ..\..\bin\debug(v100)64\MgMapGuideCommond.dll
- if EXIST ..\..\bin\debug(v100)64\MgMapGuideCommond.pdb del /F ..\..\bin\debug(v100)64\MgMapGuideCommond.pdb
- if EXIST ..\..\bin\debug(v100)64\MgMdfModeld.dll del /F ..\..\bin\debug(v100)64\MgMdfModeld.dll
- if EXIST ..\..\bin\debug(v100)64\MgMdfModeld.pdb del /F ..\..\bin\debug(v100)64\MgMdfModeld.pdb
- if EXIST ..\..\bin\debug(v100)64\MgMdfParserd.dll del /F ..\..\bin\debug(v100)64\MgMdfParserd.dll
- if EXIST ..\..\bin\debug(v100)64\MgMdfParserd.pdb del /F ..\..\bin\debug(v100)64\MgMdfParserd.pdb
- if EXIST ..\..\bin\debug(v100)64\MgStylizationd.dll del /F ..\..\bin\debug(v100)64\MgStylizationd.dll
- if EXIST ..\..\bin\debug(v100)64\MgStylizationd.pdb del /F ..\..\bin\debug(v100)64\MgStylizationd.pdb
- if EXIST ..\..\bin\debug(v100)64\MgRenderersd.dll del /F ..\..\bin\debug(v100)64\MgRenderersd.dll
- if EXIST ..\..\bin\debug(v100)64\MgRenderersd.pdb del /F ..\..\bin\debug(v100)64\MgRenderersd.pdb
- if EXIST ..\..\bin\debug(v100)64\ACEd.dll del /F ..\..\bin\debug(v100)64\ACEd.dll
- if EXIST ..\..\bin\debug(v100)64\ACEd.pdb del /F ..\..\bin\debug(v100)64\ACEd.pdb
- if EXIST ..\..\bin\debug(v100)64\gd.dll del /F ..\..\bin\debug(v100)64\gd.dll
- if EXIST ..\..\bin\debug(v100)64\gd.pdb del /F ..\..\bin\debug(v100)64\gd.pdb
- if EXIST ..\..\bin\debug(v100)64\GEOSd.dll del /F ..\..\bin\debug(v100)64\GEOSd.dll
- if EXIST ..\..\bin\debug(v100)64\GEOSd.pdb del /F ..\..\bin\debug(v100)64\GEOSd.pdb
- if EXIST ..\..\bin\debug(v100)64\libdb48d.dll del /F ..\..\bin\debug(v100)64\libdb48d.dll
- if EXIST ..\..\bin\debug(v100)64\libdb48d.pdb del /F ..\..\bin\debug(v100)64\libdb48d.pdb
- if EXIST ..\..\bin\debug(v100)64\libdbxml25d.dll del /F ..\..\bin\debug(v100)64\libdbxml25d.dll
- if EXIST ..\..\bin\debug(v100)64\libdbxml25d.pdb del /F ..\..\bin\debug(v100)64\libdbxml25d.pdb
- if EXIST ..\..\bin\debug(v100)64\xqilla24d.dll del /F ..\..\bin\debug(v100)64\xqilla24d.dll
- if EXIST ..\..\bin\debug(v100)64\xqilla24d.pdb del /F ..\..\bin\debug(v100)64\xqilla24d.pdb
- if EXIST ..\..\bin\debug(v100)64\xerces-c_3_1mgD.dll del /F ..\..\bin\debug(v100)64\xerces-c_3_1mgD.dll
- if EXIST ..\..\bin\debug(v100)64\xerces-c_3_1mgD.pdb del /F ..\..\bin\debug(v100)64\xerces-c_3_1mgD.pdb
- if EXIST ..\..\bin\debug(v100)64\serverconfig.ini del /F ..\..\bin\debug(v100)64\serverconfig.ini
- if EXIST ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml
- if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml
- if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml
- if EXIST ..\..\bin\UnitTestFiles\TEST.LayerDefinition del /F ..\..\bin\UnitTestFiles\TEST.LayerDefinition
- if EXIST ..\..\bin\UnitTestFiles\TEST.FeatureSource del /F ..\..\bin\UnitTestFiles\TEST.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\TEST.sdf del /F ..\..\bin\UnitTestFiles\TEST.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.mdf del /F ..\..\bin\UnitTestFiles\UT_BaseMap.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_XYZ.tsd del /F ..\..\bin\UnitTestFiles\UT_XYZ.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf del /F ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf del /F ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.fs del /F ..\..\bin\UnitTestFiles\UT_Parcels.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.ldf del /F ..\..\bin\UnitTestFiles\UT_Parcels.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.sdf del /F ..\..\bin\UnitTestFiles\UT_Parcels.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs del /F ..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf del /F ..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf del /F ..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistricts.fs del /F ..\..\bin\UnitTestFiles\UT_VotingDistricts.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf del /F ..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf del /F ..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf del /F ..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_AllElements.pl del /F ..\..\bin\UnitTestFiles\UT_AllElements.pl
- if EXIST ..\..\bin\UnitTestFiles\UT_NoLegend.pl del /F ..\..\bin\UnitTestFiles\UT_NoLegend.pl
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbolMart.sl del /F ..\..\bin\UnitTestFiles\UT_SymbolMart.sl
- if EXIST ..\..\bin\UnitTestFiles\UT_Symbols.dwf del /F ..\..\bin\UnitTestFiles\UT_Symbols.dwf
- if EXIST ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf del /F ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf del /F ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf del /F ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf del /F ..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.sdf del /F ..\..\bin\UnitTestFiles\UT_Rail.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.fs del /F ..\..\bin\UnitTestFiles\UT_Rail.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.ldf del /F ..\..\bin\UnitTestFiles\UT_Rail.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.wdf del /F ..\..\bin\UnitTestFiles\UT_Rail.wdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf del /F ..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource del /F ..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf del /F ..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource del /F ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf del /F ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource del /F ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf del /F ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf
- if EXIST ..\..\bin\UnitTestFiles\Empty.FeatureSource del /F ..\..\bin\UnitTestFiles\Empty.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Empty.sdf del /F ..\..\bin\UnitTestFiles\Empty.sdf
- if EXIST ..\..\bin\UnitTestFiles\World.mgp del /F ..\..\bin\UnitTestFiles\World.mgp
- if EXIST ..\..\bin\UnitTestFiles\World_Countries.sdf del /F ..\..\bin\UnitTestFiles\World_Countries.sdf
- if EXIST ..\..\bin\UnitTestFiles\Shuttle.zip del /F ..\..\bin\UnitTestFiles\Shuttle.zip
- if EXIST ..\..\bin\UnitTestFiles\test.dwf del /F ..\..\bin\UnitTestFiles\test.dwf
- if EXIST ..\..\bin\UnitTestFiles\SpaceShip.dwf del /F ..\..\bin\UnitTestFiles\SpaceShip.dwf
- if EXIST ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml del /F ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml
- if EXIST ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml del /F ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource del /F ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.shp del /F ..\..\bin\UnitTestFiles\Redding_Parcels.shp
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.dbf del /F ..\..\bin\UnitTestFiles\Redding_Parcels.dbf
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.shx del /F ..\..\bin\UnitTestFiles\Redding_Parcels.shx
- if EXIST ..\..\bin\UnitTestFiles\1.1.1.mgd del /F ..\..\bin\UnitTestFiles\1.1.1.mgd
- if EXIST ..\..\bin\UnitTestFiles\epsgcodes.txt del /F ..\..\bin\UnitTestFiles\epsgcodes.txt
- if EXIST ..\..\bin\UnitTestFiles\ogcwkts.txt del /F ..\..\bin\UnitTestFiles\ogcwkts.txt
- if EXIST ..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt del /F ..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt
- if EXIST ..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt del /F ..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt
- if EXIST ..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt del /F ..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt
- if EXIST ..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\MdfTestMap.mdf del /F ..\..\bin\UnitTestFiles\MdfTestMap.mdf
- if EXIST ..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf del /F ..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf
- if EXIST ..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd del /F ..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd del /F ..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\areasymbol.sd del /F ..\..\bin\UnitTestFiles\areasymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\linesymbol.sd del /F ..\..\bin\UnitTestFiles\linesymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\symbol.sd del /F ..\..\bin\UnitTestFiles\symbol.sd
- if EXIST ..\..\bin\UnitTestFiles\symbolp.sd del /F ..\..\bin\UnitTestFiles\symbolp.sd
- if EXIST ..\..\bin\UnitTestFiles\MTYP1500a.sd del /F ..\..\bin\UnitTestFiles\MTYP1500a.sd
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.fs del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation1.ldf del /F ..\..\bin\UnitTestFiles\UT_Annotation1.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation1.mdf del /F ..\..\bin\UnitTestFiles\UT_Annotation1.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation2.ldf del /F ..\..\bin\UnitTestFiles\UT_Annotation2.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation2.mdf del /F ..\..\bin\UnitTestFiles\UT_Annotation2.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation3.ldf del /F ..\..\bin\UnitTestFiles\UT_Annotation3.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation3.mdf del /F ..\..\bin\UnitTestFiles\UT_Annotation3.mdf
- if EXIST ..\..\bin\UnitTestFiles\SavePointTest.sqlite del /F ..\..\bin\UnitTestFiles\SavePointTest.sqlite
- if EXIST ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource del /F ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite del /F ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite
- if EXIST ..\..\bin\UnitTestFiles\JoinTest.sqlite del /F ..\..\bin\UnitTestFiles\JoinTest.FeatureSource
- del /F ..\..\bin\debug(v100)64\*.ilk
-
-
-cleanrelease(v100):
- if EXIST ..\..\bin\release(v100)\MgFoundation.dll del /F ..\..\bin\release(v100)\MgFoundation.dll
- if EXIST ..\..\bin\release(v100)\MgFoundation.pdb del /F ..\..\bin\release(v100)\MgFoundation.pdb
- if EXIST ..\..\bin\release(v100)\MgGeometry.dll del /F ..\..\bin\release(v100)\MgGeometry.dll
- if EXIST ..\..\bin\release(v100)\MgGeometry.pdb del /F ..\..\bin\release(v100)\MgGeometry.pdb
- if EXIST ..\..\bin\release(v100)\MgPlatformBase.dll del /F ..\..\bin\release(v100)\MgPlatformBase.dll
- if EXIST ..\..\bin\release(v100)\MgPlatformBase.pdb del /F ..\..\bin\release(v100)\MgPlatformBase.pdb
- if EXIST ..\..\bin\release(v100)\MgMapGuideCommon.dll del /F ..\..\bin\release(v100)\MgMapGuideCommon.dll
- if EXIST ..\..\bin\release(v100)\MgMapGuideCommon.pdb del /F ..\..\bin\release(v100)\MgMapGuideCommon.pdb
- if EXIST ..\..\bin\release(v100)\MgMdfModel.dll del /F ..\..\bin\release(v100)\MgMdfModel.dll
- if EXIST ..\..\bin\release(v100)\MgMdfModel.pdb del /F ..\..\bin\release(v100)\MgMdfModel.pdb
- if EXIST ..\..\bin\release(v100)\MgMdfParser.dll del /F ..\..\bin\release(v100)\MgMdfParser.dll
- if EXIST ..\..\bin\release(v100)\MgMdfParser.pdb del /F ..\..\bin\release(v100)\MgMdfParser.pdb
- if EXIST ..\..\bin\release(v100)\MgStylization.dll del /F ..\..\bin\release(v100)\MgStylization.dll
- if EXIST ..\..\bin\release(v100)\MgStylization.pdb del /F ..\..\bin\release(v100)\MgStylization.pdb
- if EXIST ..\..\bin\release(v100)\MgRenderers.dll del /F ..\..\bin\release(v100)\MgRenderers.dll
- if EXIST ..\..\bin\release(v100)\MgRenderers.pdb del /F ..\..\bin\release(v100)\MgRenderers.pdb
- if EXIST ..\..\bin\release(v100)\ACE.dll del /F ..\..\bin\release(v100)\ACE.dll
- if EXIST ..\..\bin\release(v100)\ACE.pdb del /F ..\..\bin\release(v100)\ACE.pdb
- if EXIST ..\..\bin\release(v100)\gd.dll del /F ..\..\bin\release(v100)\gd.dll
- if EXIST ..\..\bin\release(v100)\gd.pdb del /F ..\..\bin\release(v100)\gd.pdb
- if EXIST ..\..\bin\release(v100)\GEOS.dll del /F ..\..\bin\release(v100)\GEOS.dll
- if EXIST ..\..\bin\release(v100)\GEOS.pdb del /F ..\..\bin\release(v100)\GEOS.pdb
- if EXIST ..\..\bin\release(v100)\libdb48.dll del /F ..\..\bin\release(v100)\libdb48.dll
- if EXIST ..\..\bin\release(v100)\libdb48.pdb del /F ..\..\bin\release(v100)\libdb48.pdb
- if EXIST ..\..\bin\release(v100)\libdbxml25.dll del /F ..\..\bin\release(v100)\libdbxml25.dll
- if EXIST ..\..\bin\release(v100)\libdbxml25.pdb del /F ..\..\bin\release(v100)\libdbxml25.pdb
- if EXIST ..\..\bin\release(v100)\xqilla24.dll del /F ..\..\bin\release(v100)\xqilla24.dll
- if EXIST ..\..\bin\release(v100)\xqilla24.pdb del /F ..\..\bin\release(v100)\xqilla24.pdb
- if EXIST ..\..\bin\release(v100)\xerces-c_3_1mg.dll del /F ..\..\bin\release(v100)\xerces-c_3_1mg.dll
- if EXIST ..\..\bin\release(v100)\xerces-c_3_1mg.pdb del /F ..\..\bin\release(v100)\xerces-c_3_1mg.pdb
- if EXIST ..\..\bin\release(v100)\serverconfig.ini del /F ..\..\bin\release(v100)\serverconfig.ini
- if EXIST ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml
- if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml
- if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml
- if EXIST ..\..\bin\UnitTestFiles\TEST.LayerDefinition del /F ..\..\bin\UnitTestFiles\TEST.LayerDefinition
- if EXIST ..\..\bin\UnitTestFiles\TEST.FeatureSource del /F ..\..\bin\UnitTestFiles\TEST.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\TEST.sdf del /F ..\..\bin\UnitTestFiles\TEST.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.mdf del /F ..\..\bin\UnitTestFiles\UT_BaseMap.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_XYZ.tsd del /F ..\..\bin\UnitTestFiles\UT_XYZ.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf del /F ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf del /F ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.fs del /F ..\..\bin\UnitTestFiles\UT_Parcels.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.ldf del /F ..\..\bin\UnitTestFiles\UT_Parcels.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.sdf del /F ..\..\bin\UnitTestFiles\UT_Parcels.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs del /F ..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf del /F ..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf del /F ..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistricts.fs del /F ..\..\bin\UnitTestFiles\UT_VotingDistricts.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf del /F ..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf del /F ..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf del /F ..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_AllElements.pl del /F ..\..\bin\UnitTestFiles\UT_AllElements.pl
- if EXIST ..\..\bin\UnitTestFiles\UT_NoLegend.pl del /F ..\..\bin\UnitTestFiles\UT_NoLegend.pl
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbolMart.sl del /F ..\..\bin\UnitTestFiles\UT_SymbolMart.sl
- if EXIST ..\..\bin\UnitTestFiles\UT_Symbols.dwf del /F ..\..\bin\UnitTestFiles\UT_Symbols.dwf
- if EXIST ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf del /F ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf del /F ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf del /F ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf del /F ..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.sdf del /F ..\..\bin\UnitTestFiles\UT_Rail.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.fs del /F ..\..\bin\UnitTestFiles\UT_Rail.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.ldf del /F ..\..\bin\UnitTestFiles\UT_Rail.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.wdf del /F ..\..\bin\UnitTestFiles\UT_Rail.wdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf del /F ..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource del /F ..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf del /F ..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource del /F ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf del /F ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource del /F ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf del /F ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf
- if EXIST ..\..\bin\UnitTestFiles\Empty.FeatureSource del /F ..\..\bin\UnitTestFiles\Empty.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Empty.sdf del /F ..\..\bin\UnitTestFiles\Empty.sdf
- if EXIST ..\..\bin\UnitTestFiles\World.mgp del /F ..\..\bin\UnitTestFiles\World.mgp
- if EXIST ..\..\bin\UnitTestFiles\World_Countries.sdf del /F ..\..\bin\UnitTestFiles\World_Countries.sdf
- if EXIST ..\..\bin\UnitTestFiles\Shuttle.zip del /F ..\..\bin\UnitTestFiles\Shuttle.zip
- if EXIST ..\..\bin\UnitTestFiles\test.dwf del /F ..\..\bin\UnitTestFiles\test.dwf
- if EXIST ..\..\bin\UnitTestFiles\SpaceShip.dwf del /F ..\..\bin\UnitTestFiles\SpaceShip.dwf
- if EXIST ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml del /F ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml
- if EXIST ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml del /F ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource del /F ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.shp del /F ..\..\bin\UnitTestFiles\Redding_Parcels.shp
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.dbf del /F ..\..\bin\UnitTestFiles\Redding_Parcels.dbf
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.shx del /F ..\..\bin\UnitTestFiles\Redding_Parcels.shx
- if EXIST ..\..\bin\UnitTestFiles\1.1.1.mgd del /F ..\..\bin\UnitTestFiles\1.1.1.mgd
- if EXIST ..\..\bin\UnitTestFiles\epsgcodes.txt del /F ..\..\bin\UnitTestFiles\epsgcodes.txt
- if EXIST ..\..\bin\UnitTestFiles\ogcwkts.txt del /F ..\..\bin\UnitTestFiles\ogcwkts.txt
- if EXIST ..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt del /F ..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt
- if EXIST ..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt del /F ..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt
- if EXIST ..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt del /F ..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt
- if EXIST ..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\MdfTestMap.mdf del /F ..\..\bin\UnitTestFiles\MdfTestMap.mdf
- if EXIST ..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf del /F ..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf
- if EXIST ..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd del /F ..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd del /F ..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\areasymbol.sd del /F ..\..\bin\UnitTestFiles\areasymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\linesymbol.sd del /F ..\..\bin\UnitTestFiles\linesymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\symbol.sd del /F ..\..\bin\UnitTestFiles\symbol.sd
- if EXIST ..\..\bin\UnitTestFiles\symbolp.sd del /F ..\..\bin\UnitTestFiles\symbolp.sd
- if EXIST ..\..\bin\UnitTestFiles\MTYP1500a.sd del /F ..\..\bin\UnitTestFiles\MTYP1500a.sd
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.fs del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation1.ldf del /F ..\..\bin\UnitTestFiles\UT_Annotation1.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation1.mdf del /F ..\..\bin\UnitTestFiles\UT_Annotation1.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation2.ldf del /F ..\..\bin\UnitTestFiles\UT_Annotation2.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation2.mdf del /F ..\..\bin\UnitTestFiles\UT_Annotation2.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation3.ldf del /F ..\..\bin\UnitTestFiles\UT_Annotation3.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation3.mdf del /F ..\..\bin\UnitTestFiles\UT_Annotation3.mdf
- if EXIST ..\..\bin\UnitTestFiles\SavePointTest.sqlite del /F ..\..\bin\UnitTestFiles\SavePointTest.sqlite
- if EXIST ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource del /F ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite del /F ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite
- if EXIST ..\..\bin\UnitTestFiles\JoinTest.sqlite del /F ..\..\bin\UnitTestFiles\JoinTest.FeatureSource
-
-cleanrelease(v100)64:
- if EXIST ..\..\bin\release(v100)64\MgFoundation.dll del /F ..\..\bin\release(v100)64\MgFoundation.dll
- if EXIST ..\..\bin\release(v100)64\MgFoundation.pdb del /F ..\..\bin\release(v100)64\MgFoundation.pdb
- if EXIST ..\..\bin\release(v100)64\MgGeometry.dll del /F ..\..\bin\release(v100)64\MgGeometry.dll
- if EXIST ..\..\bin\release(v100)64\MgGeometry.pdb del /F ..\..\bin\release(v100)64\MgGeometry.pdb
- if EXIST ..\..\bin\release(v100)64\MgPlatformBase.dll del /F ..\..\bin\release(v100)64\MgPlatformBase.dll
- if EXIST ..\..\bin\release(v100)64\MgPlatformBase.pdb del /F ..\..\bin\release(v100)64\MgPlatformBase.pdb
- if EXIST ..\..\bin\release(v100)64\MgMapGuideCommon.dll del /F ..\..\bin\release(v100)64\MgMapGuideCommon.dll
- if EXIST ..\..\bin\release(v100)64\MgMapGuideCommon.pdb del /F ..\..\bin\release(v100)64\MgMapGuideCommon.pdb
- if EXIST ..\..\bin\release(v100)64\MgMdfModel.dll del /F ..\..\bin\release(v100)64\MgMdfModel.dll
- if EXIST ..\..\bin\release(v100)64\MgMdfModel.pdb del /F ..\..\bin\release(v100)64\MgMdfModel.pdb
- if EXIST ..\..\bin\release(v100)64\MgMdfParser.dll del /F ..\..\bin\release(v100)64\MgMdfParser.dll
- if EXIST ..\..\bin\release(v100)64\MgMdfParser.pdb del /F ..\..\bin\release(v100)64\MgMdfParser.pdb
- if EXIST ..\..\bin\release(v100)64\MgStylization.dll del /F ..\..\bin\release(v100)64\MgStylization.dll
- if EXIST ..\..\bin\release(v100)64\MgStylization.pdb del /F ..\..\bin\release(v100)64\MgStylization.pdb
- if EXIST ..\..\bin\release(v100)64\MgRenderers.dll del /F ..\..\bin\release(v100)64\MgRenderers.dll
- if EXIST ..\..\bin\release(v100)64\MgRenderers.pdb del /F ..\..\bin\release(v100)64\MgRenderers.pdb
- if EXIST ..\..\bin\release(v100)64\ACE.dll del /F ..\..\bin\release(v100)64\ACE.dll
- if EXIST ..\..\bin\release(v100)64\ACE.pdb del /F ..\..\bin\release(v100)64\ACE.pdb
- if EXIST ..\..\bin\release(v100)64\gd.dll del /F ..\..\bin\release(v100)64\gd.dll
- if EXIST ..\..\bin\release(v100)64\gd.pdb del /F ..\..\bin\release(v100)64\gd.pdb
- if EXIST ..\..\bin\release(v100)64\GEOS.dll del /F ..\..\bin\release(v100)64\GEOS.dll
- if EXIST ..\..\bin\release(v100)64\GEOS.pdb del /F ..\..\bin\release(v100)64\GEOS.pdb
- if EXIST ..\..\bin\release(v100)64\libdb48.dll del /F ..\..\bin\release(v100)64\libdb48.dll
- if EXIST ..\..\bin\release(v100)64\libdb48.pdb del /F ..\..\bin\release(v100)64\libdb48.pdb
- if EXIST ..\..\bin\release(v100)64\libdbxml25.dll del /F ..\..\bin\release(v100)64\libdbxml25.dll
- if EXIST ..\..\bin\release(v100)64\libdbxml25.pdb del /F ..\..\bin\release(v100)64\libdbxml25.pdb
- if EXIST ..\..\bin\release(v100)64\xqilla24.dll del /F ..\..\bin\release(v100)64\xqilla24.dll
- if EXIST ..\..\bin\release(v100)64\xqilla24.pdb del /F ..\..\bin\release(v100)64\xqilla24.pdb
- if EXIST ..\..\bin\release(v100)64\xerces-c_3_1mg.dll del /F ..\..\bin\release(v100)64\xerces-c_3_1mg.dll
- if EXIST ..\..\bin\release(v100)64\xerces-c_3_1mg.pdb del /F ..\..\bin\release(v100)64\xerces-c_3_1mg.pdb
- if EXIST ..\..\bin\release(v100)64\serverconfig.ini del /F ..\..\bin\release(v100)64\serverconfig.ini
- if EXIST ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml
- if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml
- if EXIST ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml del /F ..\..\bin\UnitTestFiles\SampleRepositoryContent.xml
- if EXIST ..\..\bin\UnitTestFiles\TEST.LayerDefinition del /F ..\..\bin\UnitTestFiles\TEST.LayerDefinition
- if EXIST ..\..\bin\UnitTestFiles\TEST.FeatureSource del /F ..\..\bin\UnitTestFiles\TEST.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\TEST.sdf del /F ..\..\bin\UnitTestFiles\TEST.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.mdf del /F ..\..\bin\UnitTestFiles\UT_BaseMap.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_BaseMap.tsd del /F ..\..\bin\UnitTestFiles\UT_BaseMap.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_XYZ.tsd del /F ..\..\bin\UnitTestFiles\UT_XYZ.tsd
- if EXIST ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf del /F ..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf del /F ..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.fs del /F ..\..\bin\UnitTestFiles\UT_Parcels.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.ldf del /F ..\..\bin\UnitTestFiles\UT_Parcels.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels.sdf del /F ..\..\bin\UnitTestFiles\UT_Parcels.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs del /F ..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf del /F ..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf del /F ..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistricts.fs del /F ..\..\bin\UnitTestFiles\UT_VotingDistricts.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf del /F ..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf del /F ..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf del /F ..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_AllElements.pl del /F ..\..\bin\UnitTestFiles\UT_AllElements.pl
- if EXIST ..\..\bin\UnitTestFiles\UT_NoLegend.pl del /F ..\..\bin\UnitTestFiles\UT_NoLegend.pl
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbolMart.sl del /F ..\..\bin\UnitTestFiles\UT_SymbolMart.sl
- if EXIST ..\..\bin\UnitTestFiles\UT_Symbols.dwf del /F ..\..\bin\UnitTestFiles\UT_Symbols.dwf
- if EXIST ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf del /F ..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf del /F ..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf del /F ..\..\bin\UnitTestFiles\UT_Sheboygan.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf del /F ..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf del /F ..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.sdf del /F ..\..\bin\UnitTestFiles\UT_Rail.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.fs del /F ..\..\bin\UnitTestFiles\UT_Rail.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.ldf del /F ..\..\bin\UnitTestFiles\UT_Rail.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail.wdf del /F ..\..\bin\UnitTestFiles\UT_Rail.wdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf del /F ..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource del /F ..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf del /F ..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource del /F ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf del /F ..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource del /F ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf del /F ..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf
- if EXIST ..\..\bin\UnitTestFiles\Empty.FeatureSource del /F ..\..\bin\UnitTestFiles\Empty.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Empty.sdf del /F ..\..\bin\UnitTestFiles\Empty.sdf
- if EXIST ..\..\bin\UnitTestFiles\World.mgp del /F ..\..\bin\UnitTestFiles\World.mgp
- if EXIST ..\..\bin\UnitTestFiles\World_Countries.sdf del /F ..\..\bin\UnitTestFiles\World_Countries.sdf
- if EXIST ..\..\bin\UnitTestFiles\Shuttle.zip del /F ..\..\bin\UnitTestFiles\Shuttle.zip
- if EXIST ..\..\bin\UnitTestFiles\test.dwf del /F ..\..\bin\UnitTestFiles\test.dwf
- if EXIST ..\..\bin\UnitTestFiles\SpaceShip.dwf del /F ..\..\bin\UnitTestFiles\SpaceShip.dwf
- if EXIST ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml del /F ..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml
- if EXIST ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml del /F ..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource del /F ..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.shp del /F ..\..\bin\UnitTestFiles\Redding_Parcels.shp
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.dbf del /F ..\..\bin\UnitTestFiles\Redding_Parcels.dbf
- if EXIST ..\..\bin\UnitTestFiles\Redding_Parcels.shx del /F ..\..\bin\UnitTestFiles\Redding_Parcels.shx
- if EXIST ..\..\bin\UnitTestFiles\1.1.1.mgd del /F ..\..\bin\UnitTestFiles\1.1.1.mgd
- if EXIST ..\..\bin\UnitTestFiles\epsgcodes.txt del /F ..\..\bin\UnitTestFiles\epsgcodes.txt
- if EXIST ..\..\bin\UnitTestFiles\ogcwkts.txt del /F ..\..\bin\UnitTestFiles\ogcwkts.txt
- if EXIST ..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt del /F ..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt
- if EXIST ..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt del /F ..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt
- if EXIST ..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt del /F ..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt
- if EXIST ..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\MdfTestMap.mdf del /F ..\..\bin\UnitTestFiles\MdfTestMap.mdf
- if EXIST ..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf del /F ..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf
- if EXIST ..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd del /F ..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd del /F ..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\areasymbol.sd del /F ..\..\bin\UnitTestFiles\areasymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\linesymbol.sd del /F ..\..\bin\UnitTestFiles\linesymbol.sd
- if EXIST ..\..\bin\UnitTestFiles\symbol.sd del /F ..\..\bin\UnitTestFiles\symbol.sd
- if EXIST ..\..\bin\UnitTestFiles\symbolp.sd del /F ..\..\bin\UnitTestFiles\symbolp.sd
- if EXIST ..\..\bin\UnitTestFiles\MTYP1500a.sd del /F ..\..\bin\UnitTestFiles\MTYP1500a.sd
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.fs del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf del /F ..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf del /F ..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation1.ldf del /F ..\..\bin\UnitTestFiles\UT_Annotation1.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation1.mdf del /F ..\..\bin\UnitTestFiles\UT_Annotation1.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation2.ldf del /F ..\..\bin\UnitTestFiles\UT_Annotation2.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation2.mdf del /F ..\..\bin\UnitTestFiles\UT_Annotation2.mdf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation3.ldf del /F ..\..\bin\UnitTestFiles\UT_Annotation3.ldf
- if EXIST ..\..\bin\UnitTestFiles\UT_Annotation3.mdf del /F ..\..\bin\UnitTestFiles\UT_Annotation3.mdf
- if EXIST ..\..\bin\UnitTestFiles\SavePointTest.sqlite del /F ..\..\bin\UnitTestFiles\SavePointTest.sqlite
- if EXIST ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource del /F ..\..\bin\UnitTestFiles\SavePointTest.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource del /F ..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource
- if EXIST ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite del /F ..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite
- if EXIST ..\..\bin\UnitTestFiles\JoinTest.sqlite del /F ..\..\bin\UnitTestFiles\JoinTest.FeatureSource
-
-
-"..\..\..\UnitTest\TestData\ResourceService\LibraryRepositoryContent.xml" :
-"..\..\..\UnitTest\TestData\ResourceService\SampleRepositoryHeader.xml" :
-"..\..\..\UnitTest\TestData\ResourceService\SampleRepositoryContent.xml" :
-"..\..\..\UnitTest\TestData\ResourceService\Shuttle.zip" :
-"..\..\..\UnitTest\TestData\DrawingService\test.dwf" :
-"..\..\..\UnitTest\TestData\DrawingService\SpaceShip.dwf" :
-"..\..\..\UnitTest\TestData\DrawingService\MapGuideDrawingSource.xml" :
-"..\..\..\UnitTest\TestData\DrawingService\SpaceShipDrawingSource.xml" :
-"..\..\..\UnitTest\TestData\ResourceService\World_Countries.sdf" :
-"..\..\..\UnitTest\TestData\ResourceService\TEST.LayerDefinition" :
-"..\..\..\UnitTest\TestData\FeatureService\SDF\TEST.FeatureSource" :
-"..\..\..\UnitTest\TestData\FeatureService\SDF\TEST.sdf" :
-"..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_Parcels.FeatureSource" :
-"..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_Parcels.sdf" :
-"..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_BuildingOutlines.FeatureSource" :
-"..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_BuildingOutlines.sdf" :
-"..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_VotingDistricts.FeatureSource" :
-"..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_VotingDistricts.sdf" :
-"..\..\..\UnitTest\TestData\FeatureService\SDF\Empty.FeatureSource" :
-"..\..\..\UnitTest\TestData\FeatureService\SDF\Empty.sdf" :
-"..\..\..\UnitTest\TestData\FeatureService\SDF\TESTChainedInner1ToManyJoin.FeatureSource" :
-"..\..\..\UnitTest\TestData\FeatureService\SHP\Redding_Parcels.FeatureSource" :
-"..\..\..\UnitTest\TestData\FeatureService\SHP\Redding_Parcels.shp" :
-"..\..\..\UnitTest\TestData\FeatureService\SHP\Redding_Parcels.dbf" :
-"..\..\..\UnitTest\TestData\FeatureService\SHP\Redding_Parcels.shx" :
-"..\..\..\UnitTest\TestData\MappingService\UT_AllElements.pl" :
-"..\..\..\UnitTest\TestData\MappingService\UT_NoLegend.pl" :
-"..\..\..\UnitTest\TestData\MappingService\UT_SymbolMart.sl" :
-"..\..\..\UnitTest\TestData\MappingService\UT_Symbols.dwf" :
-"..\..\..\UnitTest\TestData\MappingService\UT_SheboyganWithWatermark.mdf" :
-"..\..\..\UnitTest\TestData\MappingService\UT_PoweredByMapGuide.wdf" :
-"..\..\..\UnitTest\TestData\MappingService\UT_Sheboygan.mdf" :
-"..\..\..\UnitTest\TestData\MappingService\UT_Sheboygan_833.mdf" :
-"..\..\..\UnitTest\TestData\MappingService\UT_HydrographicPolygons.sdf" :
-"..\..\..\UnitTest\TestData\MappingService\UT_HydrographicPolygons.fs" :
-"..\..\..\UnitTest\TestData\MappingService\UT_HydrographicPolygons.ldf" :
-"..\..\..\UnitTest\TestData\MappingService\UT_Rail.sdf" :
-"..\..\..\UnitTest\TestData\MappingService\UT_Rail.fs" :
-"..\..\..\UnitTest\TestData\MappingService\UT_Rail.ldf" :
-"..\..\..\UnitTest\TestData\MappingService\UT_Rail.wdf" :
-"..\..\..\UnitTest\TestData\MappingService\UT_Rail_Watermark.ldf" :
-"..\..\..\UnitTestFiles\UT_MultiCTS.ldf" :
-"..\..\..\UnitTestFiles\UT_MultiCTSWithTheme.ldf" :
-"..\..\..\UnitTestFiles\UT_MultiFTS.ldf" :
-"..\..\..\UnitTestFiles\UT_MultiFTSSingleCTS.ldf" :
-"..\..\..\UnitTestFiles\UT_MultiFTSWithTheme.ldf" :
-"..\..\..\UnitTestFiles\UT_SingleFTSMultiCTS.ldf" :
-"..\..\..\UnitTest\TestData\MappingService\UT_RotatedPointStyles.ldf" :
-"..\..\..\UnitTest\TestData\TileService\UT_BaseMap.mdf" :
-"..\..\..\UnitTest\TestData\TileService\UT_BaseMap.tsd" :
-"..\..\..\UnitTest\TestData\TileService\UT_XYZ.tsd" :
-"..\..\..\UnitTest\TestData\TileService\UT_LinkedTileSet.mdf" :
-"..\..\..\UnitTest\TestData\TileService\UT_StylizationFuncs.mdf" :
-"..\..\..\UnitTest\TestData\TileService\UT_Parcels.fs" :
-"..\..\..\UnitTest\TestData\TileService\UT_Parcels.ldf" :
-"..\..\..\UnitTest\TestData\TileService\UT_Parcels.sdf" :
-"..\..\..\UnitTest\TestData\TileService\UT_RoadCenterLines.fs" :
-"..\..\..\UnitTest\TestData\TileService\UT_RoadCenterLines.ldf" :
-"..\..\..\UnitTest\TestData\TileService\UT_RoadCenterLines.sdf" :
-"..\..\..\UnitTest\TestData\TileService\UT_VotingDistricts.fs" :
-"..\..\..\UnitTest\TestData\TileService\UT_VotingDistricts.ldf" :
-"..\..\..\UnitTest\TestData\TileService\UT_VotingDistrictsFunctions.ldf" :
-"..\..\..\UnitTest\TestData\TileService\UT_VotingDistricts.sdf" :
-"..\..\..\UnitTest\TestData\ServerAdmin\1.1.1.mgd" :
-"..\..\..\UnitTest\TestData\CoordinateSystems\epsgcodes.txt" :
-"..\..\..\UnitTest\TestData\CoordinateSystems\ogcwkts.txt" :
-"..\..\..\UnitTest\TestData\KmlService\UT_GetMapKmlResult.txt" :
-"..\..\..\UnitTest\TestData\KmlService\UT_GetLayerKmlResult.txt" :
-"..\..\..\UnitTest\TestData\KmlService\UT_GetFeaturesKmlResult.txt" :
-"..\..\..\UnitTest\TestData\MdfModel\MdfTestMap.mdf" :
-"..\..\..\UnitTest\TestData\MdfModel\MdfTestTypeStyles.ldf" :
-"..\..\..\UnitTest\TestData\MdfModel\MdfTestCompoundSymbol.sd" :
-"..\..\..\UnitTest\TestData\MdfModel\MdfTestSimpleSymbol.sd" :
-"..\..\..\UnitTest\TestData\Symbology\areasymbol.sd" :
-"..\..\..\UnitTest\TestData\Symbology\linesymbol.sd" :
-"..\..\..\UnitTest\TestData\Symbology\symbol.sd" :
-"..\..\..\UnitTest\TestData\Symbology\symbolp.sd" :
-"..\..\..\UnitTest\TestData\Symbology\MTYP1500a.sd" :
-"..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLines.fs" :
-"..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLines.ldf" :
-"..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLines.mdf" :
-"..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLines.sdf" :
-"..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLinesCrossTick.ldf" :
-"..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLinesCrossTick.mdf" :
-"..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPoints.fs" :
-"..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPoints.ldf" :
-"..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPoints.mdf" :
-"..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPoints.sdf" :
-"..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPointsParam.ldf" :
-"..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPointsParam.mdf" :
-"..\..\..\UnitTest\TestData\Symbology\UT_SymbologyRoads.fs" :
-"..\..\..\UnitTest\TestData\Symbology\UT_SymbologyRoads.ldf" :
-"..\..\..\UnitTest\TestData\Symbology\UT_SymbologyRoads.mdf" :
-"..\..\..\UnitTest\TestData\Symbology\UT_SymbologyRoads.sdf" :
-"..\..\..\UnitTest\TestData\Symbology\UT_SymbologyParcels.ldf" :
-"..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPolygons.mdf" :
-"..\..\..\UnitTest\TestData\Symbology\UT_Annotation1.ldf" :
-"..\..\..\UnitTest\TestData\Symbology\UT_Annotation1.mdf" :
-"..\..\..\UnitTest\TestData\Symbology\UT_Annotation2.ldf" :
-"..\..\..\UnitTest\TestData\Symbology\UT_Annotation2.mdf" :
-"..\..\..\UnitTest\TestData\Symbology\UT_Annotation3.ldf" :
-"..\..\..\UnitTest\TestData\Symbology\UT_Annotation3.mdf" :
-"..\..\..\UnitTest\TestData\Symbology\UT_Parcels_SQLite_Join.FeatureSource" :
-"..\..\..\UnitTest\TestData\Symbology\UT_FdoJoin.FeatureSource" :
-"..\..\..\UnitTest\TestData\Symbology\ParcelsJoinTest.sqlite" :
-"..\..\..\UnitTest\TestData\Symbology\JoinTest.sqlite" :
-
-..\..\bin\UnitTestFiles\LibraryRepositoryContent.xml : "..\..\..\UnitTest\TestData\ResourceService\LibraryRepositoryContent.xml"
+CopyTestData:
if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\ResourceService\LibraryRepositoryContent.xml" xcopy /r /d /y "..\..\..\UnitTest\TestData\ResourceService\LibraryRepositoryContent.xml" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\SampleRepositoryHeader.xml : "..\..\..\UnitTest\TestData\ResourceService\SampleRepositoryHeader.xml"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\ResourceService\SampleRepositoryHeader.xml" xcopy /r /d /y "..\..\..\UnitTest\TestData\ResourceService\SampleRepositoryHeader.xml" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\SampleRepositoryContent.xml : "..\..\..\UnitTest\TestData\ResourceService\SampleRepositoryContent.xml"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\ResourceService\SampleRepositoryContent.xml" xcopy /r /d /y "..\..\..\UnitTest\TestData\ResourceService\SampleRepositoryContent.xml" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\Shuttle.zip : "..\..\..\UnitTest\TestData\ResourceService\Shuttle.zip"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\ResourceService\Shuttle.zip" xcopy /r /d /y "..\..\..\UnitTest\TestData\ResourceService\Shuttle.zip" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\test.dwf : "..\..\..\UnitTest\TestData\DrawingService\test.dwf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\DrawingService\test.dwf" xcopy /r /d /y "..\..\..\UnitTest\TestData\DrawingService\test.dwf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\SpaceShip.dwf : "..\..\..\UnitTest\TestData\DrawingService\SpaceShip.dwf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\DrawingService\SpaceShip.dwf" xcopy /r /d /y "..\..\..\UnitTest\TestData\DrawingService\SpaceShip.dwf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\MapGuideDrawingSource.xml : "..\..\..\UnitTest\TestData\DrawingService\MapGuideDrawingSource.xml"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\DrawingService\MapGuideDrawingSource.xml" xcopy /r /d /y "..\..\..\UnitTest\TestData\DrawingService\MapGuideDrawingSource.xml" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\SpaceShipDrawingSource.xml : "..\..\..\UnitTest\TestData\DrawingService\SpaceShipDrawingSource.xml"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\DrawingService\SpaceShipDrawingSource.xml" xcopy /r /d /y "..\..\..\UnitTest\TestData\DrawingService\SpaceShipDrawingSource.xml" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\World.mgp : "..\..\..\UnitTest\TestData\ResourceService\Shuttle.zip"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\ResourceService\Shuttle.zip" copy /y "..\..\..\UnitTest\TestData\ResourceService\Shuttle.zip" ..\..\bin\UnitTestFiles\World.mgp
-
-..\..\bin\UnitTestFiles\World_Countries.sdf : "..\..\..\UnitTest\TestData\ResourceService\World_Countries.sdf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\ResourceService\World_Countries.sdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\ResourceService\World_Countries.sdf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\TEST.LayerDefinition : "..\..\..\UnitTest\TestData\ResourceService\TEST.LayerDefinition"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\ResourceService\TEST.LayerDefinition" xcopy /r /d /y "..\..\..\UnitTest\TestData\ResourceService\TEST.LayerDefinition" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\TEST.FeatureSource : "..\..\..\UnitTest\TestData\FeatureService\SDF\TEST.FeatureSource"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\FeatureService\SDF\TEST.FeatureSource" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SDF\TEST.FeatureSource" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\TEST.sdf : "..\..\..\UnitTest\TestData\FeatureService\SDF\TEST.sdf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\FeatureService\SDF\TEST.sdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SDF\TEST.sdf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\Sheboygan_Parcels.FeatureSource : "..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_Parcels.FeatureSource"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_Parcels.FeatureSource" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_Parcels.FeatureSource" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\Sheboygan_Parcels.sdf : "..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_Parcels.sdf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_Parcels.sdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_Parcels.sdf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.FeatureSource : "..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_BuildingOutlines.FeatureSource"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_BuildingOutlines.FeatureSource" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_BuildingOutlines.FeatureSource" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\Sheboygan_BuildingOutlines.sdf : "..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_BuildingOutlines.sdf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_BuildingOutlines.sdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_BuildingOutlines.sdf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.FeatureSource : "..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_VotingDistricts.FeatureSource"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_VotingDistricts.FeatureSource" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_VotingDistricts.FeatureSource" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\Sheboygan_VotingDistricts.sdf : "..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_VotingDistricts.sdf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_VotingDistricts.sdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_VotingDistricts.sdf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\TESTChainedInner1ToManyJoin.FeatureSource : "..\..\..\UnitTest\TestData\FeatureService\SDF\TESTChainedInner1ToManyJoin.FeatureSource"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\FeatureService\SDF\TESTChainedInner1ToManyJoin.FeatureSource" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SDF\TESTChainedInner1ToManyJoin.FeatureSource" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\Empty.FeatureSource : "..\..\..\UnitTest\TestData\FeatureService\SDF\Empty.FeatureSource"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\FeatureService\SDF\Empty.FeatureSource" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SDF\Empty.FeatureSource" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\Empty.sdf : "..\..\..\UnitTest\TestData\FeatureService\SDF\Empty.sdf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\FeatureService\SDF\Empty.sdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SDF\Empty.sdf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\Redding_Parcels.FeatureSource : "..\..\..\UnitTest\TestData\FeatureService\SHP\Redding_Parcels.FeatureSource"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\FeatureService\SHP\Redding_Parcels.FeatureSource" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SHP\Redding_Parcels.FeatureSource" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\Redding_Parcels.shp : "..\..\..\UnitTest\TestData\FeatureService\SHP\Redding_Parcels.shp"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\FeatureService\SHP\Redding_Parcels.shp" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SHP\Redding_Parcels.shp" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\Redding_Parcels.dbf : "..\..\..\UnitTest\TestData\FeatureService\SHP\Redding_Parcels.dbf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\FeatureService\SHP\Redding_Parcels.dbf" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SHP\Redding_Parcels.dbf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\Redding_Parcels.shx : "..\..\..\UnitTest\TestData\FeatureService\SHP\Redding_Parcels.shx"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\FeatureService\SHP\Redding_Parcels.shx" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SHP\Redding_Parcels.shx" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_AllElements.pl : "..\..\..\UnitTest\TestData\MappingService\UT_AllElements.pl"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_AllElements.pl" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_AllElements.pl" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_NoLegend.pl : "..\..\..\UnitTest\TestData\MappingService\UT_NoLegend.pl"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_NoLegend.pl" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_NoLegend.pl" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_SymbolMart.sl : "..\..\..\UnitTest\TestData\MappingService\UT_SymbolMart.sl"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_SymbolMart.sl" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_SymbolMart.sl" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_Symbols.dwf : "..\..\..\UnitTest\TestData\MappingService\UT_Symbols.dwf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_Symbols.dwf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_Symbols.dwf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_SheboyganWithWatermark.mdf : "..\..\..\UnitTest\TestData\MappingService\UT_SheboyganWithWatermark.mdf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_SheboyganWithWatermark.mdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_SheboyganWithWatermark.mdf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_PoweredByMapGuide.wdf : "..\..\..\UnitTest\TestData\MappingService\UT_PoweredByMapGuide.wdf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_PoweredByMapGuide.wdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_PoweredByMapGuide.wdf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_Sheboygan.mdf : "..\..\..\UnitTest\TestData\MappingService\UT_Sheboygan.mdf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_Sheboygan.mdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_Sheboygan.mdf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_Sheboygan_833.mdf : "..\..\..\UnitTest\TestData\MappingService\UT_Sheboygan_833.mdf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_Sheboygan_833.mdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_Sheboygan_833.mdf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_HydrographicPolygons.sdf : "..\..\..\UnitTest\TestData\MappingService\UT_HydrographicPolygons.sdf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_HydrographicPolygons.sdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_HydrographicPolygons.sdf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_HydrographicPolygons.fs : "..\..\..\UnitTest\TestData\MappingService\UT_HydrographicPolygons.fs"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_HydrographicPolygons.fs" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_HydrographicPolygons.fs" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_HydrographicPolygons.ldf : "..\..\..\UnitTest\TestData\MappingService\UT_HydrographicPolygons.ldf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_HydrographicPolygons.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_HydrographicPolygons.ldf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_Rail.sdf : "..\..\..\UnitTest\TestData\MappingService\UT_Rail.sdf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_Rail.sdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_Rail.sdf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_Rail.fs : "..\..\..\UnitTest\TestData\MappingService\UT_Rail.fs"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_Rail.fs" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_Rail.fs" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_Rail.ldf : "..\..\..\UnitTest\TestData\MappingService\UT_Rail.ldf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_Rail.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_Rail.ldf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_Rail.wdf : "..\..\..\UnitTest\TestData\MappingService\UT_Rail.wdf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_Rail.wdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_Rail.wdf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_Rail_Watermark.ldf : "..\..\..\UnitTest\TestData\MappingService\UT_Rail_Watermark.ldf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_Rail_Watermark.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_Rail_Watermark.ldf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_MultiCTS.ldf : "..\..\..\UnitTest\TestData\MappingService\UT_MultiCTS.ldf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_MultiCTS.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_MultiCTS.ldf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_MultiCTSWithTheme.ldf : "..\..\..\UnitTest\TestData\MappingService\UT_MultiCTSWithTheme.ldf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_MultiCTSWithTheme.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_MultiCTSWithTheme.ldf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_MultiFTS.ldf : "..\..\..\UnitTest\TestData\MappingService\UT_MultiFTS.ldf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_MultiFTS.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_MultiFTS.ldf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_MultiFTSSingleCTS.ldf : "..\..\..\UnitTest\TestData\MappingService\UT_MultiFTSSingleCTS.ldf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_MultiFTSSingleCTS.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_MultiFTSSingleCTS.ldf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_MultiFTSWithTheme.ldf : "..\..\..\UnitTest\TestData\MappingService\UT_MultiFTSWithTheme.ldf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_MultiFTSWithTheme.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_MultiFTSWithTheme.ldf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_SingleFTSMultiCTS.ldf : "..\..\..\UnitTest\TestData\MappingService\UT_SingleFTSMultiCTS.ldf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_SingleFTSMultiCTS.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_SingleFTSMultiCTS.ldf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_RotatedPointStyles.ldf : "..\..\..\UnitTest\TestData\MappingService\UT_RotatedPointStyles.ldf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_RotatedPointStyles.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_RotatedPointStyles.ldf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_BaseMap.mdf : "..\..\..\UnitTest\TestData\TileService\UT_BaseMap.mdf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\TileService\UT_BaseMap.mdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\TileService\UT_BaseMap.mdf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_BaseMap.tsd : "..\..\..\UnitTest\TestData\TileService\UT_BaseMap.tsd"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\TileService\UT_BaseMap.tsd" xcopy /r /d /y "..\..\..\UnitTest\TestData\TileService\UT_BaseMap.tsd" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_XYZ.tsd : "..\..\..\UnitTest\TestData\TileService\UT_XYZ.tsd"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\TileService\UT_XYZ.tsd" xcopy /r /d /y "..\..\..\UnitTest\TestData\TileService\UT_XYZ.tsd" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_LinkedTileSet.mdf : "..\..\..\UnitTest\TestData\TileService\UT_LinkedTileSet.mdf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\TileService\UT_LinkedTileSet.mdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\TileService\UT_LinkedTileSet.mdf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_StylizationFuncs.mdf : "..\..\..\UnitTest\TestData\TileService\UT_StylizationFuncs.mdf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\TileService\UT_StylizationFuncs.mdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\TileService\UT_StylizationFuncs.mdf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_Parcels.fs : "..\..\..\UnitTest\TestData\TileService\UT_Parcels.fs"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\TileService\UT_Parcels.fs" xcopy /r /d /y "..\..\..\UnitTest\TestData\TileService\UT_Parcels.fs" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_Parcels.ldf : "..\..\..\UnitTest\TestData\TileService\UT_Parcels.ldf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\TileService\UT_Parcels.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\TileService\UT_Parcels.ldf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_Parcels.sdf : "..\..\..\UnitTest\TestData\TileService\UT_Parcels.sdf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\TileService\UT_Parcels.sdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\TileService\UT_Parcels.sdf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_RoadCenterLines.fs : "..\..\..\UnitTest\TestData\TileService\UT_RoadCenterLines.fs"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\TileService\UT_RoadCenterLines.fs" xcopy /r /d /y "..\..\..\UnitTest\TestData\TileService\UT_RoadCenterLines.fs" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_RoadCenterLines.ldf : "..\..\..\UnitTest\TestData\TileService\UT_RoadCenterLines.ldf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\TileService\UT_RoadCenterLines.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\TileService\UT_RoadCenterLines.ldf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_RoadCenterLines.sdf : "..\..\..\UnitTest\TestData\TileService\UT_RoadCenterLines.sdf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\TileService\UT_RoadCenterLines.sdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\TileService\UT_RoadCenterLines.sdf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_VotingDistricts.fs : "..\..\..\UnitTest\TestData\TileService\UT_VotingDistricts.fs"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\TileService\UT_VotingDistricts.fs" xcopy /r /d /y "..\..\..\UnitTest\TestData\TileService\UT_VotingDistricts.fs" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_VotingDistricts.ldf : "..\..\..\UnitTest\TestData\TileService\UT_VotingDistricts.ldf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\TileService\UT_VotingDistricts.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\TileService\UT_VotingDistricts.ldf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_VotingDistrictsFunctions.ldf : "..\..\..\UnitTest\TestData\TileService\UT_VotingDistrictsFunctions.ldf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\TileService\UT_VotingDistrictsFunctions.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\TileService\UT_VotingDistrictsFunctions.ldf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_VotingDistricts.sdf : "..\..\..\UnitTest\TestData\TileService\UT_VotingDistricts.sdf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\TileService\UT_VotingDistricts.sdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\TileService\UT_VotingDistricts.sdf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\1.1.1.mgd : "..\..\..\UnitTest\TestData\ServerAdmin\1.1.1.mgd"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\ServerAdmin\1.1.1.mgd" xcopy /r /d /y "..\..\..\UnitTest\TestData\ServerAdmin\1.1.1.mgd" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\epsgcodes.txt : "..\..\..\UnitTest\TestData\CoordinateSystems\epsgcodes.txt"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\CoordinateSystems\epsgcodes.txt" xcopy /r /d /y "..\..\..\UnitTest\TestData\CoordinateSystems\epsgcodes.txt" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\ogcwkts.txt : "..\..\..\UnitTest\TestData\CoordinateSystems\ogcwkts.txt"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\CoordinateSystems\ogcwkts.txt" xcopy /r /d /y "..\..\..\UnitTest\TestData\CoordinateSystems\ogcwkts.txt" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_GetMapKmlResult.txt : "..\..\..\UnitTest\TestData\KmlService\UT_GetMapKmlResult.txt"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\KmlService\UT_GetMapKmlResult.txt" xcopy /r /d /y "..\..\..\UnitTest\TestData\KmlService\UT_GetMapKmlResult.txt" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_GetLayerKmlResult.txt : "..\..\..\UnitTest\TestData\KmlService\UT_GetLayerKmlResult.txt"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\KmlService\UT_GetLayerKmlResult.txt" xcopy /r /d /y "..\..\..\UnitTest\TestData\KmlService\UT_GetLayerKmlResult.txt" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_GetFeaturesKmlResult.txt : "..\..\..\UnitTest\TestData\KmlService\UT_GetFeaturesKmlResult.txt"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\KmlService\UT_GetFeaturesKmlResult.txt" xcopy /r /d /y "..\..\..\UnitTest\TestData\KmlService\UT_GetFeaturesKmlResult.txt" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\MdfTestMap.mdf : "..\..\..\UnitTest\TestData\MdfModel\MdfTestMap.mdf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\MdfModel\MdfTestMap.mdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MdfModel\MdfTestMap.mdf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\MdfTestTypeStyles.ldf : "..\..\..\UnitTest\TestData\MdfModel\MdfTestTypeStyles.ldf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\MdfModel\MdfTestTypeStyles.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MdfModel\MdfTestTypeStyles.ldf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\MdfTestCompoundSymbol.sd : "..\..\..\UnitTest\TestData\MdfModel\MdfTestCompoundSymbol.sd"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\MdfModel\MdfTestCompoundSymbol.sd" xcopy /r /d /y "..\..\..\UnitTest\TestData\MdfModel\MdfTestCompoundSymbol.sd" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\MdfTestSimpleSymbol.sd : "..\..\..\UnitTest\TestData\MdfModel\MdfTestSimpleSymbol.sd"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\MdfModel\MdfTestSimpleSymbol.sd" xcopy /r /d /y "..\..\..\UnitTest\TestData\MdfModel\MdfTestSimpleSymbol.sd" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\areasymbol.sd : "..\..\..\UnitTest\TestData\Symbology\areasymbol.sd"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\Symbology\areasymbol.sd" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\areasymbol.sd" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\linesymbol.sd : "..\..\..\UnitTest\TestData\Symbology\linesymbol.sd"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\Symbology\linesymbol.sd" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\linesymbol.sd" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\symbol.sd : "..\..\..\UnitTest\TestData\Symbology\symbol.sd"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\Symbology\symbol.sd" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\symbol.sd" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\symbolp.sd : "..\..\..\UnitTest\TestData\Symbology\symbolp.sd"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\Symbology\symbolp.sd" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\symbolp.sd" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\MTYP1500a.sd : "..\..\..\UnitTest\TestData\Symbology\MTYP1500a.sd"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\Symbology\MTYP1500a.sd" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\MTYP1500a.sd" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_SymbologyLines.fs : "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLines.fs"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLines.fs" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLines.fs" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_SymbologyLines.ldf : "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLines.ldf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLines.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLines.ldf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_SymbologyLines.mdf : "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLines.mdf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLines.mdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLines.mdf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_SymbologyLines.sdf : "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLines.sdf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLines.sdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLines.sdf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.ldf : "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLinesCrossTick.ldf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLinesCrossTick.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLinesCrossTick.ldf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_SymbologyLinesCrossTick.mdf : "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLinesCrossTick.mdf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLinesCrossTick.mdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLinesCrossTick.mdf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_SymbologyPoints.fs : "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPoints.fs"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPoints.fs" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPoints.fs" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_SymbologyPoints.ldf : "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPoints.ldf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPoints.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPoints.ldf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_SymbologyPoints.mdf : "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPoints.mdf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPoints.mdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPoints.mdf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_SymbologyPoints.sdf : "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPoints.sdf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPoints.sdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPoints.sdf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.ldf : "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPointsParam.ldf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPointsParam.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPointsParam.ldf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_SymbologyPointsParam.mdf : "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPointsParam.mdf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPointsParam.mdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPointsParam.mdf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_SymbologyRoads.fs : "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyRoads.fs"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyRoads.fs" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyRoads.fs" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_SymbologyRoads.ldf : "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyRoads.ldf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyRoads.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyRoads.ldf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_SymbologyRoads.mdf : "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyRoads.mdf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyRoads.mdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyRoads.mdf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_SymbologyRoads.sdf : "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyRoads.sdf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyRoads.sdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyRoads.sdf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_SymbologyParcels.ldf : "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyParcels.ldf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyParcels.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyParcels.ldf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_SymbologyPolygons.mdf : "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPolygons.mdf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPolygons.mdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPolygons.mdf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_Annotation1.ldf : "..\..\..\UnitTest\TestData\Symbology\UT_Annotation1.ldf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_Annotation1.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_Annotation1.ldf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_Annotation1.mdf : "..\..\..\UnitTest\TestData\Symbology\UT_Annotation1.mdf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_Annotation1.mdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_Annotation1.mdf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_Annotation2.ldf : "..\..\..\UnitTest\TestData\Symbology\UT_Annotation2.ldf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_Annotation2.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_Annotation2.ldf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_Annotation2.mdf : "..\..\..\UnitTest\TestData\Symbology\UT_Annotation2.mdf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_Annotation2.mdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_Annotation2.mdf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_Annotation3.ldf : "..\..\..\UnitTest\TestData\Symbology\UT_Annotation3.ldf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_Annotation3.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_Annotation3.ldf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_Annotation3.mdf : "..\..\..\UnitTest\TestData\Symbology\UT_Annotation3.mdf"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_Annotation3.mdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_Annotation3.mdf" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\SavePointTest.sqlite : "..\..\..\UnitTest\TestData\FeatureService\SQLite\SavePointTest.sqlite"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\FeatureService\SQLite\SavePointTest.sqlite" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SQLite\SavePointTest.sqlite" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\SavePointTest.FeatureSource : "..\..\..\UnitTest\TestData\FeatureService\SQLite\SavePointTest.FeatureSource"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\FeatureService\SQLite\SavePointTest.FeatureSource" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SQLite\SavePointTest.FeatureSource" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_Parcels_SQLite_Join.FeatureSource : "..\..\..\UnitTest\TestData\FeatureService\SQLite\UT_Parcels_SQLite_Join.FeatureSource"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\FeatureService\SQLite\UT_Parcels_SQLite_Join.FeatureSource" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SQLite\UT_Parcels_SQLite_Join.FeatureSource" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\UT_FdoJoin.FeatureSource : "..\..\..\UnitTest\TestData\FeatureService\SQLite\UT_FdoJoin.FeatureSource"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\FeatureService\SQLite\UT_FdoJoin.FeatureSource" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SQLite\UT_FdoJoin.FeatureSource" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\ParcelsJoinTest.sqlite : "..\..\..\UnitTest\TestData\FeatureService\SQLite\ParcelsJoinTest.sqlite"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\FeatureService\SQLite\ParcelsJoinTest.sqlite" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SQLite\ParcelsJoinTest.sqlite" ..\..\bin\UnitTestFiles\
-
-..\..\bin\UnitTestFiles\JoinTest.sqlite : "..\..\..\UnitTest\TestData\FeatureService\SQLite\JoinTest.sqlite"
- if NOT EXIST ..\..\bin\UnitTestFiles\nul mkdir ..\..\bin\UnitTestFiles
- if EXIST "..\..\..\UnitTest\TestData\FeatureService\SQLite\JoinTest.sqlite" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SQLite\JoinTest.sqlite" ..\..\bin\UnitTestFiles\
+ if EXIST "..\..\..\UnitTest\TestData\ResourceService\LibraryRepositoryContent.xml" xcopy /r /d /y "..\..\..\UnitTest\TestData\ResourceService\LibraryRepositoryContent.xml" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\ResourceService\SampleRepositoryHeader.xml" xcopy /r /d /y "..\..\..\UnitTest\TestData\ResourceService\SampleRepositoryHeader.xml" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\ResourceService\SampleRepositoryContent.xml" xcopy /r /d /y "..\..\..\UnitTest\TestData\ResourceService\SampleRepositoryContent.xml" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\ResourceService\Shuttle.zip" xcopy /r /d /y "..\..\..\UnitTest\TestData\ResourceService\Shuttle.zip" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\DrawingService\test.dwf" xcopy /r /d /y "..\..\..\UnitTest\TestData\DrawingService\test.dwf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\DrawingService\SpaceShip.dwf" xcopy /r /d /y "..\..\..\UnitTest\TestData\DrawingService\SpaceShip.dwf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\DrawingService\MapGuideDrawingSource.xml" xcopy /r /d /y "..\..\..\UnitTest\TestData\DrawingService\MapGuideDrawingSource.xml" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\DrawingService\SpaceShipDrawingSource.xml" xcopy /r /d /y "..\..\..\UnitTest\TestData\DrawingService\SpaceShipDrawingSource.xml" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\ResourceService\Shuttle.zip" copy /y "..\..\..\UnitTest\TestData\ResourceService\Shuttle.zip" "..\..\bin\UnitTestFiles\"World.mgp
+ if EXIST "..\..\..\UnitTest\TestData\ResourceService\World_Countries.sdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\ResourceService\World_Countries.sdf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\ResourceService\TEST.LayerDefinition" xcopy /r /d /y "..\..\..\UnitTest\TestData\ResourceService\TEST.LayerDefinition" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\FeatureService\SDF\TEST.FeatureSource" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SDF\TEST.FeatureSource" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\FeatureService\SDF\TEST.sdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SDF\TEST.sdf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_Parcels.FeatureSource" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_Parcels.FeatureSource" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_Parcels.sdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_Parcels.sdf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_BuildingOutlines.FeatureSource" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_BuildingOutlines.FeatureSource" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_BuildingOutlines.sdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_BuildingOutlines.sdf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_VotingDistricts.FeatureSource" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_VotingDistricts.FeatureSource" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_VotingDistricts.sdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SDF\Sheboygan_VotingDistricts.sdf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\FeatureService\SDF\TESTChainedInner1ToManyJoin.FeatureSource" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SDF\TESTChainedInner1ToManyJoin.FeatureSource" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\FeatureService\SDF\Empty.FeatureSource" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SDF\Empty.FeatureSource" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\FeatureService\SDF\Empty.sdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SDF\Empty.sdf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\FeatureService\SHP\Redding_Parcels.FeatureSource" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SHP\Redding_Parcels.FeatureSource" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\FeatureService\SHP\Redding_Parcels.shp" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SHP\Redding_Parcels.shp" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\FeatureService\SHP\Redding_Parcels.dbf" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SHP\Redding_Parcels.dbf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\FeatureService\SHP\Redding_Parcels.shx" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SHP\Redding_Parcels.shx" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_AllElements.pl" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_AllElements.pl" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_NoLegend.pl" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_NoLegend.pl" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_SymbolMart.sl" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_SymbolMart.sl" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_Symbols.dwf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_Symbols.dwf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_SheboyganWithWatermark.mdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_SheboyganWithWatermark.mdf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_PoweredByMapGuide.wdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_PoweredByMapGuide.wdf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_Sheboygan.mdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_Sheboygan.mdf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_Sheboygan_833.mdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_Sheboygan_833.mdf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_HydrographicPolygons.sdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_HydrographicPolygons.sdf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_HydrographicPolygons.fs" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_HydrographicPolygons.fs" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_HydrographicPolygons.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_HydrographicPolygons.ldf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_Rail.sdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_Rail.sdf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_Rail.fs" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_Rail.fs" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_Rail.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_Rail.ldf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_Rail.wdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_Rail.wdf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_Rail_Watermark.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_Rail_Watermark.ldf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_MultiCTS.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_MultiCTS.ldf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_MultiCTSWithTheme.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_MultiCTSWithTheme.ldf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_MultiFTS.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_MultiFTS.ldf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_MultiFTSSingleCTS.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_MultiFTSSingleCTS.ldf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_MultiFTSWithTheme.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_MultiFTSWithTheme.ldf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_SingleFTSMultiCTS.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_SingleFTSMultiCTS.ldf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\MappingService\UT_RotatedPointStyles.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MappingService\UT_RotatedPointStyles.ldf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\TileService\UT_BaseMap.mdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\TileService\UT_BaseMap.mdf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\TileService\UT_BaseMap.tsd" xcopy /r /d /y "..\..\..\UnitTest\TestData\TileService\UT_BaseMap.tsd" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\TileService\UT_XYZ.tsd" xcopy /r /d /y "..\..\..\UnitTest\TestData\TileService\UT_XYZ.tsd" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\TileService\UT_LinkedTileSet.mdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\TileService\UT_LinkedTileSet.mdf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\TileService\UT_StylizationFuncs.mdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\TileService\UT_StylizationFuncs.mdf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\TileService\UT_Parcels.fs" xcopy /r /d /y "..\..\..\UnitTest\TestData\TileService\UT_Parcels.fs" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\TileService\UT_Parcels.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\TileService\UT_Parcels.ldf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\TileService\UT_Parcels.sdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\TileService\UT_Parcels.sdf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\TileService\UT_RoadCenterLines.fs" xcopy /r /d /y "..\..\..\UnitTest\TestData\TileService\UT_RoadCenterLines.fs" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\TileService\UT_RoadCenterLines.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\TileService\UT_RoadCenterLines.ldf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\TileService\UT_RoadCenterLines.sdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\TileService\UT_RoadCenterLines.sdf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\TileService\UT_VotingDistricts.fs" xcopy /r /d /y "..\..\..\UnitTest\TestData\TileService\UT_VotingDistricts.fs" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\TileService\UT_VotingDistricts.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\TileService\UT_VotingDistricts.ldf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\TileService\UT_VotingDistrictsFunctions.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\TileService\UT_VotingDistrictsFunctions.ldf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\TileService\UT_VotingDistricts.sdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\TileService\UT_VotingDistricts.sdf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\ServerAdmin\1.1.1.mgd" xcopy /r /d /y "..\..\..\UnitTest\TestData\ServerAdmin\1.1.1.mgd" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\CoordinateSystems\epsgcodes.txt" xcopy /r /d /y "..\..\..\UnitTest\TestData\CoordinateSystems\epsgcodes.txt" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\CoordinateSystems\ogcwkts.txt" xcopy /r /d /y "..\..\..\UnitTest\TestData\CoordinateSystems\ogcwkts.txt" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\KmlService\UT_GetMapKmlResult.txt" xcopy /r /d /y "..\..\..\UnitTest\TestData\KmlService\UT_GetMapKmlResult.txt" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\KmlService\UT_GetLayerKmlResult.txt" xcopy /r /d /y "..\..\..\UnitTest\TestData\KmlService\UT_GetLayerKmlResult.txt" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\KmlService\UT_GetFeaturesKmlResult.txt" xcopy /r /d /y "..\..\..\UnitTest\TestData\KmlService\UT_GetFeaturesKmlResult.txt" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\MdfModel\MdfTestMap.mdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MdfModel\MdfTestMap.mdf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\MdfModel\MdfTestTypeStyles.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\MdfModel\MdfTestTypeStyles.ldf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\MdfModel\MdfTestCompoundSymbol.sd" xcopy /r /d /y "..\..\..\UnitTest\TestData\MdfModel\MdfTestCompoundSymbol.sd" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\MdfModel\MdfTestSimpleSymbol.sd" xcopy /r /d /y "..\..\..\UnitTest\TestData\MdfModel\MdfTestSimpleSymbol.sd" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\Symbology\areasymbol.sd" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\areasymbol.sd" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\Symbology\linesymbol.sd" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\linesymbol.sd" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\Symbology\symbol.sd" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\symbol.sd" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\Symbology\symbolp.sd" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\symbolp.sd" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\Symbology\MTYP1500a.sd" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\MTYP1500a.sd" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLines.fs" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLines.fs" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLines.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLines.ldf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLines.mdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLines.mdf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLines.sdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLines.sdf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLinesCrossTick.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLinesCrossTick.ldf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLinesCrossTick.mdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyLinesCrossTick.mdf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPoints.fs" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPoints.fs" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPoints.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPoints.ldf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPoints.mdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPoints.mdf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPoints.sdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPoints.sdf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPointsParam.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPointsParam.ldf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPointsParam.mdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPointsParam.mdf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyRoads.fs" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyRoads.fs" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyRoads.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyRoads.ldf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyRoads.mdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyRoads.mdf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyRoads.sdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyRoads.sdf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyParcels.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyParcels.ldf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPolygons.mdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_SymbologyPolygons.mdf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_Annotation1.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_Annotation1.ldf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_Annotation1.mdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_Annotation1.mdf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_Annotation2.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_Annotation2.ldf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_Annotation2.mdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_Annotation2.mdf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_Annotation3.ldf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_Annotation3.ldf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\Symbology\UT_Annotation3.mdf" xcopy /r /d /y "..\..\..\UnitTest\TestData\Symbology\UT_Annotation3.mdf" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\FeatureService\SQLite\SavePointTest.sqlite" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SQLite\SavePointTest.sqlite" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\FeatureService\SQLite\SavePointTest.FeatureSource" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SQLite\SavePointTest.FeatureSource" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\FeatureService\SQLite\UT_Parcels_SQLite_Join.FeatureSource" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SQLite\UT_Parcels_SQLite_Join.FeatureSource" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\FeatureService\SQLite\UT_FdoJoin.FeatureSource" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SQLite\UT_FdoJoin.FeatureSource" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\FeatureService\SQLite\ParcelsJoinTest.sqlite" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SQLite\ParcelsJoinTest.sqlite" "..\..\bin\UnitTestFiles\"
+ if EXIST "..\..\..\UnitTest\TestData\FeatureService\SQLite\JoinTest.sqlite" xcopy /r /d /y "..\..\..\UnitTest\TestData\FeatureService\SQLite\JoinTest.sqlite" "..\..\bin\UnitTestFiles\"
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Drawing/Makefile.am
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Drawing/Makefile.am 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Drawing/Makefile.am 2015-10-19 10:53:12 UTC (rev 8789)
@@ -5,15 +5,15 @@
prefix=@prefix@/server
INCLUDES = \
- -I../../../../Oem/ACE/ACE_wrappers \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
-I../../../../Common/MdfModel \
-I../../../../Common/Foundation \
-I../../../../Common/Geometry \
-I../../../../Common/PlatformBase \
-I../../../../Common/MapGuideCommon \
- -I../../../../Oem/DWFTK/develop/global/src \
- -I../../../../Oem/DWFTK/develop/global/src/dwf \
- -I../../../../Oem/dbxml/xerces-c-src/src \
+ -I$(mg_oem_dwftk_src)/develop/global/src \
+ -I$(mg_oem_dwftk_src)/develop/global/src/dwf \
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src \
-I../../Common \
-I../../Common/Base \
-I../../Common/Manager \
@@ -67,7 +67,7 @@
libMgServerDrawingService_la_LIBADD = -lMgFoundation -lMgGeometry -lMgPlatformBase -lMgMapGuideCommon -lxerces-c
libMgServerDrawingService_la_LDFLAGS = -release $(PACKAGE_VERSION) \
- -L../../../../Oem/dbxml/install/lib \
+ -L$(mg_oem_dbxml_src)/install/lib \
-L../../../../Common/Foundation \
-L../../../../Common/Geometry \
-L../../../../Common/PlatformBase \
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Drawing/ServerDrawingService.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Drawing/ServerDrawingService.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Drawing/ServerDrawingService.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Resource;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\DWFTK\develop\global\src;..\..\..\..\Oem\DWFTK\develop\global\src\dwf;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Resource;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_DWFTK_INC_DIR)\dwf;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_DRAWING_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -104,9 +104,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;xerces-c_3mgD.lib;dwfcore_wt.1.7.0.lib;dwftk_wt.7.7.0.lib;w3dtk_wt.1.7.1555.lib;whiptk_wt.7.13.601.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);$(MG_OEM_DWFTK_LIBS_DRAWING_SVC);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerDrawingServiced.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\..\Oem\dbxml\lib\$(Configuration);..\..\..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration)\vc10.0;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);$(MG_OEM_DWFTK_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerDrawingServiced.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -120,7 +120,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Resource;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\DWFTK\develop\global\src;..\..\..\..\Oem\DWFTK\develop\global\src\dwf;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Resource;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_DWFTK_INC_DIR)\dwf;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_DRAWING_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -130,9 +130,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;xerces-c_3mgD.lib;dwfcore_wt.1.7.0.lib;dwftk_wt.7.7.0.lib;w3dtk_wt.1.7.1555.lib;whiptk_wt.7.13.601.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);$(MG_OEM_DWFTK_LIBS_DRAWING_SVC);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerDrawingServiced.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\..\Oem\dbxml\lib64\$(Configuration);..\..\..\..\Oem\DWFTK\develop\global\lib\x64\static\$(Configuration)\vc10.0;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);$(MG_OEM_DWFTK_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerDrawingServiced.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -146,7 +146,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Resource;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\DWFTK\develop\global\src;..\..\..\..\Oem\DWFTK\develop\global\src\dwf;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Resource;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_DWFTK_INC_DIR)\dwf;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_DRAWING_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -155,9 +155,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;xerces-c_3mg.lib;dwfcore_wt.1.7.0.lib;dwftk_wt.7.7.0.lib;w3dtk_wt.1.7.1555.lib;whiptk_wt.7.13.601.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);$(MG_OEM_DWFTK_LIBS_DRAWING_SVC);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerDrawingService.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\..\Oem\dbxml\lib\$(Configuration);..\..\..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration)\vc10.0;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);$(MG_OEM_DWFTK_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerDrawingService.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -173,7 +173,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Resource;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\DWFTK\develop\global\src;..\..\..\..\Oem\DWFTK\develop\global\src\dwf;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Resource;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_DWFTK_INC_DIR)\dwf;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_DRAWING_EXPORTS;DWFCORE_STATIC;DWFTK_STATIC;DWFTK_USE_DWFCORE_ZLIB;DWFTK_BUILD_EXPAT;WHIP_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -182,9 +182,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;xerces-c_3mg.lib;dwfcore_wt.1.7.0.lib;dwftk_wt.7.7.0.lib;w3dtk_wt.1.7.1555.lib;whiptk_wt.7.13.601.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);$(MG_OEM_DWFTK_LIBS_DRAWING_SVC);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerDrawingService.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\..\Oem\dbxml\lib64\$(Configuration);..\..\..\..\Oem\DWFTK\develop\global\lib\x64\static\$(Configuration)\vc10.0;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);$(MG_OEM_DWFTK_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerDrawingService.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Feature/Makefile.am
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Feature/Makefile.am 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Feature/Makefile.am 2015-10-19 10:53:12 UTC (rev 8789)
@@ -7,8 +7,8 @@
INCLUDES = \
-I$(map_fdo_include) \
-I$(map_fdo_include)/ExpressionEngine \
- -I../../../../Oem/ACE/ACE_wrappers \
- -I../../../../Oem/dbxml/xerces-c-src/src \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src \
-I../../Gws/Include \
-I../../Gws/GwsCommon/inc \
-I../../Gws/GwsQueryEngine/inc \
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Feature/ServerFeatureService.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Feature/ServerFeatureService.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Feature/ServerFeatureService.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\..\Gws\Include;..\..\Gws\GwsCommon\inc;..\..\Gws\GwsQueryEngine\inc;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\..\Gws\Include;..\..\Gws\GwsCommon\inc;..\..\Gws\GwsQueryEngine\inc;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Common\Stylization;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_FEATURE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -104,9 +104,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;xerces-c_3mgD.lib;FDO.lib;FDOCommon.lib;FDOGeometry.lib;ExpressionEngine.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);FDO.lib;FDOCommon.lib;FDOGeometry.lib;ExpressionEngine.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerFeatureServiced.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\..\Oem\dbxml\lib\$(Configuration);..\..\..\..\Oem\FDO\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;FDOGeometry.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerFeatureServiced.pdb</ProgramDatabaseFile>
@@ -123,7 +123,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\..\Gws\Include;..\..\Gws\GwsCommon\inc;..\..\Gws\GwsQueryEngine\inc;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\..\Gws\Include;..\..\Gws\GwsCommon\inc;..\..\Gws\GwsQueryEngine\inc;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Common\Stylization;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_FEATURE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -133,9 +133,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;xerces-c_3mgD.lib;FDO.lib;FDOCommon.lib;FDOGeometry.lib;ExpressionEngine.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);FDO.lib;FDOCommon.lib;FDOGeometry.lib;ExpressionEngine.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerFeatureServiced.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\..\Oem\dbxml\lib64\$(Configuration);..\..\..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;FDOGeometry.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerFeatureServiced.pdb</ProgramDatabaseFile>
@@ -152,7 +152,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\..\Gws\Include;..\..\Gws\GwsCommon\inc;..\..\Gws\GwsQueryEngine\inc;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\..\Gws\Include;..\..\Gws\GwsCommon\inc;..\..\Gws\GwsQueryEngine\inc;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Common\Stylization;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_FEATURE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -161,9 +161,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;xerces-c_3mg.lib;FDO.lib;FDOCommon.lib;FDOGeometry.lib;ExpressionEngine.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);FDO.lib;FDOCommon.lib;FDOGeometry.lib;ExpressionEngine.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerFeatureService.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\..\Oem\dbxml\lib\$(Configuration);..\..\..\..\Oem\FDO\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;FDOGeometry.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerFeatureService.pdb</ProgramDatabaseFile>
@@ -183,7 +183,7 @@
<ClCompile>
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\..\Gws\Include;..\..\Gws\GwsCommon\inc;..\..\Gws\GwsQueryEngine\inc;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\..\Gws\Include;..\..\Gws\GwsCommon\inc;..\..\Gws\GwsQueryEngine\inc;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Common\Stylization;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_FEATURE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -192,9 +192,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;xerces-c_3mg.lib;FDO.lib;FDOCommon.lib;FDOGeometry.lib;ExpressionEngine.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);FDO.lib;FDOCommon.lib;FDOGeometry.lib;ExpressionEngine.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerFeatureService.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\..\Oem\dbxml\lib64\$(Configuration);..\..\..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;FDOGeometry.dll;ExpressionEngine.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerFeatureService.pdb</ProgramDatabaseFile>
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Kml/Makefile.am
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Kml/Makefile.am 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Kml/Makefile.am 2015-10-19 10:53:12 UTC (rev 8789)
@@ -5,9 +5,9 @@
prefix=@prefix@/server
INCLUDES = \
- -I../../../../Oem/ACE/ACE_wrappers \
- -I../../../../Oem/dbxml/xerces-c-src/src \
- -I../../../../Oem/DWFTK/develop/global/src \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src \
+ -I$(mg_oem_dwftk_src)/develop/global/src \
-I../../../../Common/Foundation \
-I../../../../Common/Geometry \
-I../../../../Common/PlatformBase \
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Kml/ServerKmlService.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Kml/ServerKmlService.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Kml/ServerKmlService.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfParser;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\DWFTK\develop\global\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfParser;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_KML_EXPORTS;DWFCORE_STATIC;DWFTK_USE_DWFCORE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -104,9 +104,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;dwfcore_wt.1.7.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_DWFTK_LIBS_KML_SVC);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerKmlServiced.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration)\vc10.0;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_DWFTK_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerKmlServiced.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -120,7 +120,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfParser;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\DWFTK\develop\global\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfParser;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_KML_EXPORTS;DWFCORE_STATIC;DWFTK_USE_DWFCORE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -130,9 +130,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;dwfcore_wt.1.7.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_DWFTK_LIBS_KML_SVC);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerKmlServiced.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\..\Oem\DWFTK\develop\global\lib\x64\static\$(Configuration)\vc10.0;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_DWFTK_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerKmlServiced.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -146,7 +146,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfParser;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\DWFTK\develop\global\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfParser;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_KML_EXPORTS;DWFCORE_STATIC;DWFTK_USE_DWFCORE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -155,9 +155,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;dwfcore_wt.1.7.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_DWFTK_LIBS_KML_SVC);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerKmlService.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration)\vc10.0;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_DWFTK_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerKmlService.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -173,7 +173,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfParser;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\DWFTK\develop\global\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfParser;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_KML_EXPORTS;DWFCORE_STATIC;DWFTK_USE_DWFCORE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -182,9 +182,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;dwfcore_wt.1.7.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_DWFTK_LIBS_KML_SVC);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerKmlService.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\..\Oem\DWFTK\develop\global\lib\x64\static\$(Configuration)\vc10.0;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_DWFTK_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerKmlService.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Mapping/Makefile.am
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Mapping/Makefile.am 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Mapping/Makefile.am 2015-10-19 10:53:12 UTC (rev 8789)
@@ -5,7 +5,7 @@
prefix=@prefix@/server
INCLUDES = \
- -I../../../../Oem/ACE/ACE_wrappers \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
-I../../../../Common/Stylization \
-I../../../../Common/Renderers \
-I../../Common \
@@ -16,7 +16,7 @@
-I../../../../Common/MdfParser \
-I$(map_fdo_include) \
-I$(map_fdo_include)/ExpressionEngine \
- -I../../../../Oem/dbxml/xerces-c-src/src \
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src \
-I../../../../Common/CoordinateSystem \
-I../../../../Common/Foundation \
-I../../../../Common/Geometry \
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Mapping/ServerMappingService.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Mapping/ServerMappingService.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Mapping/ServerMappingService.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\Feature;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;..\..\Gws\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;..\..\Gws\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_MAPPING_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -104,9 +104,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;xerces-c_3mgD.lib;FDO.lib;FDOCommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);FDO.lib;FDOCommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerMappingServiced.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\..\Oem\dbxml\lib\$(Configuration);..\..\..\..\Oem\FDO\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerMappingServiced.pdb</ProgramDatabaseFile>
@@ -121,7 +121,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\Feature;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;..\..\Gws\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;..\..\Gws\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_MAPPING_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -131,9 +131,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;xerces-c_3mgD.lib;FDO.lib;FDOCommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);FDO.lib;FDOCommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerMappingServiced.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\..\Oem\dbxml\lib64\$(Configuration);..\..\..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerMappingServiced.pdb</ProgramDatabaseFile>
@@ -148,7 +148,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\Feature;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;..\..\Gws\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;..\..\Gws\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_MAPPING_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -157,9 +157,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;xerces-c_3mg.lib;FDO.lib;FDOCommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);FDO.lib;FDOCommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerMappingService.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\..\Oem\dbxml\lib\$(Configuration);..\..\..\..\Oem\FDO\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerMappingService.pdb</ProgramDatabaseFile>
@@ -176,7 +176,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\Feature;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;..\..\Gws\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;..\..\Gws\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_MAPPING_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,9 +185,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;xerces-c_3mg.lib;FDO.lib;FDOCommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);FDO.lib;FDOCommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerMappingService.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\..\Oem\dbxml\lib64\$(Configuration);..\..\..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>FDO.dll;FDOCommon.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerMappingService.pdb</ProgramDatabaseFile>
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Profiling/Makefile.am
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Profiling/Makefile.am 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Profiling/Makefile.am 2015-10-19 10:53:12 UTC (rev 8789)
@@ -5,8 +5,8 @@
prefix=@prefix@/server
INCLUDES = \
- -I../../../../Oem/ACE/ACE_wrappers \
- -I../../../../Oem/dbxml/xerces-c-src/src \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src \
-I../../../../Common/Foundation \
-I../../../../Common/Geometry \
-I../../../../Common/PlatformBase \
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Profiling/ServerProfilingService.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Profiling/ServerProfilingService.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Profiling/ServerProfilingService.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfParser;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\DWFTK7.1\develop\global\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfParser;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_PROFILING_EXPORTS;DWFCORE_STATIC;DWFTK_USE_DWFCORE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -104,9 +104,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerProfilingServiced.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerProfilingServiced.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -120,7 +120,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfParser;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfParser;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_PROFILING_EXPORTS;DWFCORE_STATIC;DWFTK_USE_DWFCORE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -130,9 +130,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerProfilingServiced.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerProfilingServiced.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -146,7 +146,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfParser;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\DWFTK7.1\develop\global\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfParser;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_PROFILING_EXPORTS;DWFCORE_STATIC;DWFTK_USE_DWFCORE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -155,9 +155,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerProfilingService.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerProfilingService.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -173,7 +173,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfParser;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\DWFTK7.1\develop\global\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfParser;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_PROFILING_EXPORTS;DWFCORE_STATIC;DWFTK_USE_DWFCORE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -182,9 +182,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerProfilingService.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerProfilingService.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Rendering/Makefile.am
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Rendering/Makefile.am 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Rendering/Makefile.am 2015-10-19 10:53:12 UTC (rev 8789)
@@ -7,8 +7,8 @@
INCLUDES = \
-I$(map_fdo_include) \
-I$(map_fdo_include)/ExpressionEngine \
- -I../../../../Oem/ACE/ACE_wrappers \
- -I../../../../Oem/dbxml/xerces-c-src/src \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src \
-I../../../../Common/Foundation \
-I../../../../Common/Geometry \
-I../../../../Common/PlatformBase \
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Rendering/ServerRenderingService.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Rendering/ServerRenderingService.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Rendering/ServerRenderingService.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\Feature;..\Mapping;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_RENDERING_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -104,9 +104,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerRenderingServiced.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerRenderingServiced.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -120,7 +120,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\Feature;..\Mapping;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_RENDERING_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -130,9 +130,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerRenderingServiced.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerRenderingServiced.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -146,7 +146,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\Feature;..\Mapping;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_RENDERING_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -155,9 +155,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerRenderingService.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerRenderingService.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -173,7 +173,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\Feature;..\Mapping;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Feature;..\Mapping;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\Renderers;..\..\..\..\Common\Stylization;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_FDO_INC_DIR)\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_RENDERING_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -182,9 +182,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerRenderingService.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerRenderingService.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Resource/Makefile.am
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Resource/Makefile.am 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Resource/Makefile.am 2015-10-19 10:53:12 UTC (rev 8789)
@@ -5,13 +5,13 @@
prefix=@prefix@/server
INCLUDES = \
- -I../../../../Oem/ACE/ACE_wrappers \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
-I$(map_fdo_include) \
- -I../../../../Oem/dbxml/xerces-c-src/src \
- -I../../../../Oem/dbxml/install/include \
- -I../../../../Oem/dbxml/dbxml/include \
- -I../../../../Oem/dbxml/dbxml/src \
- -I../../../../Oem/DWFTK/develop/global/src \
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src \
+ -I$(mg_oem_dbxml_src)/install/include \
+ -I$(mg_oem_dbxml_src)/dbxml/include \
+ -I$(mg_oem_dbxml_src)/dbxml/src \
+ -I$(mg_oem_dwftk_src)/develop/global/src \
-I../../../../Common/Security \
-I../../../../Common/Foundation \
-I../../../../Common/Geometry \
@@ -211,4 +211,4 @@
-L../../Common/Base \
-L../../Common/Cache \
-L../../Common/Manager \
- -L../../../../Oem/dbxml/install/lib
+ -L$(mg_oem_dbxml_src)/install/lib
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Resource/ServerResourceService.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Resource/ServerResourceService.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Resource/ServerResourceService.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\Feature;..\Site;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\dbxml\db-4.8.26\\build_windows;..\..\..\..\Oem\dbxml\dbxml\include;..\..\..\..\Oem\dbxml\dbxml\src;..\..\..\..\Oem\DWFTK\develop\global\src;..\..\..\..\Oem\FDO\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\Feature;..\Site;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_DBXML_INC_DIR);$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_FDO_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_RESOURCE_EXPORTS;DWFCORE_STATIC;DWFTK_USE_DWFCORE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -104,9 +104,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;xerces-c_3mgD.lib;libdb48d.lib;libdbxml25d.lib;dwfcore_wt.1.7.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);$(MG_OEM_DBXML_LIBS);$(MG_OEM_DWFTK_LIBS_RESOURCE_SVC);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerResourceServiced.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\..\Oem\dbxml\lib\$(Configuration);..\..\..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration)\vc10.0;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_DBXML_LIB_DIR);$(MG_OEM_DWFTK_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerResourceServiced.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -122,7 +122,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\Feature;..\Site;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\dbxml\db-4.8.26\\build_windows;..\..\..\..\Oem\dbxml\dbxml\include;..\..\..\..\Oem\dbxml\dbxml\src;..\..\..\..\Oem\DWFTK\develop\global\src;..\..\..\..\Oem\FDO\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\Feature;..\Site;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_DBXML_INC_DIR);$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_FDO_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_RESOURCE_EXPORTS;DWFCORE_STATIC;DWFTK_USE_DWFCORE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -132,9 +132,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;xerces-c_3mgD.lib;libdb48d.lib;libdbxml25d.lib;dwfcore_wt.1.7.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);$(MG_OEM_DBXML_LIBS);$(MG_OEM_DWFTK_LIBS_RESOURCE_SVC);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerResourceServiced.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\..\Oem\dbxml\lib64\$(Configuration);..\..\..\..\Oem\DWFTK\develop\global\lib\x64\static\$(Configuration)\vc10.0;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_DBXML_LIB_DIR);$(MG_OEM_DWFTK_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerResourceServiced.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -150,7 +150,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\Feature;..\Site;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\dbxml\db-4.8.26\\build_windows;..\..\..\..\Oem\dbxml\dbxml\include;..\..\..\..\Oem\dbxml\dbxml\src;..\..\..\..\Oem\DWFTK\develop\global\src;..\..\..\..\Oem\FDO\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\Feature;..\Site;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_DBXML_INC_DIR);$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_FDO_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_RESOURCE_EXPORTS;DWFCORE_STATIC;DWFTK_USE_DWFCORE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -159,9 +159,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;xerces-c_3mg.lib;libdb48.lib;libdbxml25.lib;dwfcore_wt.1.7.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);$(MG_OEM_DBXML_LIBS);$(MG_OEM_DWFTK_LIBS_RESOURCE_SVC);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerResourceService.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\..\Oem\dbxml\lib\$(Configuration);..\..\..\..\Oem\DWFTK\develop\global\lib\static\$(Configuration)\vc10.0;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_DBXML_LIB_DIR);$(MG_OEM_DWFTK_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerResourceService.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -179,7 +179,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\Feature;..\Site;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\..\Oem\dbxml\db-4.8.26\\build_windows;..\..\..\..\Oem\dbxml\dbxml\include;..\..\..\..\Oem\dbxml\dbxml\src;..\..\..\..\Oem\DWFTK\develop\global\src;..\..\..\..\Oem\FDO\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\Common;..\..\Common\Base;..\..\Common\Cache;..\..\Common\Manager;..\Feature;..\Site;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\..\..\Common\Security;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_DBXML_INC_DIR);$(MG_OEM_DWFTK_INC_DIR);$(MG_OEM_FDO_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_RESOURCE_EXPORTS;DWFCORE_STATIC;DWFTK_USE_DWFCORE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -188,9 +188,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;xerces-c_3mg.lib;libdb48.lib;libdbxml25.lib;dwfcore_wt.1.7.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);$(MG_OEM_DBXML_LIBS);$(MG_OEM_DWFTK_LIBS_RESOURCE_SVC);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerResourceService.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\..\Oem\dbxml\lib64\$(Configuration);..\..\..\..\Oem\DWFTK\develop\global\lib\x64\static\$(Configuration)\vc10.0;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_DBXML_LIB_DIR);$(MG_OEM_DWFTK_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerResourceService.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/Services/ServerAdmin/Makefile.am
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/Services/ServerAdmin/Makefile.am 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/Services/ServerAdmin/Makefile.am 2015-10-19 10:53:12 UTC (rev 8789)
@@ -5,7 +5,7 @@
prefix=@prefix@/server
INCLUDES = \
- -I../../../../Oem/ACE/ACE_wrappers \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
-I../../../../Common/MdfModel \
-I../../../../Common/Foundation \
-I../../../../Common/Geometry \
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/Services/ServerAdmin/ServerAdminService.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/Services/ServerAdmin/ServerAdminService.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/Services/ServerAdmin/ServerAdminService.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\..\..\..\Oem\ACE\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\Common;..\..\Common\Base;..\..\Common\Manager;$(MG_OEM_ACE_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_SERVERADMIN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -104,9 +104,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerAdminServiced.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerAdminServiced.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -120,7 +120,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\..\..\..\Oem\ACE\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\Common;..\..\Common\Base;..\..\Common\Manager;$(MG_OEM_ACE_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_SERVERADMIN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -130,9 +130,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerAdminServiced.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerAdminServiced.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -146,7 +146,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\..\..\..\Oem\ACE\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\Common;..\..\Common\Base;..\..\Common\Manager;$(MG_OEM_ACE_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_SERVERADMIN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -155,9 +155,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerAdminService.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerAdminService.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -173,7 +173,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\..\..\..\Oem\ACE\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\Common;..\..\Common\Base;..\..\Common\Manager;$(MG_OEM_ACE_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_SERVERADMIN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -182,9 +182,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerAdminService.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerAdminService.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Site/Makefile.am
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Site/Makefile.am 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Site/Makefile.am 2015-10-19 10:53:12 UTC (rev 8789)
@@ -11,8 +11,8 @@
-I../../../../Common/Geometry \
-I../../../../Common/PlatformBase \
-I../../../../Common/MapGuideCommon \
- -I../../../../Oem/ACE/ACE_wrappers \
- -I../../../../Oem/dbxml/xerces-c-src/src \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src \
-I../../Common \
-I../../Common/Base \
-I../../Common/Manager \
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Site/ServerSiteService.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Site/ServerSiteService.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Site/ServerSiteService.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\Security;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Resource;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\Security;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Resource;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_SITE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -104,9 +104,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;xerces-c_3mgD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerSiteServiced.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\..\Oem\dbxml\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerSiteServiced.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -122,7 +122,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\Security;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Resource;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\Security;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Resource;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_SITE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -132,9 +132,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;xerces-c_3mgD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerSiteServiced.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\..\Oem\dbxml\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerSiteServiced.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -150,7 +150,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\Security;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Resource;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\Security;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Resource;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_SITE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -159,9 +159,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;xerces-c_3mg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerSiteService.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\..\Oem\dbxml\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerSiteService.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -179,7 +179,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\Security;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Resource;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\Security;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Resource;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_SITE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -188,9 +188,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;xerces-c_3mg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerSiteService.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\..\Oem\dbxml\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerSiteService.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Tile/Makefile.am
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Tile/Makefile.am 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Tile/Makefile.am 2015-10-19 10:53:12 UTC (rev 8789)
@@ -5,8 +5,8 @@
prefix=@prefix@/server
INCLUDES = \
- -I../../../../Oem/ACE/ACE_wrappers \
- -I../../../../Oem/dbxml/xerces-c-src/src \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src \
-I../../../../Common/Foundation \
-I../../../../Common/Geometry \
-I../../../../Common/PlatformBase \
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Tile/ServerTileService.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Tile/ServerTileService.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/Services/Tile/ServerTileService.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Mapping;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Mapping;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_TILE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -104,9 +104,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;MgMdfModeld.lib;MgMdfParserd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);MgMdfModeld.lib;MgMdfParserd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerTileServiced.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\..\Common\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);..\..\..\..\Common\lib\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerTileServiced.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -120,7 +120,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Mapping;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Mapping;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_SERVER_TILE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -130,9 +130,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;MgMdfModeld.lib;MgMdfParserd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);MgMdfModeld.lib;MgMdfParserd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerTileServiced.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\..\Common\lib\Debug64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);..\..\..\..\Common\lib\Debug64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerTileServiced.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -146,7 +146,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Mapping;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Mapping;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_TILE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -155,9 +155,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;MgMdfModel.lib;MgMdfParser.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);MgMdfModel.lib;MgMdfParser.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerTileService.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\..\Common\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);..\..\..\..\Common\lib\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerTileService.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -173,7 +173,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Mapping;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Common\MdfModel;..\..\..\..\Common\MdfParser;..\..\Common;..\..\Common\Base;..\..\Common\Manager;..\Mapping;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_FDO_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_SERVER_TILE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -182,9 +182,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;MgMdfModel.lib;MgMdfParser.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);MgMdfModel.lib;MgMdfParser.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgServerTileService.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\..\Common\lib\Release64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);..\..\..\..\Common\lib\Release64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgServerTileService.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/UnitTesting/Makefile.am
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/UnitTesting/Makefile.am 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/UnitTesting/Makefile.am 2015-10-19 10:53:12 UTC (rev 8789)
@@ -5,9 +5,9 @@
prefix=@prefix@/server
INCLUDES = \
- -I../../../Oem/ACE/ACE_wrappers \
- -I../../../Oem/CppUnit-1.9.14/include \
- -I../../../Oem/dbxml/xerces-c-src/src \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
+ -I$(mg_oem_cppunit_src)/include \
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src \
-I../../../Common/Foundation \
-I../../../Common/Geometry \
-I../../../Common/PlatformBase \
@@ -78,4 +78,4 @@
libMgUnitTesting_la_LIBADD = -lcppunit
libMgUnitTesting_la_LDFLAGS = -rpath /createshared -release $(PACKAGE_VERSION) \
- -L../../../Oem/CppUnit-1.9.14/src/cppunit
+ -L$(mg_oem_cppunit_src)/src/cppunit/.libs
Modified: sandbox/jng/diet_vs2015/MgDev/Server/src/UnitTesting/UnitTesting.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Server/src/UnitTesting/UnitTesting.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Server/src/UnitTesting/UnitTesting.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\Common;..\Common\Cache;..\Common\Manager;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Stylization;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\CppUnit-1.9.14\include;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\FDO\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\Common;..\Common\Cache;..\Common\Manager;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Stylization;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_CPPUNIT_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -104,9 +104,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;cppunitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_CPPUNIT_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgUnitTestingd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\Oem\CppUnit-1.9.14\lib\$(Configuration);..\..\..\Oem\FDO\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_CPPUNIT_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgUnitTestingd.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -120,7 +120,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\Common;..\Common\Cache;..\Common\Manager;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Stylization;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\CppUnit-1.9.14\include;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\FDO\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\Common;..\Common\Cache;..\Common\Manager;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Stylization;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_CPPUNIT_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -130,9 +130,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;cppunitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_CPPUNIT_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgUnitTestingd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\CppUnit-1.9.14\lib64\$(Configuration);..\..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_CPPUNIT_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgUnitTestingd.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -146,7 +146,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\Common;..\Common\Cache;..\Common\Manager;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Stylization;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\CppUnit-1.9.14\include;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\FDO\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\Common;..\Common\Cache;..\Common\Manager;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Stylization;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_CPPUNIT_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -155,9 +155,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_CPPUNIT_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgUnitTesting.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\Oem\CppUnit-1.9.14\lib\$(Configuration);..\..\..\Oem\FDO\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_CPPUNIT_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgUnitTesting.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -173,7 +173,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\Common;..\Common\Cache;..\Common\Manager;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Stylization;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\CppUnit-1.9.14\include;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\FDO\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\Common;..\Common\Cache;..\Common\Manager;..\Services\Feature;..\Services\Kml;..\Services\Mapping;..\Services\Rendering;..\Services\Resource;..\Services\ServerAdmin;..\Services\Site;..\Services\Tile;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Common\MdfParser;..\..\..\Common\Stylization;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_CPPUNIT_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_FDO_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -182,9 +182,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_CPPUNIT_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgUnitTesting.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\CppUnit-1.9.14\lib64\$(Configuration);..\..\..\Oem\FDO\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_CPPUNIT_LIB_DIR);$(MG_OEM_FDO_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgUnitTesting.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: sandbox/jng/diet_vs2015/MgDev/Web/src/ApacheAgent/ApacheAgent.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Web/src/ApacheAgent/ApacheAgent.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Web/src/ApacheAgent/ApacheAgent.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -102,7 +102,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Oem\ACE\ACE_wrappers;$(HTTPD_SRC)\include;$(HTTPD_SRC)\srclib\apr\include;$(HTTPD_SRC)\srclib\apr-util\include;$(HTTPD_SRC)\os\win32;..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_ACE_INC_DIR);$(MG_OEM_HTTPD_ROOT)\include;$(MG_OEM_HTTPD_ROOT)\srclib\apr\include;$(MG_OEM_HTTPD_ROOT)\srclib\apr-util\include;$(MG_OEM_HTTPD_ROOT)\os\win32;..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;APACHEAGENT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -111,9 +111,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>libhttpd.lib;libapr-1.lib;libaprutil-1.lib;ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_HTTPD_LIBS);$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)mod_mgmapagent.so</OutputFile>
- <AdditionalLibraryDirectories>$(HTTPD_LIB);..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_HTTPD_LIB_DIR);$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)mod_mgmapagent.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -130,7 +130,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Oem\ACE\ACE_wrappers;$(HTTPD_SRC)\include;..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_ACE_INC_DIR);$(MG_OEM_HTTPD_ROOT)\include;..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;APACHEAGENT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -139,9 +139,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>libhttpd.lib;libapr-1.lib;libaprutil-1.lib;ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_HTTPD_LIBS);$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)mod_mgmapagent.so</OutputFile>
- <AdditionalLibraryDirectories>$(HTTPD_LIB);..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_HTTPD_LIB_DIR);$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)mod_mgmapagent.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -158,7 +158,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Oem\ACE\ACE_wrappers;$(HTTPD_SRC)\include;$(HTTPD_SRC)\srclib\apr\include;$(HTTPD_SRC)\srclib\apr-util\include;$(HTTPD_SRC)\os\win32;..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_ACE_INC_DIR);$(MG_OEM_HTTPD_ROOT)\include;$(MG_OEM_HTTPD_ROOT)\srclib\apr\include;$(MG_OEM_HTTPD_ROOT)\srclib\apr-util\include;$(MG_OEM_HTTPD_ROOT)\os\win32;..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;APACHEAGENT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -166,9 +166,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>libhttpd.lib;libapr-1.lib;libaprutil-1.lib;ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_HTTPD_LIBS);$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)mod_mgmapagent.so</OutputFile>
- <AdditionalLibraryDirectories>$(HTTPD_LIB);..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_HTTPD_LIB_DIR);$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)mod_mgmapagent.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -187,7 +187,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Oem\ACE\ACE_wrappers;$(HTTPD_SRC)\include;..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_ACE_INC_DIR);$(MG_OEM_HTTPD_ROOT)\include;..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;APACHEAGENT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -195,9 +195,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>libhttpd.lib;libapr-1.lib;libaprutil-1.lib;ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_HTTPD_LIBS);$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)mod_mgmapagent.so</OutputFile>
- <AdditionalLibraryDirectories>$(HTTPD_LIB);..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_HTTPD_LIB_DIR);$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)mod_mgmapagent.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: sandbox/jng/diet_vs2015/MgDev/Web/src/ApacheAgent/Makefile.am
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Web/src/ApacheAgent/Makefile.am 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Web/src/ApacheAgent/Makefile.am 2015-10-19 10:53:12 UTC (rev 8789)
@@ -9,7 +9,7 @@
-I../../../Common/PlatformBase \
-I../../../Common/MapGuideCommon \
-I../../../Common/MdfModel \
- -I../../../Oem/ACE/ACE_wrappers \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
-I$(httpd_src)/include \
-I$(httpd_src)/srclib/apr/include \
-I$(httpd_src)/srclib/apr-util/include \
@@ -47,8 +47,8 @@
-lMgWebSupport
mod_mgmapagent_la_LDFLAGS = -release $(PACKAGE_VERSION) \
- -L../../../Oem/ACE/ACE_wrappers/ace \
- -L../../../Oem/dbxml/install/lib \
+ -L$(mg_oem_ace_src)/ACE_wrappers/ace \
+ -L$(mg_oem_dbxml_src)/install/lib \
-L../../../Common/CoordinateSystem \
-L../../../Common/MdfModel \
-L../../../Common/MdfParser \
Modified: sandbox/jng/diet_vs2015/MgDev/Web/src/CgiAgent/CgiAgent.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Web/src/CgiAgent/CgiAgent.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Web/src/CgiAgent/CgiAgent.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\HttpHandler;..\WebSupport;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Oem\ACE\ACE_wrappers;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebSupport;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;$(MG_OEM_ACE_INC_DIR);..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -104,9 +104,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MapAgent.exe</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MapAgent.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
@@ -119,7 +119,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\HttpHandler;..\WebSupport;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Oem\ACE\ACE_wrappers;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebSupport;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;$(MG_OEM_ACE_INC_DIR);..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -129,9 +129,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MapAgent.exe</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MapAgent.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
@@ -144,7 +144,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\HttpHandler;..\WebSupport;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Oem\ACE\ACE_wrappers;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebSupport;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;$(MG_OEM_ACE_INC_DIR);..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -153,9 +153,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MapAgent.exe</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MapAgent.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
@@ -170,7 +170,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\HttpHandler;..\WebSupport;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;..\..\..\Oem\ACE\ACE_wrappers;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebSupport;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Common\MdfModel;$(MG_OEM_ACE_INC_DIR);..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -179,9 +179,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MapAgent.exe</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MapAgent.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
Modified: sandbox/jng/diet_vs2015/MgDev/Web/src/CgiAgent/Makefile.am
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Web/src/CgiAgent/Makefile.am 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Web/src/CgiAgent/Makefile.am 2015-10-19 10:53:12 UTC (rev 8789)
@@ -9,7 +9,7 @@
-I../../../Common/PlatformBase \
-I../../../Common/MapGuideCommon \
-I../../../Common/MdfModel \
- -I../../../Oem/ACE/ACE_wrappers \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
-I../HttpHandler \
-I../WebSupport \
-I../MapAgentCommon
@@ -47,9 +47,9 @@
-llib_json
mapagent_LDFLAGS = \
- -L../../../Oem/ACE/ACE_wrappers/ace \
- -L../../../Oem/dbxml/install/lib \
- -L../../../Oem/jsoncpp/lib \
+ -L$(mg_oem_ace_src)/ACE_wrappers/ace \
+ -L$(mg_oem_dbxml_src)/install/lib \
+ -L$(mg_oem_jsoncpp_src)/lib \
-L../../../Common/CoordinateSystem \
-L../../../Common/MdfModel \
-L../../../Common/MdfParser \
Modified: sandbox/jng/diet_vs2015/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationApi.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationApi.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationApi.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -94,15 +94,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
<Command>del /Q .\FoundationCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\FoundationConstants.xml C# ./FoundationConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\FoundationConstants.xml C# ./FoundationConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\FoundationApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -dllname FoundationUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\FoundationCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module FoundationApi -o MgFoundationApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib FoundationApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\FoundationApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -dllname FoundationUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\FoundationCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module FoundationApi -o MgFoundationApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) FoundationApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -131,15 +131,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
<Command>del /Q .\FoundationCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\FoundationConstants.xml C# ./FoundationConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\FoundationConstants.xml C# ./FoundationConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\FoundationApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -dllname FoundationUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\FoundationCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module FoundationApi -o MgFoundationApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib FoundationApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\FoundationApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -dllname FoundationUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\FoundationCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module FoundationApi -o MgFoundationApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) FoundationApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -168,15 +168,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
<Command>del /Q .\FoundationCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\FoundationConstants.xml C# ./FoundationConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\FoundationConstants.xml C# ./FoundationConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\FoundationApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -namespace OSGeo.MapGuide -dllname FoundationUnmanagedApi -proxydir .\FoundationCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module FoundationApi -o MgFoundationApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib FoundationApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\FoundationApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -namespace OSGeo.MapGuide -dllname FoundationUnmanagedApi -proxydir .\FoundationCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module FoundationApi -o MgFoundationApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) FoundationApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -206,15 +206,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
<Command>del /Q .\FoundationCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\FoundationConstants.xml C# ./FoundationConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\FoundationConstants.xml C# ./FoundationConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\FoundationApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -namespace OSGeo.MapGuide -dllname FoundationUnmanagedApi -proxydir .\FoundationCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module FoundationApi -o MgFoundationApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib FoundationApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\FoundationApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -namespace OSGeo.MapGuide -dllname FoundationUnmanagedApi -proxydir .\FoundationCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module FoundationApi -o MgFoundationApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) FoundationApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
Modified: sandbox/jng/diet_vs2015/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApi.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApi.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApi.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -94,15 +94,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
<Command>del /Q GeometryCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\GeometryConstants.xml C# ./GeometryConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\GeometryConstants.xml C# ./GeometryConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\GeometryApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -dllname GeometryUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\GeometryCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module GeometryApi -o MgGeometryApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib GeometryApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\GeometryApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -dllname GeometryUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\GeometryCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module GeometryApi -o MgGeometryApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) GeometryApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -131,15 +131,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
<Command>del /Q GeometryCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\GeometryConstants.xml C# ./GeometryConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\GeometryConstants.xml C# ./GeometryConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\GeometryApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -dllname GeometryUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\GeometryCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module GeometryApi -o MgGeometryApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib GeometryApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\GeometryApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -dllname GeometryUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\GeometryCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module GeometryApi -o MgGeometryApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) GeometryApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -168,15 +168,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
<Command>del /Q GeometryCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\GeometryConstants.xml C# ./GeometryConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\GeometryConstants.xml C# ./GeometryConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\GeometryApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -namespace OSGeo.MapGuide -dllname GeometryUnmanagedApi -proxydir .\GeometryCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module GeometryApi -o MgGeometryApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib GeometryApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\GeometryApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -namespace OSGeo.MapGuide -dllname GeometryUnmanagedApi -proxydir .\GeometryCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module GeometryApi -o MgGeometryApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) GeometryApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -206,15 +206,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
<Command>del /Q GeometryCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\GeometryConstants.xml C# ./GeometryConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\GeometryConstants.xml C# ./GeometryConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\GeometryApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -namespace OSGeo.MapGuide -dllname GeometryUnmanagedApi -proxydir .\GeometryCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module GeometryApi -o MgGeometryApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib GeometryApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\GeometryApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -namespace OSGeo.MapGuide -dllname GeometryUnmanagedApi -proxydir .\GeometryCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module GeometryApi -o MgGeometryApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) GeometryApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
Modified: sandbox/jng/diet_vs2015/MgDev/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApi.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApi.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApi.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -94,15 +94,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
<Command>del /Q MapGuideCommonCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideCommonConstants.xml C# ./MapGuideCommonConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\MapGuideCommonConstants.xml C# ./MapGuideCommonConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideCommonApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -dllname MapGuideCommonUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\MapGuideCommonCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideCommonApi -o MgMapGuideCommonApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib MapGuideCommonApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\MapGuideCommonApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -dllname MapGuideCommonUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\MapGuideCommonCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideCommonApi -o MgMapGuideCommonApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideCommonApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -113,7 +113,7 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)MapGuideCommonUnmanagedApid.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MapGuideCommonUnmanagedApid.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -122,7 +122,7 @@
</DataExecutionPrevention>
<ImportLibrary>..\..\..\lib\$(Configuration)\MapGuideCommonUnmanagedApid.lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>move /Y *.cs ..\..\DotNetApi\MapGuideCommon</Command>
@@ -131,15 +131,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
<Command>del /Q MapGuideCommonCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideCommonConstants.xml C# ./MapGuideCommonConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\MapGuideCommonConstants.xml C# ./MapGuideCommonConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideCommonApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -dllname MapGuideCommonUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\MapGuideCommonCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideCommonApi -o MgMapGuideCommonApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib MapGuideCommonApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\MapGuideCommonApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -dllname MapGuideCommonUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\MapGuideCommonCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideCommonApi -o MgMapGuideCommonApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideCommonApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -150,7 +150,7 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)MapGuideCommonUnmanagedApid.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MapGuideCommonUnmanagedApid.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -159,7 +159,7 @@
</DataExecutionPrevention>
<ImportLibrary>..\..\..\lib\$(Configuration)64\MapGuideCommonUnmanagedApid.lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>move /Y *.cs ..\..\DotNetApi\MapGuideCommon</Command>
@@ -168,15 +168,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
<Command>del /Q MapGuideCommonCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideCommonConstants.xml C# ./MapGuideCommonConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\MapGuideCommonConstants.xml C# ./MapGuideCommonConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideCommonApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -namespace OSGeo.MapGuide -dllname MapGuideCommonUnmanagedApi -proxydir .\MapGuideCommonCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideCommonApi -o MgMapGuideCommonApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib MapGuideCommonApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\MapGuideCommonApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -namespace OSGeo.MapGuide -dllname MapGuideCommonUnmanagedApi -proxydir .\MapGuideCommonCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideCommonApi -o MgMapGuideCommonApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideCommonApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -186,7 +186,7 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)MapGuideCommonUnmanagedApi.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MapGuideCommonUnmanagedApi.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -197,7 +197,7 @@
</DataExecutionPrevention>
<ImportLibrary>..\..\..\lib\$(Configuration)\MapGuideCommonUnmanagedApi.lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>move /Y *.cs ..\..\DotNetApi\MapGuideCommon</Command>
@@ -206,15 +206,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
<Command>del /Q MapGuideCommonCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideCommonConstants.xml C# ./MapGuideCommonConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\MapGuideCommonConstants.xml C# ./MapGuideCommonConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\MapGuideCommonApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -namespace OSGeo.MapGuide -dllname MapGuideCommonUnmanagedApi -proxydir .\MapGuideCommonCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideCommonApi -o MgMapGuideCommonApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib MapGuideCommonApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\MapGuideCommonApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -namespace OSGeo.MapGuide -dllname MapGuideCommonUnmanagedApi -proxydir .\MapGuideCommonCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideCommonApi -o MgMapGuideCommonApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideCommonApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -224,7 +224,7 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)MapGuideCommonUnmanagedApi.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MapGuideCommonUnmanagedApi.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -235,7 +235,7 @@
</DataExecutionPrevention>
<ImportLibrary>..\..\..\lib\$(Configuration)64\MapGuideCommonUnmanagedApi.lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>move /Y *.cs ..\..\DotNetApi\MapGuideCommon</Command>
Modified: sandbox/jng/diet_vs2015/MgDev/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApi.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApi.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApi.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -94,15 +94,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
<Command>del /Q PlatformBaseCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\PlatformBaseConstants.xml C# ./PlatformBaseConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\PlatformBaseConstants.xml C# ./PlatformBaseConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\PlatformBaseApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -dllname PlatformBaseUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\PlatformBaseCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module PlatformBaseApi -o MgPlatformBaseApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib PlatformBaseApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\PlatformBaseApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -dllname PlatformBaseUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\PlatformBaseCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module PlatformBaseApi -o MgPlatformBaseApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) PlatformBaseApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -131,15 +131,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
<Command>del /Q PlatformBaseCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\PlatformBaseConstants.xml C# ./PlatformBaseConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\PlatformBaseConstants.xml C# ./PlatformBaseConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\PlatformBaseApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -dllname PlatformBaseUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\PlatformBaseCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module PlatformBaseApi -o MgPlatformBaseApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib PlatformBaseApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\PlatformBaseApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -dllname PlatformBaseUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\PlatformBaseCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module PlatformBaseApi -o MgPlatformBaseApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) PlatformBaseApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -168,15 +168,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
<Command>del /Q PlatformBaseCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\PlatformBaseConstants.xml C# ./PlatformBaseConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\PlatformBaseConstants.xml C# ./PlatformBaseConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\PlatformBaseApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -namespace OSGeo.MapGuide -dllname PlatformBaseUnmanagedApi -proxydir .\PlatformBaseCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module PlatformBaseApi -o MgPlatformBaseApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib PlatformBaseApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\PlatformBaseApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -namespace OSGeo.MapGuide -dllname PlatformBaseUnmanagedApi -proxydir .\PlatformBaseCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module PlatformBaseApi -o MgPlatformBaseApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) PlatformBaseApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -206,15 +206,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
<Command>del /Q PlatformBaseCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\PlatformBaseConstants.xml C# ./PlatformBaseConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\PlatformBaseConstants.xml C# ./PlatformBaseConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\PlatformBaseApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -namespace OSGeo.MapGuide -dllname PlatformBaseUnmanagedApi -proxydir .\PlatformBaseCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module PlatformBaseApi -o MgPlatformBaseApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib PlatformBaseApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\PlatformBaseApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -namespace OSGeo.MapGuide -dllname PlatformBaseUnmanagedApi -proxydir .\PlatformBaseCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module PlatformBaseApi -o MgPlatformBaseApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) PlatformBaseApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
Modified: sandbox/jng/diet_vs2015/MgDev/Web/src/DotNetUnmanagedApi/Web/WebApi.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Web/src/DotNetUnmanagedApi/Web/WebApi.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Web/src/DotNetUnmanagedApi/Web/WebApi.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -94,15 +94,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
<Command>del /Q WebCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\WebConstants.xml C# ./WebConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\WebConstants.xml C# ./WebConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\WebApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -dllname WebUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\WebCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideApi -o MgWebApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\WebApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -dllname WebUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\WebCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideApi -o MgWebApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Web\src\WebApp;..\..\..\..\Web\src\WebSupport;..\..\..\..\Web\src\HttpHandler;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Web\src\WebApp;..\..\..\..\Web\src\WebSupport;..\..\..\..\Web\src\HttpHandler;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -113,7 +113,7 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)WebUnmanagedApid.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)WebUnmanagedApid.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -122,7 +122,7 @@
</DataExecutionPrevention>
<ImportLibrary>..\..\..\lib\$(Configuration)\WebUnmanagedApid.lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>move /Y *.cs ..\..\DotNetApi\Web</Command>
@@ -131,15 +131,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
<Command>del /Q WebCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\WebConstants.xml C# ./WebConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\WebConstants.xml C# ./WebConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\WebApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -dllname WebUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\WebCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideApi -o MgWebApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\WebApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -dllname WebUnmanagedApid -namespace OSGeo.MapGuide -proxydir .\WebCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideApi -o MgWebApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Web\src\WebApp;..\..\..\..\Web\src\WebSupport;..\..\..\..\Web\src\HttpHandler;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Web\src\WebApp;..\..\..\..\Web\src\WebSupport;..\..\..\..\Web\src\HttpHandler;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -150,7 +150,7 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)WebUnmanagedApid.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)WebUnmanagedApid.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -159,7 +159,7 @@
</DataExecutionPrevention>
<ImportLibrary>..\..\..\lib\$(Configuration)64\WebUnmanagedApid.lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>move /Y *.cs ..\..\DotNetApi\Web</Command>
@@ -168,15 +168,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
<Command>del /Q WebCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\WebConstants.xml C# ./WebConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\WebConstants.xml C# ./WebConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\WebApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -namespace OSGeo.MapGuide -dllname WebUnmanagedApi -proxydir .\WebCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideApi -o MgWebApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\WebApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -namespace OSGeo.MapGuide -dllname WebUnmanagedApi -proxydir .\WebCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideApi -o MgWebApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Web\src\WebApp;..\..\..\..\Web\src\WebSupport;..\..\..\..\Web\src\HttpHandler;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Web\src\WebApp;..\..\..\..\Web\src\WebSupport;..\..\..\..\Web\src\HttpHandler;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -186,7 +186,7 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)WebUnmanagedApi.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)WebUnmanagedApi.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -197,7 +197,7 @@
</DataExecutionPrevention>
<ImportLibrary>..\..\..\lib\$(Configuration)\WebUnmanagedApi.lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>move /Y *.cs ..\..\DotNetApi\Web</Command>
@@ -206,15 +206,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
<Command>del /Q WebCustom\*prop
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\WebConstants.xml C# ./WebConstants.cs
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\WebConstants.xml C# ./WebConstants.cs
copy ..\dotnet.i .\language.i
-..\..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe .\WebApiGen.xml C#
-..\..\..\..\Oem\SwigEx\Win32\swig -c++ -csharp -namespace OSGeo.MapGuide -dllname WebUnmanagedApi -proxydir .\WebCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideApi -o MgWebApi_wrap.cpp -lib ..\..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe .\WebApiGen.xml C#
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -csharp -namespace OSGeo.MapGuide -dllname WebUnmanagedApi -proxydir .\WebCustom -baseexception MgException -clsidcode ..\getclassid.code -clsiddata m_cls_id -catchallcode ..\catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideApi -o MgWebApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Web\src\WebApp;..\..\..\..\Web\src\WebSupport;..\..\..\..\Web\src\HttpHandler;..\..\..\..\Oem\ACE\ACE_wrappers;..\..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\..\Common\MdfModel;..\..\..\..\Common\Foundation;..\..\..\..\Common\Geometry;..\..\..\..\Common\PlatformBase;..\..\..\..\Common\MapGuideCommon;..\..\..\..\Web\src\WebApp;..\..\..\..\Web\src\WebSupport;..\..\..\..\Web\src\HttpHandler;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -224,7 +224,7 @@
</ClCompile>
<Link>
<OutputFile>$(OutDir)WebUnmanagedApi.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)WebUnmanagedApi.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -235,7 +235,7 @@
</DataExecutionPrevention>
<ImportLibrary>..\..\..\lib\$(Configuration)64\WebUnmanagedApi.lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>move /Y *.cs ..\..\DotNetApi\Web</Command>
Modified: sandbox/jng/diet_vs2015/MgDev/Web/src/HttpHandler/HttpHandler.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Web/src/HttpHandler/HttpHandler.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Web/src/HttpHandler/HttpHandler.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\jsoncpp\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_JSONCPP_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_MAPAGENT_API_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -104,9 +104,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;lib_jsond.lib;MgMdfParserd.lib;MgMdfModeld.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_JSONCPP_LIBS);MgMdfParserd.lib;MgMdfModeld.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgHttpHandlerd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\Oem\dbxml\lib\$(Configuration);..\..\..\Oem\jsoncpp\lib\$(Configuration);..\..\..\common\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);$(MG_OEM_JSONCPP_LIB_DIR);..\..\..\common\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgHttpHandlerd.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -120,7 +120,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\jsoncpp\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_JSONCPP_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_MAPAGENT_API_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -130,9 +130,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;lib_jsond.lib;MgMdfParserd.lib;MgMdfModeld.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_JSONCPP_LIBS);MgMdfParserd.lib;MgMdfModeld.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgHttpHandlerd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\dbxml\lib64\$(Configuration);..\..\..\Oem\jsoncpp\lib64\$(Configuration);..\..\..\Common\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);$(MG_OEM_JSONCPP_LIB_DIR);..\..\..\Common\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgHttpHandlerd.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -146,7 +146,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\jsoncpp\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_JSONCPP_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_MAPAGENT_API_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -155,9 +155,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;lib_json.lib;MgMdfParser.lib;MgMdfModel.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_JSONCPP_LIBS);MgMdfParser.lib;MgMdfModel.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgHttpHandler.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\Oem\dbxml\lib\$(Configuration);..\..\..\Oem\jsoncpp\lib\$(Configuration);..\..\..\common\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);$(MG_OEM_JSONCPP_LIB_DIR);..\..\..\common\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgHttpHandler.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -173,7 +173,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;..\..\..\Oem\jsoncpp\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_JSONCPP_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_MAPAGENT_API_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -182,9 +182,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;lib_json.lib;MgMdfParser.lib;MgMdfModel.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_JSONCPP_LIBS);MgMdfParser.lib;MgMdfModel.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgHttpHandler.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\dbxml\lib64\$(Configuration);..\..\..\Oem\jsoncpp\lib64\$(Configuration);..\..\..\common\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);$(MG_OEM_JSONCPP_LIB_DIR);..\..\..\common\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgHttpHandler.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: sandbox/jng/diet_vs2015/MgDev/Web/src/HttpHandler/Makefile.am
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Web/src/HttpHandler/Makefile.am 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Web/src/HttpHandler/Makefile.am 2015-10-19 10:53:12 UTC (rev 8789)
@@ -9,9 +9,9 @@
-I../../../Common/Geometry \
-I../../../Common/PlatformBase \
-I../../../Common/MapGuideCommon \
- -I../../../Oem/ACE/ACE_wrappers \
- -I../../../Oem/dbxml/xerces-c-src/src \
- -I../../../Oem/jsoncpp/include
+ -I$(mg_oem_ace_src)/ACE_wrappers \
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src \
+ -I$(mg_oem_jsoncpp_src)/include
lib_LTLIBRARIES = libMgHttpHandler.la
@@ -293,6 +293,6 @@
-L../../../Common/Geometry \
-L../../../Common/PlatformBase \
-L../../../Common/MapGuideCommon \
- -L../../../Oem/jsoncpp/lib \
+ -L$(mg_oem_jsoncpp_src)/lib \
-L../../../Common/MdfModel \
-L../../../Common/MdfParser
Modified: sandbox/jng/diet_vs2015/MgDev/Web/src/IsapiAgent/IsapiAgent.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Web/src/IsapiAgent/IsapiAgent.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Web/src/IsapiAgent/IsapiAgent.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_ACE_INC_DIR);..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;ISAPIAGENT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -118,7 +118,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_ACE_INC_DIR);..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;ISAPIAGENT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -142,7 +142,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_ACE_INC_DIR);..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;ISAPIAGENT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -167,7 +167,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_ACE_INC_DIR);..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;ISAPIAGENT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
Modified: sandbox/jng/diet_vs2015/MgDev/Web/src/JavaApi/JavaApi.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Web/src/JavaApi/JavaApi.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Web/src/JavaApi/JavaApi.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -93,10 +93,10 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+ <Command>$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\Constants.xml Java .
copy .\java.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
-..\..\..\Oem\SwigEx\Win32\swig -c++ -java -DJAVA -DWIN32 -dllname MapGuideJavaApid -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApi -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -java -DJAVA -DWIN32 -dllname MapGuideJavaApid -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApi -o MgApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideApi.i
move /Y *.java org\osgeo\mapguide
del org\osgeo\mapguide\*.class
echo Building java classes...
@@ -108,7 +108,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -118,9 +118,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MapGuideJavaApid.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MapGuideJavaApid.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -133,10 +133,10 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+ <Command>$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\Constants.xml Java .
copy .\java.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
-..\..\..\Oem\SwigEx\Win32\swig -c++ -java -DJAVA -DWIN32 -dllname MapGuideJavaApid -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApi -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -java -DJAVA -DWIN32 -dllname MapGuideJavaApid -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApi -o MgApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideApi.i
move /Y *.java org\osgeo\mapguide
del org\osgeo\mapguide\*.class
echo Building java classes...
@@ -148,7 +148,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -158,9 +158,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MapGuideJavaApid.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MapGuideJavaApid.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -173,10 +173,10 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+ <Command>$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\Constants.xml Java .
copy .\java.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
-..\..\..\Oem\SwigEx\Win32\swig -c++ -java -DJAVA -DWIN32 -dllname MapGuideJavaApi -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApi -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -java -DJAVA -DWIN32 -dllname MapGuideJavaApi -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApi -o MgApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideApi.i
move /Y *.java org\osgeo\mapguide
del org\osgeo\mapguide\*.class
echo Building java classes...
@@ -188,7 +188,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -197,9 +197,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MapGuideJavaApi.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MapGuideJavaApi.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -214,10 +214,10 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+ <Command>$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\Constants.xml Java .
copy .\java.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
-..\..\..\Oem\SwigEx\Win32\swig -c++ -java -DJAVA -DWIN32 -dllname MapGuideJavaApi -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApi -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -java -DJAVA -DWIN32 -dllname MapGuideJavaApi -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApi -o MgApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideApi.i
move /Y *.java org\osgeo\mapguide
del org\osgeo\mapguide\*.class
echo Building java classes...
@@ -229,7 +229,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -238,9 +238,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MapGuideJavaApi.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MapGuideJavaApi.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: sandbox/jng/diet_vs2015/MgDev/Web/src/JavaApi/Makefile.am
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Web/src/JavaApi/Makefile.am 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Web/src/JavaApi/Makefile.am 2015-10-19 10:53:12 UTC (rev 8789)
@@ -18,11 +18,11 @@
-I../../../Common/MapGuideCommon \
-I$(JAVA_HOME)/include \
-I$(JAVA_HOME)/include/linux \
- -I../../../Oem/ACE/ACE_wrappers \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
-I../HttpHandler \
-I../WebSupport \
-I../WebApp \
- -I../../../Oem/dbxml/xerces-c-src/src
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src
BUILT_SOURCES = MgApi_wrap.cpp
@@ -45,7 +45,7 @@
-lMgWebApp
libMapGuideJavaApi_la_LDFLAGS = -release $(PACKAGE_VERSION) \
- -L../../../Oem/ACE/ACE_wrappers/ace \
+ -L$(mg_oem_ace_src)/ACE_wrappers/ace \
-L../../../Common/MdfModel \
-L../../../Common/MdfParser \
-L../../../Common/Foundation \
@@ -54,7 +54,7 @@
-L../../../Common/MapGuideCommon \
-L../HttpHandler \
-L../WebApp \
- -L../../../Oem/dbxml/install/lib
+ -L$(mg_oem_dbxml_src)/install/lib
MgApi_wrap.cpp : \
../WebApp/WebApp.h \
@@ -457,10 +457,10 @@
../HttpHandler/HttpRequestParam.h \
../HttpHandler/HttpResponse.h \
../HttpHandler/HttpResult.h
- ../../../BuildTools/WebTools/IMake/Linux/IMake ../MapGuideApi/MapGuideApiGen.xml Java
+ $(mg_oem_imake_src)/Linux/IMake ../MapGuideApi/MapGuideApiGen.xml Java
cp -f java.i language.i
- ../../../BuildTools/WebTools/IMake/Linux/IMake ../MapGuideApi/Constants.xml Java .
- ../../../Oem/SWIGEx/Linux/swig -dllname MapGuideJavaApi -c++ -java -DJAVA -package org.osgeo.mapguide -root MgObject -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise();" -nodefault -noconstants -module MapGuideJavaApi -o MgApi_wrap.cpp -lib ../../../Oem/SWIGEx/Lib MapGuideApi.i
+ $(mg_oem_imake_src)/Linux/IMake ../MapGuideApi/Constants.xml Java .
+ $(mg_oem_swig_src)/Linux/swig -dllname MapGuideJavaApi -c++ -java -DJAVA -package org.osgeo.mapguide -root MgObject -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise();" -nodefault -noconstants -module MapGuideJavaApi -o MgApi_wrap.cpp -lib $(mg_oem_swig_src)/Lib MapGuideApi.i
rm -f org/osgeo/mapguide/*.class
mv -f *.java org/osgeo/mapguide
$(JAVA_HOME)/bin/javac -classpath . org/osgeo/mapguide/*.java
Modified: sandbox/jng/diet_vs2015/MgDev/Web/src/JavaApiEx/JavaApiEx.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Web/src/JavaApiEx/JavaApiEx.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Web/src/JavaApiEx/JavaApiEx.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -93,10 +93,10 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+ <Command>$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\Constants.xml Java .
copy .\java.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
-..\..\..\Oem\SwigEx\Win32\swig -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideJavaApiExd -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideJavaApiExd -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideApi.i
move /Y *.java org\osgeo\mapguide
del org\osgeo\mapguide\*.class
echo Building java classes...
@@ -108,7 +108,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -118,9 +118,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MapGuideJavaApiExd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MapGuideJavaApiExd.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -133,10 +133,10 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+ <Command>$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\Constants.xml Java .
copy .\java.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
-..\..\..\Oem\SwigEx\Win32\swig -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideJavaApiExd -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideJavaApiExd -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideApi.i
move /Y *.java org\osgeo\mapguide
del org\osgeo\mapguide\*.class
echo Building java classes...
@@ -148,7 +148,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -158,9 +158,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MapGuideJavaApiExd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MapGuideJavaApiExd.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -173,10 +173,10 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+ <Command>$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\Constants.xml Java .
copy .\java.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
-..\..\..\Oem\SwigEx\Win32\swig -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideJavaApiEx -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideJavaApiEx -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideApi.i
move /Y *.java org\osgeo\mapguide
del org\osgeo\mapguide\*.class
echo Building java classes...
@@ -189,7 +189,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -198,9 +198,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MapGuideJavaApiEx.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MapGuideJavaApiEx.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -215,10 +215,10 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+ <Command>$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\Constants.xml Java .
copy .\java.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
-..\..\..\Oem\SwigEx\Win32\swig -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideJavaApiEx -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideJavaApiEx -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideApi.i
move /Y *.java org\osgeo\mapguide
del org\osgeo\mapguide\*.class
echo Building java classes...
@@ -230,7 +230,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -239,9 +239,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MapGuideJavaApiEx.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MapGuideJavaApiEx.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: sandbox/jng/diet_vs2015/MgDev/Web/src/JavaApiEx/Makefile.am
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Web/src/JavaApiEx/Makefile.am 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Web/src/JavaApiEx/Makefile.am 2015-10-19 10:53:12 UTC (rev 8789)
@@ -18,11 +18,11 @@
-I../../../Common/MapGuideCommon \
-I$(JAVA_HOME)/include \
-I$(JAVA_HOME)/include/linux \
- -I../../../Oem/ACE/ACE_wrappers \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
-I../HttpHandler \
-I../WebSupport \
-I../WebApp \
- -I../../../Oem/dbxml/xerces-c-src/src
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src
BUILT_SOURCES = MgApi_wrap.cpp
@@ -45,7 +45,7 @@
-lMgWebApp
libMapGuideJavaApiEx_la_LDFLAGS = -release $(PACKAGE_VERSION) \
- -L../../../Oem/ACE/ACE_wrappers/ace \
+ -L$(mg_oem_ace_src)/ACE_wrappers/ace \
-L../../../Common/MdfModel \
-L../../../Common/MdfParser \
-L../../../Common/Foundation \
@@ -54,7 +54,7 @@
-L../../../Common/MapGuideCommon \
-L../HttpHandler \
-L../WebApp \
- -L../../../Oem/dbxml/install/lib
+ -L$(mg_oem_dbxml_src)/install/lib
MgApi_wrap.cpp : \
../WebApp/WebApp.h \
@@ -457,10 +457,10 @@
../HttpHandler/HttpRequestParam.h \
../HttpHandler/HttpResponse.h \
../HttpHandler/HttpResult.h
- ../../../BuildTools/WebTools/IMake/Linux/IMake ../MapGuideApi/MapGuideApiGen.xml Java
+ $(mg_oem_imake_src)/Linux/IMake ../MapGuideApi/MapGuideApiGen.xml Java
cp -f java.i language.i
- ../../../BuildTools/WebTools/IMake/Linux/IMake ../MapGuideApi/Constants.xml Java .
- ../../../Oem/SWIGEx/Linux/swig -dllname MapGuideJavaApiEx -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -package org.osgeo.mapguide -root MgObject -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise();" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib ../../../Oem/SWIGEx/Lib MapGuideApi.i
+ $(mg_oem_imake_src)/Linux/IMake ../MapGuideApi/Constants.xml Java .
+ $(mg_oem_swig_src)/Linux/swig -dllname MapGuideJavaApiEx -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -package org.osgeo.mapguide -root MgObject -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise();" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib $(mg_oem_swig_src)/Lib MapGuideApi.i
rm -f org/osgeo/mapguide/*.class
mv -f *.java org/osgeo/mapguide
$(JAVA_HOME)/bin/javac -classpath . org/osgeo/mapguide/*.java
Modified: sandbox/jng/diet_vs2015/MgDev/Web/src/MapAgentCommon/MapAgentCommon.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Web/src/MapAgentCommon/MapAgentCommon.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Web/src/MapAgentCommon/MapAgentCommon.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -90,7 +90,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\HttpHandler;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_ACE_INC_DIR);..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\HttpHandler;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MAPAGENTCOMMON_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -101,13 +101,13 @@
<Lib>
<AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MapAgentCommond.lib</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\HttpHandler;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_ACE_INC_DIR);..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\HttpHandler;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MAPAGENTCOMMON_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -118,13 +118,13 @@
<Lib>
<AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MapAgentCommond.lib</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\HttpHandler;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_ACE_INC_DIR);..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\HttpHandler;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MAPAGENTCOMMON_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -134,13 +134,13 @@
<Lib>
<AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MapAgentCommon.lib</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\HttpHandler;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_ACE_INC_DIR);..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\HttpHandler;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MAPAGENTCOMMON_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -150,7 +150,7 @@
<Lib>
<AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MapAgentCommon.lib</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
Modified: sandbox/jng/diet_vs2015/MgDev/Web/src/MapGuideApi/copydlls.bat
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Web/src/MapGuideApi/copydlls.bat 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Web/src/MapGuideApi/copydlls.bat 2015-10-19 10:53:12 UTC (rev 8789)
@@ -35,16 +35,16 @@
if not exist %WEB_BIN_RELEASE% mkdir %WEB_BIN_RELEASE%
echo Copying ACE Release DLL to %WEB_BIN_RELEASE%
-xcopy /r /d /y "..\..\..\Oem\ACE\ACE_wrappers\lib\%2\ACE.dll" %WEB_BIN_RELEASE%
+xcopy /r /d /y "%MG_OEM_ACE_BIN_DIR%\ACE.dll" %WEB_BIN_RELEASE%
echo Copying GEOS Release DLL to %WEB_BIN_RELEASE%
-xcopy /r /d /y "..\..\..\Oem\geos\VisualStudio\%2\GEOS.dll" %WEB_BIN_RELEASE%
+xcopy /r /d /y "%MG_OEM_GEOS_BIN_DIR%\GEOS.dll" %WEB_BIN_RELEASE%
echo Copying JSON Release DLL to %WEB_BIN_RELEASE%
-xcopy /r /d /y "..\..\..\Oem\jsoncpp\lib\%2\lib_json.dll" %WEB_BIN_RELEASE%
+xcopy /r /d /y "%MG_OEM_JSONCPP_BIN_DIR%\lib_json.dll" %WEB_BIN_RELEASE%
echo Copying Xerces Release DLL to %WEB_BIN_RELEASE%
-xcopy /r /d /y "..\..\..\Oem\dbxml\bin\%2\xerces-c_3_1mg.dll" %WEB_BIN_RELEASE%
+xcopy /r /d /y "%MG_OEM_DBXML_BIN_DIR%\xerces-c_3_1mg.dll" %WEB_BIN_RELEASE%
echo Copying MgFoundation Release DLL to %WEB_BIN_RELEASE%
xcopy /r /d /y %COMMON_BIN_RELEASE%\MgFoundation.dll %WEB_BIN_RELEASE%
@@ -75,16 +75,16 @@
if not exist %WEB_BIN_RELEASE%64 mkdir %WEB_BIN_RELEASE%64
echo Copying ACE Release DLL to %WEB_BIN_RELEASE%64
-xcopy /r /d /y "..\..\..\Oem\ACE\ACE_wrappers\lib64\%2\ACE.dll" %WEB_BIN_RELEASE%64
+xcopy /r /d /y "%MG_OEM_ACE_BIN_DIR%\ACE.dll" %WEB_BIN_RELEASE%64
echo Copying GEOS Release DLL to %WEB_BIN_RELEASE%64
-xcopy /r /d /y "..\..\..\Oem\geos\VisualStudio\%264\GEOS.dll" %WEB_BIN_RELEASE%64
+xcopy /r /d /y "%MG_OEM_GEOS_BIN_DIR%\GEOS.dll" %WEB_BIN_RELEASE%64
echo Copying JSON Release DLL to %WEB_BIN_RELEASE%64
-xcopy /r /d /y "..\..\..\Oem\jsoncpp\lib64\%2\lib_json.dll" %WEB_BIN_RELEASE%64
+xcopy /r /d /y "%MG_OEM_JSONCPP_BIN_DIR%\lib_json.dll" %WEB_BIN_RELEASE%64
echo Copying Xerces Release DLL to %WEB_BIN_RELEASE%64
-xcopy /r /d /y "..\..\..\Oem\dbxml\bin64\%2\xerces-c_3_1mg.dll" %WEB_BIN_RELEASE%64
+xcopy /r /d /y "%MG_OEM_DBXML_BIN_DIR%\xerces-c_3_1mg.dll" %WEB_BIN_RELEASE%64
echo Copying MgFoundation Release DLL to %WEB_BIN_RELEASE%64
xcopy /r /d /y %COMMON_BIN_RELEASE%64\MgFoundation.dll %WEB_BIN_RELEASE%64
@@ -115,16 +115,16 @@
if not exist %WEB_BIN_DEBUG% mkdir %WEB_BIN_DEBUG%
echo Copying ACE Debug DLL to %WEB_BIN_DEBUG%
-xcopy /r /d /y "..\..\..\Oem\ACE\ACE_wrappers\lib\%2\ACEd.dll" %WEB_BIN_DEBUG%
+xcopy /r /d /y "%MG_OEM_ACE_BIN_DIR%\ACEd.dll" %WEB_BIN_DEBUG%
echo Copying GEOS Debug DLL to %WEB_BIN_DEBUG%
-xcopy /r /d /y "..\..\..\Oem\geos\VisualStudio\%2\GEOSd.dll" %WEB_BIN_DEBUG%
+xcopy /r /d /y "%MG_OEM_GEOS_BIN_DIR%\GEOSd.dll" %WEB_BIN_DEBUG%
echo Copying JSON Debug DLL to %WEB_BIN_DEBUG%
-xcopy /r /d /y "..\..\..\Oem\jsoncpp\lib\%2\lib_jsond.dll" %WEB_BIN_DEBUG%
+xcopy /r /d /y "%MG_OEM_JSONCPP_BIN_DIR%\lib_jsond.dll" %WEB_BIN_DEBUG%
echo Copying Xerces Debug DLL to %WEB_BIN_DEBUG%
-xcopy /r /d /y "..\..\..\Oem\dbxml\bin\%2\xerces-c_3_1mgD.dll" %WEB_BIN_DEBUG%
+xcopy /r /d /y "%MG_OEM_DBXML_BIN_DIR%\xerces-c_3_1mgD.dll" %WEB_BIN_DEBUG%
echo Copying MgFoundation Debug DLL to %WEB_BIN_DEBUG%
xcopy /r /d /y %COMMON_BIN_DEBUG%\MgFoundationd.dll %WEB_BIN_DEBUG%
@@ -155,16 +155,16 @@
if not exist %WEB_BIN_DEBUG%64 mkdir %WEB_BIN_DEBUG%64
echo Copying ACE Debug DLL to %WEB_BIN_DEBUG%64
-xcopy /r /d /y "..\..\..\Oem\ACE\ACE_wrappers\lib64\%2\ACEd.dll" %WEB_BIN_DEBUG%64
+xcopy /r /d /y "%MG_OEM_ACE_BIN_DIR%\ACEd.dll" %WEB_BIN_DEBUG%64
echo Copying GEOS Debug DLL to %WEB_BIN_DEBUG%64
-xcopy /r /d /y "..\..\..\Oem\geos\VisualStudio\%264\GEOSd.dll" %WEB_BIN_DEBUG%64
+xcopy /r /d /y "%MG_OEM_GEOS_BIN_DIR%\GEOSd.dll" %WEB_BIN_DEBUG%64
echo Copying JSON Debug DLL to %WEB_BIN_DEBUG%64
-xcopy /r /d /y "..\..\..\Oem\jsoncpp\lib64\%2\lib_jsond.dll" %WEB_BIN_DEBUG%64
+xcopy /r /d /y "%MG_OEM_JSONCPP_BIN_DIR%\lib_jsond.dll" %WEB_BIN_DEBUG%64
echo Copying Xerces Debug DLL to %WEB_BIN_DEBUG%64
-xcopy /r /d /y "..\..\..\Oem\dbxml\bin64\%2\xerces-c_3_1mgD.dll" %WEB_BIN_DEBUG%64
+xcopy /r /d /y "%MG_OEM_DBXML_BIN_DIR%\xerces-c_3_1mgD.dll" %WEB_BIN_DEBUG%64
echo Copying MgFoundation Debug DLL to %WEB_BIN_DEBUG%64
xcopy /r /d /y %COMMON_BIN_DEBUG%64\MgFoundationd.dll %WEB_BIN_DEBUG%64
Modified: sandbox/jng/diet_vs2015/MgDev/Web/src/PhpApi/Makefile.am
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Web/src/PhpApi/Makefile.am 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Web/src/PhpApi/Makefile.am 2015-10-19 10:53:12 UTC (rev 8789)
@@ -18,11 +18,11 @@
-I$(php_src)/Zend \
-I$(php_src)/main \
-I$(php_src) \
- -I../../../Oem/ACE/ACE_wrappers \
+ -I$(mg_oem_ace_src)/ACE_wrappers \
-I../HttpHandler \
-I../WebSupport \
-I../WebApp \
- -I../../../Oem/dbxml/xerces-c-src/src
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src
lib_LTLIBRARIES = libphp_MapGuideApi.la
@@ -43,7 +43,7 @@
-lMgWebApp
libphp_MapGuideApi_la_LDFLAGS = -release $(PACKAGE_VERSION) \
- -L../../../Oem/ACE/ACE_wrappers/ace \
+ -L$(mg_oem_ace_src)/ACE_wrappers/ace \
-L../../../Common/MdfModel \
-L../../../Common/MdfParser \
-L../../../Common/Foundation \
@@ -52,7 +52,7 @@
-L../../../Common/MapGuideCommon \
-L../HttpHandler \
-L../WebApp \
- -L../../../Oem/dbxml/install/lib
+ -L$(mg_oem_dbxml_src)/install/lib
MgApi_wrap.cpp : \
../WebApp/WebApp.h \
@@ -455,14 +455,14 @@
../HttpHandler/HttpRequestParam.h \
../HttpHandler/HttpResponse.h \
../HttpHandler/HttpResult.h
- ../../../BuildTools/WebTools/IMake/Linux/IMake ../MapGuideApi/Constants.xml PHP ./constants.php
+ $(mg_oem_imake_src)/Linux/IMake ../MapGuideApi/Constants.xml PHP ./constants.php
cp -f php.i language.i
- ../../../BuildTools/WebTools/IMake/Linux/IMake ../MapGuideApi/MapGuideApiGen.xml PHP
- ../../../Oem/SWIGEx/Linux/swig -c++ -php -DPHPSWIG -baseexception MgException \
+ $(mg_oem_imake_src)/Linux/IMake ../MapGuideApi/MapGuideApiGen.xml PHP
+ $(mg_oem_swig_src)/Linux/swig -c++ -php -DPHPSWIG -baseexception MgException \
-clsidcode getclassid.code \
-clsiddata m_cls_id \
-catchallcode catchall.code \
-dispose "((MgDisposable*)arg1)->Release()" \
-rethrow "e->Raise();" \
-nodefault -o MgApi_wrap.cpp \
- -lib ../../../Oem/SWIGEx/Lib MapGuideApi.i
+ -lib $(mg_oem_swig_src)/Lib MapGuideApi.i
Modified: sandbox/jng/diet_vs2015/MgDev/Web/src/PhpApi/PhpApi.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Web/src/PhpApi/PhpApi.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Web/src/PhpApi/PhpApi.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -93,17 +93,17 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml PHP ./constants.php
+ <Command>$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\Constants.xml PHP ./constants.php
copy .\constants.php ..\mapadmin
copy .\constants.php ..\mapviewerphp
copy .\php.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml PHP
-..\..\..\Oem\SwigEx\Win32\swig -c++ -php -DWIN32 -DPHPSWIG -fcompact -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml PHP
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -php -DWIN32 -DPHPSWIG -fcompact -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -o MgApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(PHP_SRC);$(PHP_SRC)\main;$(PHP_SRC)\TSRM;$(PHP_SRC)\Zend;$(PHP_SRC)\ext\w32api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_PHP_ROOT);$(MG_OEM_PHP_ROOT)\main;$(MG_OEM_PHP_ROOT)\TSRM;$(MG_OEM_PHP_ROOT)\Zend;$(MG_OEM_PHP_ROOT)\ext\w32api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PHPPROXYAPI_EXPORTS;ZEND_WIN32;PHP_WIN32;ZEND_DEBUG=0;ZTS=1;PHP;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -113,9 +113,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;xerces-c_3mgD.lib;php5ts.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);php5ts.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)php_MapGuideApid.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration);$(PHP_LIB);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);$(MG_OEM_PHP_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)php_MapGuideApid.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -128,17 +128,17 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml PHP ./constants.php
+ <Command>$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\Constants.xml PHP ./constants.php
copy .\constants.php ..\mapadmin
copy .\constants.php ..\mapviewerphp
copy .\php.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml PHP
-..\..\..\Oem\SwigEx\Win32\swig -c++ -php -DWIN32 -DPHPSWIG -fcompact -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml PHP
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -php -DWIN32 -DPHPSWIG -fcompact -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -o MgApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(PHP_SRC);$(PHP_SRC)\main;$(PHP_SRC)\TSRM;$(PHP_SRC)\Zend;$(PHP_SRC)\ext\w32api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_PHP_ROOT);$(MG_OEM_PHP_ROOT)\main;$(MG_OEM_PHP_ROOT)\TSRM;$(MG_OEM_PHP_ROOT)\Zend;$(MG_OEM_PHP_ROOT)\ext\w32api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PHPPROXYAPI_EXPORTS;ZEND_WIN32;PHP_WIN32;ZEND_DEBUG=0;ZTS=1;PHP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -148,9 +148,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;xerces-c_3mgD.lib;php5ts.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);php5ts.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)php_MapGuideApid.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;$(PHP_LIB);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);$(MG_OEM_PHP_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)php_MapGuideApid.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -163,17 +163,17 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml PHP ./constants.php
+ <Command>$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\Constants.xml PHP ./constants.php
copy .\constants.php ..\mapadmin
copy .\constants.php ..\mapviewerphp
copy .\php.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml PHP
-..\..\..\Oem\SwigEx\Win32\swig -c++ -php -DWIN32 -DPHPSWIG -fcompact -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml PHP
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -php -DWIN32 -DPHPSWIG -fcompact -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -o MgApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(PHP_SRC);$(PHP_SRC)\main;$(PHP_SRC)\TSRM;$(PHP_SRC)\Zend;$(PHP_SRC)\ext\w32api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_PHP_ROOT);$(MG_OEM_PHP_ROOT)\main;$(MG_OEM_PHP_ROOT)\TSRM;$(MG_OEM_PHP_ROOT)\Zend;$(MG_OEM_PHP_ROOT)\ext\w32api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PHPPROXYAPI_EXPORTS;ZEND_WIN32;PHP_WIN32;ZEND_DEBUG=0;ZTS=1;PHP;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -182,9 +182,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;xerces-c_3mg.lib;php5ts.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);php5ts.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)php_MapGuideApi.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration);$(PHP_LIB);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);$(MG_OEM_PHP_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)php_MapGuideApi.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -199,17 +199,17 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml PHP ./constants.php
+ <Command>$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\Constants.xml PHP ./constants.php
copy .\constants.php ..\mapadmin
copy .\constants.php ..\mapviewerphp
copy .\php.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml PHP
-..\..\..\Oem\SwigEx\Win32\swig -c++ -php -DWIN32 -DPHPSWIG -fcompact -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+$(MG_OEM_IMAKE_BIN_DIR)\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml PHP
+$(MG_OEM_SWIG_BIN_DIR)\swig.exe -c++ -php -DWIN32 -DPHPSWIG -fcompact -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -o MgApi_wrap.cpp -lib $(MG_OEM_SWIG_LIB_DIR) MapGuideApi.i
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(PHP_SRC);$(PHP_SRC)\main;$(PHP_SRC)\TSRM;$(PHP_SRC)\Zend;$(PHP_SRC)\ext\w32api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);$(MG_OEM_PHP_ROOT);$(MG_OEM_PHP_ROOT)\main;$(MG_OEM_PHP_ROOT)\TSRM;$(MG_OEM_PHP_ROOT)\Zend;$(MG_OEM_PHP_ROOT)\ext\w32api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PHPPROXYAPI_EXPORTS;ZEND_WIN32;PHP_WIN32;ZEND_DEBUG=0;ZTS=1;PHP;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -218,9 +218,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;xerces-c_3mg.lib;php5ts.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);php5ts.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)php_MapGuideApi.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;$(PHP_LIB);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);$(MG_OEM_PHP_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)php_MapGuideApi.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: sandbox/jng/diet_vs2015/MgDev/Web/src/PhpMapGuideApiEnvConfig/PhpMapGuideApiEnvConfig.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Web/src/PhpMapGuideApiEnvConfig/PhpMapGuideApiEnvConfig.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Web/src/PhpMapGuideApiEnvConfig/PhpMapGuideApiEnvConfig.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(PHP_SRC)\main;$(PHP_SRC)\Zend;$(PHP_SRC)\TSRM;$(PHP_SRC)\regex;$(PHP_SRC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_PHP_ROOT)\main;$(MG_OEM_PHP_ROOT)\Zend;$(MG_OEM_PHP_ROOT)\TSRM;$(MG_OEM_PHP_ROOT)\regex;$(MG_OEM_PHP_ROOT);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PHPMAPGUIDEAPIENVCONFIG_EXPORTS;ZEND_DEBUG=0;ZTS=1;ZEND_WIN32;PHP_WIN32;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -105,7 +105,7 @@
<Link>
<AdditionalDependencies>php5ts.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)php_MapGuideApiEnvConfigd.dll</OutputFile>
- <AdditionalLibraryDirectories>$(PHP_LIB);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_PHP_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)php_MapGuideApiEnvConfigd.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -119,7 +119,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(PHP_SRC)\main;$(PHP_SRC)\Zend;$(PHP_SRC)\TSRM;$(PHP_SRC)\regex;$(PHP_SRC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_PHP_ROOT)\main;$(MG_OEM_PHP_ROOT)\Zend;$(MG_OEM_PHP_ROOT)\TSRM;$(MG_OEM_PHP_ROOT)\regex;$(MG_OEM_PHP_ROOT);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PHPMAPGUIDEAPIENVCONFIG_EXPORTS;ZEND_DEBUG=0;ZTS=1;ZEND_WIN32;PHP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -130,7 +130,7 @@
<Link>
<AdditionalDependencies>php5ts.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)php_MapGuideApiEnvConfigd.dll</OutputFile>
- <AdditionalLibraryDirectories>$(PHP_LIB);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_PHP_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)php_MapGuideApiEnvConfigd.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -145,7 +145,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>$(PHP_SRC)\main;$(PHP_SRC)\Zend;$(PHP_SRC)\TSRM;$(PHP_SRC)\regex;$(PHP_SRC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_PHP_ROOT)\main;$(MG_OEM_PHP_ROOT)\Zend;$(MG_OEM_PHP_ROOT)\TSRM;$(MG_OEM_PHP_ROOT)\regex;$(MG_OEM_PHP_ROOT);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PHPMAPGUIDEAPIENVCONFIG_EXPORTS;ZEND_DEBUG=0;ZTS=1;ZEND_WIN32;PHP_WIN32;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -156,7 +156,7 @@
<Link>
<AdditionalDependencies>php5ts.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)php_MapGuideApiEnvConfig.dll</OutputFile>
- <AdditionalLibraryDirectories>$(PHP_LIB);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_PHP_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -172,7 +172,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>$(PHP_SRC)\main;$(PHP_SRC)\Zend;$(PHP_SRC)\TSRM;$(PHP_SRC)\regex;$(PHP_SRC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MG_OEM_PHP_ROOT)\main;$(MG_OEM_PHP_ROOT)\Zend;$(MG_OEM_PHP_ROOT)\TSRM;$(MG_OEM_PHP_ROOT)\regex;$(MG_OEM_PHP_ROOT);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PHPMAPGUIDEAPIENVCONFIG_EXPORTS;ZEND_DEBUG=0;ZTS=1;ZEND_WIN32;PHP_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -183,7 +183,7 @@
<Link>
<AdditionalDependencies>php5ts.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)php_MapGuideApiEnvConfig.dll</OutputFile>
- <AdditionalLibraryDirectories>$(PHP_LIB);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_PHP_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
Modified: sandbox/jng/diet_vs2015/MgDev/Web/src/WebApp/Makefile.am
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Web/src/WebApp/Makefile.am 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Web/src/WebApp/Makefile.am 2015-10-19 10:53:12 UTC (rev 8789)
@@ -79,13 +79,13 @@
-I../../../Common/Geometry \
-I../../../Common/PlatformBase \
-I../../../Common/MapGuideCommon \
- -I../../../Oem/dbxml/xerces-c-src/src \
- -I../../../Oem/ACE/ACE_wrappers
+ -I$(mg_oem_dbxml_src)/xerces-c-src/src \
+ -I$(mg_oem_ace_src)/ACE_wrappers
libMgWebApp_la_LIBADD = -lxerces-c -lMgFoundation -lMgGeometry -lMgPlatformBase -lMgMapGuideCommon
libMgWebApp_la_LDFLAGS = -release $(PACKAGE_VERSION) \
- -L../../../Oem/dbxml/install/lib \
+ -L$(mg_oem_dbxml_src)/install/lib \
-L../../../Common/Foundation \
-L../../../Common/Geometry \
-L../../../Common/PlatformBase \
Modified: sandbox/jng/diet_vs2015/MgDev/Web/src/WebApp/WebApp.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Web/src/WebApp/WebApp.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Web/src/WebApp/WebApp.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_WEBAPP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -104,9 +104,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;xerces-c_3mgD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgWebAppd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgWebAppd.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -120,7 +120,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MG_WEBAPP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -130,9 +130,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;xerces-c_3mgD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgWebAppd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgWebAppd.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -146,7 +146,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_WEBAPP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -155,9 +155,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;xerces-c_3mg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgWebApp.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgWebApp.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -173,7 +173,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);$(MG_OEM_XERCES_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MG_WEBAPP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -182,9 +182,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;xerces-c_3mg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);$(MG_OEM_XERCES_LIBS);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgWebApp.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Oem\dbxml\xerces-c-src\Build\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);$(MG_OEM_XERCES_LIB_DIR);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgWebApp.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: sandbox/jng/diet_vs2015/MgDev/Web/src/WebSupport/Makefile.am
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Web/src/WebSupport/Makefile.am 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Web/src/WebSupport/Makefile.am 2015-10-19 10:53:12 UTC (rev 8789)
@@ -11,7 +11,7 @@
-I../../../Common/Geometry \
-I../../../Common/PlatformBase \
-I../../../Common/MapGuideCommon \
- -I../../../Oem/ACE/ACE_wrappers
+ -I$(mg_oem_ace_src)/ACE_wrappers
libMgWebSupport_la_SOURCES = InitializeWebTier.cpp
Modified: sandbox/jng/diet_vs2015/MgDev/Web/src/WebSupport/WebSupport.vcxproj
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/Web/src/WebSupport/WebSupport.vcxproj 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/Web/src/WebSupport/WebSupport.vcxproj 2015-10-19 10:53:12 UTC (rev 8789)
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;WEBSUPPORT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -104,9 +104,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;MgGeometryd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);MgGeometryd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgWebSupportd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\Common\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);..\..\..\Common\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgWebSupportd.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -120,7 +120,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;WEBSUPPORT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -130,9 +130,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACEd.lib;MgGeometryd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);MgGeometryd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgWebSupportd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Common\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);..\..\..\Common\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgWebSupportd.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -147,7 +147,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;WEBSUPPORT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -156,9 +156,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;MgGeometry.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);MgGeometry.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgWebSupport.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\..\Common\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);..\..\..\Common\lib\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgWebSupport.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -175,7 +175,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\Geometry;..\..\..\Common\PlatformBase;..\..\..\Common\MapGuideCommon;$(MG_OEM_ACE_INC_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;WEBSUPPORT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -184,9 +184,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>ACE.lib;MgGeometry.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(MG_OEM_ACE_LIBS);MgGeometry.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgWebSupport.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\..\Common\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(MG_OEM_ACE_LIB_DIR);..\..\..\Common\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)MgWebSupport.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: sandbox/jng/diet_vs2015/MgDev/build.bat
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/build.bat 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/build.bat 2015-10-19 10:53:12 UTC (rev 8789)
@@ -109,18 +109,9 @@
SET ERRORMSG=Unable to find Apache ant installation. Please install apache ant and set the ANT_HOME environment variable in setenvironment.bat
goto custom_error_no_help
:check_fdo
-:check_fdo_bin
-if exist "%MG_FDO_BIN%" goto check_fdo_inc
+if exist "%MG_FDO_BIN%" goto start_build
SET ERRORMSG=Unable to find FDO binaries. Copy the FDO binaries to %MG_FDO_BIN%
goto custom_error_no_help
-:check_fdo_inc
-if exist "%MG_FDO_INC%" goto check_fdo_lib
-SET ERRORMSG=Unable to find FDO headers. Copy the FDO headers into %MG_FDO_INC%
-goto custom_error_no_help
-:check_fdo_lib
-if exist "%MG_FDO_LIB%" goto start_build
-SET ERRORMSG=Unable to find FDO lib files. Copy the FDO lib files into %MG_FDO_LIB%
-goto custom_error_no_help
:start_build
echo ===================================================
@@ -136,18 +127,10 @@
if "%TYPEACTION%"=="install" goto install
:clean
-if "%TYPECOMPONENT%"=="oem" goto clean_oem
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\VC110\OpenSource.sln
-if not "%TYPECOMPONENT%"=="all" goto quit
-
:clean_server
echo [clean]: Clean Server
%MSBUILD_CLEAN% %MG_SERVER%\Server.sln
@@ -171,35 +154,18 @@
rem =======================================================
:build
-if "%TYPECOMPONENT%"=="oem" goto build_oem
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
+if "%TYPECOMPONENT%"=="all" goto build_server
+if "%TYPECOMPONENT%"=="allnodoc" goto build_server
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\VC110\OpenSource.sln
-if "%errorlevel%"=="1" goto error
-if "%TYPECOMPONENT%"=="oem" goto quit
-if "%TYPECOMPONENT%"=="server" goto quit
-if "%TYPECOMPONENT%"=="web" goto quit
-if "%TYPECOMPONENT%"=="doc" goto quit
-
:build_server
echo [build]: Building Server
%MSBUILD% %MG_SERVER%\Server.sln
if "%errorlevel%"=="1" goto error
-if "%TYPECOMPONENT%"=="oem" goto quit
if "%TYPECOMPONENT%"=="server" goto quit
if "%TYPECOMPONENT%"=="web" goto quit
if "%TYPECOMPONENT%"=="doc" goto quit
@@ -208,7 +174,6 @@
echo [build]: Building Web Tier
%MSBUILD% %MG_WEB_SRC%\WebTier.sln
if "%errorlevel%"=="1" goto error
-if "%TYPECOMPONENT%"=="oem" goto quit
if "%TYPECOMPONENT%"=="server" goto quit
if "%TYPECOMPONENT%"=="web" goto quit
if "%TYPECOMPONENT%"=="doc" goto quit
@@ -269,11 +234,11 @@
echo [install]: Server - WMS
%XCOPY% "%MG_SERVER%\bin\%TYPEBUILD%\wms" "%MG_OUTPUT_SERVER%\wms" /EXCLUDE:svn_excludes.txt+%TYPEBUILD%_excludes.txt
echo [install]: Server - DBXML
-copy /Y "%MG_BUILD_DBXML_EXE_PATH%\*.exe" "%MG_OUTPUT_SERVER%\bin"
+copy /Y "%MG_OEM_DBXML_BIN_DIR%\*.exe" "%MG_OUTPUT_SERVER%\bin"
echo [install]: Server - RepositoryAdmin
%XCOPY% "%MG_SERVER%\RepositoryAdmin" "%MG_OUTPUT_SERVER%\RepositoryAdmin" /EXCLUDE:svn_excludes.txt+%TYPEBUILD%_excludes.txt
echo [install]: CsMap Dictionaries
-%XCOPY% "%MG_OEM%\CsMap\Dictionaries" "%MG_OUTPUT_CSMAP%\Dictionaries" /EXCLUDE:svn_excludes.txt+csmap_excludes.txt+%TYPEBUILD%_excludes.txt
+%XCOPY% "%MG_OEM_CSMAP_DICT_DIR%" "%MG_OUTPUT_CSMAP%\Dictionaries" /EXCLUDE:svn_excludes.txt+csmap_excludes.txt+%TYPEBUILD%_excludes.txt
if "%TYPECOMPONENT%"=="server" goto quit
if "%TYPECOMPONENT%"=="web" goto quit
@@ -314,8 +279,6 @@
%XCOPY% "%MG_WEB_SRC%\mapviewerjava" "%MG_OUTPUT_WEB%\www\mapviewerjava" /EXCLUDE:svn_excludes.txt+%TYPEBUILD%_excludes.txt
echo [install]: Web Tier - mapviewerjava - WEB-INF
%XCOPY% "%MG_WEB_SRC%\WEB-INF" "%MG_OUTPUT_WEB%\www\WEB-INF" /EXCLUDE:svn_excludes.txt+%TYPEBUILD%_excludes.txt
-REM Required for Web Tier unit tests
-copy /Y "%MG_BUILD_SQLITE_PHP_API%" "%MG_OUTPUT_WEB%\Php\ext"
echo [build]: Web Tier - Clean fusion
call %ANT% clean -f "%MG_OEM%\fusion\build.xml"
echo [build]: Web Tier - Build Fusion API docs
@@ -369,8 +332,6 @@
:install_test
echo [install]: Test Suite
%XCOPY% "%MG_UNIT_TEST%" "%MG_OUTPUT_TEST%\UnitTest"
-if not exist "%MG_OUTPUT_TEST%\Oem\SQLite\bin\%TYPEBUILD%" mkdir "%MG_OUTPUT_TEST%\Oem\SQLite\bin\%TYPEBUILD%"
-copy /Y "%MG_BUILD_SQLITE_DOTNET_API%" "%MG_OUTPUT_TEST%\Oem\SQLite\bin\%TYPEBUILD%"
copy /Y test_readme.txt "%MG_OUTPUT_TEST%"
copy /Y run_tests.bat "%MG_OUTPUT_TEST%"
copy /Y run_tests.sh "%MG_OUTPUT_TEST%"
@@ -400,7 +361,6 @@
echo install,
echo clean,
echo Component: -w[ith]=all(default),
-echo oem,
echo server,
echo web,
echo doc
Modified: sandbox/jng/diet_vs2015/MgDev/configure.in
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/configure.in 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/configure.in 2015-10-19 10:53:12 UTC (rev 8789)
@@ -39,6 +39,329 @@
map_opt_oem_distsubdirs=""
dnl *******************************************************
+dnl Oem root configuration
+dnl *******************************************************
+AC_ARG_WITH([oem],
+ MAP_HELP_STRING([--with-oem],
+ [specify root path of oem components [[default=no]]]),
+ [with_oem=$withval],
+ [with_oem=no])
+
+if test $with_oem = "no"; then
+ AC_MSG_WARN([--with-oem not specified. Assuming each required component is passed in the configure script. If anything goes wrong, it's probably because of this])
+else
+ AC_MSG_NOTICE([Using oem component root path of $with_oem. All component paths will be implicitly be based from this path unless overridden individually])
+fi
+
+dnl *******************************************************
+dnl ACE 6.2.6 Configuration
+dnl *******************************************************
+AC_ARG_WITH([ace],
+ MAP_HELP_STRING([--with-ace],
+ [specify ACE source dir prefix as args [[default=no]]]),
+ [with_ace=$withval],
+ [with_ace=no])
+
+if test $with_ace == "no"; then
+ mg_oem_ace_src=$with_oem/ACE
+else
+ mg_oem_ace_src=$with_ace
+fi
+AC_MSG_NOTICE([Using ACE source dir: $mg_oem_ace_src])
+if test -d $mg_oem_ace_src; then
+ AC_MSG_NOTICE([ACE source directory is: $mg_oem_ace_src])
+else
+ AC_MSG_ERROR([ACE source directory ($mg_oem_ace_src) does not exist])
+fi
+AC_SUBST(mg_oem_ace_src)
+
+dnl *******************************************************
+dnl DWF Toolkit 7.7 Configuration
+dnl *******************************************************
+AC_ARG_WITH([dwftk],
+ MAP_HELP_STRING([--with-dwftk],
+ [specify DWF Toolkit source dir prefix as args [[default=no]]]),
+ [with_dwftk=$withval],
+ [with_dwftk=no])
+
+if test $with_dwftk == "no"; then
+ mg_oem_dwftk_src=$with_oem/DWFTK
+else
+ mg_oem_dwftk_src=$with_dwftk
+fi
+AC_MSG_NOTICE([Using DWF Toolkit source dir: $mg_oem_dwftk_src])
+if test -d $mg_oem_dwftk_src; then
+ AC_MSG_NOTICE([DWF Toolkit source directory is: $mg_oem_dwftk_src])
+else
+ AC_MSG_ERROR([DWF Toolkit source directory ($mg_oem_dwftk_src) does not exist])
+fi
+AC_SUBST(mg_oem_dwftk_src)
+
+dnl *******************************************************
+dnl GEOS 3.4.2 configuration
+dnl *******************************************************
+AC_ARG_WITH([geos],
+ MAP_HELP_STRING([--with-geos],
+ [specify GEOS source dir prefix as args [[default=no]]]),
+ [with_geos=$withval],
+ [with_geos=no])
+
+if test $with_geos == "no"; then
+ mg_oem_geos_src=$with_oem/geos
+else
+ mg_oem_geos_src=$with_geos
+fi
+AC_MSG_NOTICE([Using GEOS source dir: $mg_oem_geos_src])
+if test -d $mg_oem_geos_src; then
+ AC_MSG_NOTICE([GEOS source directory is: $mg_oem_geos_src])
+else
+ AC_MSG_ERROR([GEOS source directory ($mg_oem_geos_src) does not exist])
+fi
+AC_SUBST(mg_oem_geos_src)
+
+dnl *******************************************************
+dnl SWIGEx configuration
+dnl *******************************************************
+AC_ARG_WITH([swig],
+ MAP_HELP_STRING([--with-swig],
+ [specify SWIG source dir prefix as args [[default=no]]]),
+ [with_swig=$withval],
+ [with_swig=no])
+
+if test $with_swig == "no"; then
+ mg_oem_swig_src=$with_oem/SWIGEx
+else
+ mg_oem_swig_src=$with_swig
+fi
+AC_MSG_NOTICE([Using SWIG source dir: $mg_oem_swig_src])
+if test -d $mg_oem_swig_src; then
+ AC_MSG_NOTICE([SWIG source directory is: $mg_oem_swig_src])
+else
+ AC_MSG_ERROR([SWIG source directory ($mg_oem_swig_src) does not exist])
+fi
+AC_SUBST(mg_oem_swig_src)
+
+dnl *******************************************************
+dnl DBXML configuration
+dnl *******************************************************
+AC_ARG_WITH([dbxml],
+ MAP_HELP_STRING([--with-dbxml],
+ [specify DBXML source dir prefix as args [[default=no]]]),
+ [with_dbxml=$withval],
+ [with_dbxml=no])
+
+if test $with_dbxml == "no"; then
+ mg_oem_dbxml_src=$with_oem/dbxml
+else
+ mg_oem_dbxml_src=$with_dbxml
+fi
+AC_MSG_NOTICE([Using DBXML source dir: $mg_oem_dbxml_src])
+if test -d $mg_oem_dbxml_src; then
+ AC_MSG_NOTICE([DBXML source directory is: $mg_oem_dbxml_src])
+else
+ AC_MSG_ERROR([DBXML source directory ($mg_oem_dbxml_src) does not exist])
+fi
+AC_SUBST(mg_oem_dbxml_src)
+
+dnl *******************************************************
+dnl CppUnit configuration
+dnl *******************************************************
+AC_ARG_WITH([cppunit],
+ MAP_HELP_STRING([--with-cppunit],
+ [specify cppunit source dir prefix as args [[default=no]]]),
+ [with_cppunit=$withval],
+ [with_cppunit=no])
+
+if test $with_cppunit == "no"; then
+ mg_oem_cppunit_src=$with_oem/CppUnit-1.9.14
+else
+ mg_oem_cppunit_src=$with_cppunit
+fi
+AC_MSG_NOTICE([Using cppunit source dir: $mg_oem_cppunit_src])
+if test -d $mg_oem_cppunit_src; then
+ AC_MSG_NOTICE([cppunit source directory is: $mg_oem_cppunit_src])
+else
+ AC_MSG_ERROR([cppunit source directory ($mg_oem_cppunit_src) does not exist])
+fi
+AC_SUBST(mg_oem_cppunit_src)
+
+dnl *******************************************************
+dnl IMake configuration
+dnl *******************************************************
+AC_ARG_WITH([imake],
+ MAP_HELP_STRING([--with-imake],
+ [specify imake source dir prefix as args [[default=no]]]),
+ [with_imake=$withval],
+ [with_imake=no])
+
+if test $with_imake == "no"; then
+ mg_oem_imake_src=$with_oem/WebTools/IMake
+else
+ mg_oem_imake_src=$with_imake
+fi
+AC_MSG_NOTICE([Using imake source dir: $mg_oem_imake_src])
+if test -d $mg_oem_imake_src; then
+ AC_MSG_NOTICE([imake source directory is: $mg_oem_imake_src])
+else
+ AC_MSG_ERROR([imake source directory ($mg_oem_imake_src) does not exist])
+fi
+AC_SUBST(mg_oem_imake_src)
+
+dnl *******************************************************
+dnl ZLib configuration
+dnl *******************************************************
+AC_ARG_WITH([zlib],
+ MAP_HELP_STRING([--with-zlib],
+ [specify zlib source dir prefix as args [[default=no]]]),
+ [with_zlib=$withval],
+ [with_zlib=no])
+
+if test $with_zlib == "no"; then
+ mg_oem_zlib_src=$with_oem/gd/zlib
+else
+ mg_oem_zlib_src=$with_zlib
+fi
+AC_MSG_NOTICE([Using zlib source dir: $mg_oem_zlib_src])
+if test -d $mg_oem_zlib_src; then
+ AC_MSG_NOTICE([zlib source directory is: $mg_oem_zlib_src])
+else
+ AC_MSG_ERROR([zlib source directory ($mg_oem_zlib_src) does not exist])
+fi
+AC_SUBST(mg_oem_zlib_src)
+
+dnl *******************************************************
+dnl libpng configuration
+dnl *******************************************************
+AC_ARG_WITH([libpng],
+ MAP_HELP_STRING([--with-libpng],
+ [specify libpng source dir prefix as args [[default=no]]]),
+ [with_libpng=$withval],
+ [with_libpng=no])
+
+if test $with_libpng == "no"; then
+ mg_oem_libpng_src=$with_oem/gd/lpng
+else
+ mg_oem_libpng_src=$with_libpng
+fi
+AC_MSG_NOTICE([Using libpng source dir: $mg_oem_libpng_src])
+if test -d $mg_oem_libpng_src; then
+ AC_MSG_NOTICE([libpng source directory is: $mg_oem_libpng_src])
+else
+ AC_MSG_ERROR([libpng source directory ($mg_oem_libpng_src) does not exist])
+fi
+AC_SUBST(mg_oem_libpng_src)
+
+dnl *******************************************************
+dnl libjpeg configuration
+dnl *******************************************************
+AC_ARG_WITH([libjpeg],
+ MAP_HELP_STRING([--with-libjpeg],
+ [specify libjpeg source dir prefix as args [[default=no]]]),
+ [with_libjpeg=$withval],
+ [with_libjpeg=no])
+
+if test $with_libjpeg == "no"; then
+ mg_oem_libjpeg_src=$with_oem/gd/jpeg
+else
+ mg_oem_libjpeg_src=$with_libjpeg
+fi
+AC_MSG_NOTICE([Using libjpeg source dir: $mg_oem_libjpeg_src])
+if test -d $mg_oem_libjpeg_src; then
+ AC_MSG_NOTICE([libjpeg source directory is: $mg_oem_libjpeg_src])
+else
+ AC_MSG_ERROR([libjpeg source directory ($mg_oem_libjpeg_src) does not exist])
+fi
+AC_SUBST(mg_oem_libjpeg_src)
+
+dnl *******************************************************
+dnl freetype configuration
+dnl *******************************************************
+AC_ARG_WITH([freetype],
+ MAP_HELP_STRING([--with-freetype],
+ [specify freetype source dir prefix as args [[default=no]]]),
+ [with_freetype=$withval],
+ [with_freetype=no])
+
+if test $with_freetype == "no"; then
+ mg_oem_freetype_src=$with_oem/gd/freetype
+else
+ mg_oem_freetype_src=$with_freetype
+fi
+AC_MSG_NOTICE([Using freetype source dir: $mg_oem_freetype_src])
+if test -d $mg_oem_freetype_src; then
+ AC_MSG_NOTICE([freetype source directory is: $mg_oem_freetype_src])
+else
+ AC_MSG_ERROR([freetype source directory ($mg_oem_freetype_src) does not exist])
+fi
+AC_SUBST(mg_oem_freetype_src)
+
+dnl *******************************************************
+dnl gd configuration
+dnl *******************************************************
+AC_ARG_WITH([gd],
+ MAP_HELP_STRING([--with-gd],
+ [specify gd source dir prefix as args [[default=no]]]),
+ [with_gd=$withval],
+ [with_gd=no])
+
+if test $with_gd == "no"; then
+ mg_oem_gd_src=$with_oem/gd/gd
+else
+ mg_oem_gd_src=$with_gd
+fi
+AC_MSG_NOTICE([Using gd source dir: $mg_oem_gd_src])
+if test -d $mg_oem_gd_src; then
+ AC_MSG_NOTICE([gd source directory is: $mg_oem_gd_src])
+else
+ AC_MSG_ERROR([gd source directory ($mg_oem_gd_src) does not exist])
+fi
+AC_SUBST(mg_oem_gd_src)
+
+dnl *******************************************************
+dnl JSONCPP configuration
+dnl *******************************************************
+AC_ARG_WITH([jsoncpp],
+ MAP_HELP_STRING([--with-jsoncpp],
+ [specify jsoncpp source dir prefix as args [[default=no]]]),
+ [with_jsoncpp=$withval],
+ [with_jsoncpp=no])
+
+if test $with_jsoncpp == "no"; then
+ mg_oem_jsoncpp_src=$with_oem/jsoncpp
+else
+ mg_oem_jsoncpp_src=$with_jsoncpp
+fi
+AC_MSG_NOTICE([Using jsoncpp source dir: $mg_oem_jsoncpp_src])
+if test -d $mg_oem_jsoncpp_src; then
+ AC_MSG_NOTICE([jsoncpp source directory is: $mg_oem_jsoncpp_src])
+else
+ AC_MSG_ERROR([jsoncpp source directory ($mg_oem_jsoncpp_src) does not exist])
+fi
+AC_SUBST(mg_oem_jsoncpp_src)
+
+dnl *******************************************************
+dnl CS-Map configuration
+dnl *******************************************************
+AC_ARG_WITH([csmap],
+ MAP_HELP_STRING([--with-csmap],
+ [specify csmap source dir prefix as args [[default=no]]]),
+ [with_csmap=$withval],
+ [with_csmap=no])
+
+if test $with_csmap == "no"; then
+ mg_oem_csmap_src=$with_oem/CsMap
+else
+ mg_oem_csmap_src=$with_csmap
+fi
+AC_MSG_NOTICE([Using csmap source dir: $mg_oem_csmap_src])
+if test -d $mg_oem_csmap_src; then
+ AC_MSG_NOTICE([csmap source directory is: $mg_oem_csmap_src])
+else
+ AC_MSG_ERROR([csmap source directory ($mg_oem_csmap_src) does not exist])
+fi
+AC_SUBST(mg_oem_csmap_src)
+
+dnl *******************************************************
dnl PHP 5.5.17 Configuration
dnl *******************************************************
AC_ARG_WITH([php],
@@ -49,7 +372,7 @@
if test $with_php = "no"; then
AC_MSG_NOTICE([Using php 5.5.17 from included Oem Directory])
- php_src=`pwd`/Oem/LinuxApt/php-5.5.17
+ php_src=$with_oem/LinuxApt/php-5.5.17
else
AC_MSG_NOTICE([Using custom PHP source directory])
php_src=$with_php
@@ -72,7 +395,7 @@
if test $with_httpd = "no"; then
AC_MSG_NOTICE([Using httpd 2.4.10 from included Oem Directory])
- httpd_src=`pwd`/Oem/LinuxApt/httpd-2.4.10
+ httpd_src=$with_oem/LinuxApt/httpd-2.4.10
else
AC_MSG_NOTICE([Using custom httpd source directory])
httpd_src=$with_httpd
Property changes on: sandbox/jng/diet_vs2015/MgDev/prebuild.sh
___________________________________________________________________
Added: svn:executable
+ *
Modified: sandbox/jng/diet_vs2015/MgDev/setenvironment.bat
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/setenvironment.bat 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/setenvironment.bat 2015-10-19 10:53:12 UTC (rev 8789)
@@ -13,42 +13,69 @@
SET TYPEACTION=build
SET TYPECOMPONENT=all
-SET TYPEBUILD=unknown
-SET CONFIGURATION=unknown
-SET PLATFORM=unknown
-SET PLATFORM_CLR=unknown
+rem === Default to Release (x64) ====
+SET TYPEBUILD=Release64
+SET CONFIGURATION=Release
+SET PLATFORM=x64
+SET PLATFORM_CLR=x64
-SET PCONF=release
-if not "%1" == "" set PCONF=%1
+:study_params
+if (%1)==() goto setvars
-if "%PCONF%"=="debug" (
-SET TYPEBUILD=Debug
-SET CONFIGURATION=Debug
-SET PLATFORM=Win32
-SET PLATFORM_CLR=x86
+if "%1"=="-config" goto get_config
+if "%1"=="-c" goto get_config
+
+if "%1"=="-platform" goto get_platform
+if "%1"=="-p" goto get_platform
+
+if "%1"=="-help" goto help_show
+if "%1"=="-h" goto help_show
+
+goto custom_error
+
+:next_param
+shift
+shift
+goto study_params
+
+:get_platform
+SET PLATFORM=%2
+if "%2"=="x86" (
+ SET PLATFORM=Win32
+ goto next_param
)
+if "%2"=="x64" goto next_param
+SET ERRORMSG=Unrecognised platform: %2
+goto custom_error
-IF "%PCONF%"=="release" (
-SET TYPEBUILD=Release
-SET CONFIGURATION=Release
-SET PLATFORM=Win32
-SET PLATFORM_CLR=x86
+:get_config
+SET CONFIGURATION=%2
+if "%2"=="Debug" goto next_param
+if "%2"=="debug" (
+ SET CONFIGURATION=Debug
+ goto next_param
)
+if "%2"=="Release" goto next_param
+if "%2"=="release" (
+ SET CONFIGURATION=Release
+ goto next_param
+)
+SET ERRORMSG=Unrecognised config: %2
+goto custom_error
-if "%TYPEBUILD%"=="unknown" (
- echo Unknown configuration: %PCONF%
- goto help_show
+:setvars
+IF "%PLATFORM%"=="Win32" SET PLATFORM_CLR=x86
+IF "%PLATFORM_CLR%"=="x64" (
+ SET TYPEBUILD=%CONFIGURATION%64
+) ELSE (
+ SET TYPEBUILD=%CONFIGURATION%
)
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_FDO_BIN=%MG_OEM_FDO_ROOT%\Bin\%TYPEBUILD%
SET MG_COMMON=%MG_DEV%\Common
SET MG_SERVER=%MG_DEV%\Server
SET MG_WEB=%MG_DEV%\Web
@@ -62,10 +89,11 @@
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
+IF "%PLATFORM_CLR%"=="x64" (
+ SET MG_BUILD_MAPAGENT_PATH=%MG_WEB_SRC%\mapagent64
+) ELSE (
+ 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%
@@ -75,7 +103,6 @@
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
@@ -85,35 +112,16 @@
rem running
rem ==================================================
-IF "%JAVA_HOME%" == "" SET JAVA_HOME=C:\Program Files (x86)\Java\jdk1.7.0_71
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
+IF NOT EXIST "%SEVENZ_DIR%" (
+ SET ERRORMSG=Environment variable SEVENZ_DIR not set or points to an invalid location. This should be set by your build pack
+ goto custom_error_no_help
+)
-SET PATH=%PATH%;%DOXYGEN%;%GNUWIN32%;%SEVENZ%;%ANT_HOME%\bin
+SET PATH=%PATH%;%DOXYGEN%;%GNUWIN32%;%SEVENZ_DIR%;%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.5.17
-SET PHP_LIB=%MG_OEM%\php\Release_TS
-SET HTTPD_SRC=%MG_OEM%\LinuxApt\httpd-2.4.10
-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 ==================================================
@@ -136,30 +144,34 @@
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 CLR Configuration is [%TYPEBUILD%, "%CONFIGURATION%|%PLATFORM_CLR%"]
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 DBXML executables: %MG_OEM_DBXML_BIN_DIR%
echo mod_mgmapagent.so: %MG_BUILD_MAPAGENT%
echo ===================================================
echo Type build.bat to build MapGuide
goto done
+: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 Usage: setenvironment.bat [debug|release]
-echo If unspecified, configuration will default to release
+echo Usage: setenvironment.bat -p=[Win32|x64] -c=[debug|release]
+echo If unspecified, configuration will inherit from the environment variables
+echo set by your buildpack
echo ************************************************************************
:done
\ No newline at end of file
Deleted: sandbox/jng/diet_vs2015/MgDev/setenvironment64.bat
===================================================================
--- sandbox/jng/diet_vs2015/MgDev/setenvironment64.bat 2015-10-19 10:44:54 UTC (rev 8788)
+++ sandbox/jng/diet_vs2015/MgDev/setenvironment64.bat 2015-10-19 10:53:12 UTC (rev 8789)
@@ -1,170 +0,0 @@
- at echo off
-rem ==================================================
-rem setenvironment64.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 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 ==================================================
-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=Debug64
-SET CONFIGURATION=Debug
-SET PLATFORM=x64
-SET PLATFORM_CLR=x64
-)
-
-IF "%PCONF%"=="release" (
-SET TYPEBUILD=Release64
-SET CONFIGURATION=Release
-SET PLATFORM=x64
-SET PLATFORM_CLR=x64
-)
-
-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\Lib64
-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%\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
-
-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\Java\jdk1.7.0_71
-IF "%DOXYGEN%" == "" SET DOXYGEN=C:\Program Files\doxygen\bin
-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.5.17
-SET PHP_LIB=%MG_OEM%\php\x64\Release_TS
-SET HTTPD_SRC=%MG_OEM%\LinuxApt\httpd-2.4.10
-SET HTTPD_LIB=%MG_OEM%\httpd\lib64
-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: setenvironment64.bat [debug|release]
-echo If unspecified, configuration will default to release
-echo ************************************************************************
-:done
\ No newline at end of file
More information about the mapguide-commits
mailing list