[mapguide-commits] r8345 - in trunk/MgDev: . Common/Geometry Common/Geometry/GeometryConsoleTest Common/MapGuideCommon Common/PlatformBase Desktop Desktop/UnitTest Oem Server/src/PostBuild Server/src/UnitTesting Web/src/MapGuideApi
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sat Aug 23 15:56:14 PDT 2014
Author: jng
Date: 2014-08-23 15:56:14 -0700 (Sat, 23 Aug 2014)
New Revision: 8345
Added:
trunk/MgDev/Oem/geos/
Removed:
trunk/MgDev/Oem/geos-2.2.0/
Modified:
trunk/MgDev/
trunk/MgDev/Common/Geometry/Geometry.h
trunk/MgDev/Common/Geometry/Geometry.vcxproj
trunk/MgDev/Common/Geometry/GeometryConsoleTest/ReadMe.txt
trunk/MgDev/Common/Geometry/GeometryExceptionDef.h
trunk/MgDev/Common/Geometry/Makefile.am
trunk/MgDev/Common/MapGuideCommon/Makefile.am
trunk/MgDev/Common/PlatformBase/Makefile.am
trunk/MgDev/Desktop/
trunk/MgDev/Desktop/UnitTest/UnitTest.vcxproj
trunk/MgDev/Oem/oem.sln
trunk/MgDev/Server/src/PostBuild/PostBuild.mak
trunk/MgDev/Server/src/UnitTesting/TestGeometry.cpp
trunk/MgDev/Web/src/MapGuideApi/copydlls.bat
trunk/MgDev/build_oem.sh
trunk/MgDev/build_sdk.bat
trunk/MgDev/run_tests.bat
Log:
Implement MapGuide RFC 141
Merged revision(s) 8256-8259 from sandbox/jng/geos34x:
Remove old GEOS and replace it with GEOS 3.4.2. As it seems to be convention here, we're checking in as "geos" and not "geos-3.4.2" so that future Oem component updates won't need to involve lots of path fixing.
........
Update projects and code for GEOS 3.4.2
- Fix geometry exception macros due to semantic changes in exception handling. The API of GEOSException has changed and it now inherits from std::exception and is caught by const reference
- Order sensitivity of sub-geometries in the resulting geometry of a SymetricDifference operation. The MgGeometry::SymetricDifference API has been documented with this change of behaviour.
- Fix a decimal precision issue for a area-related test case. That test case was updated to use CPPUNIT_ASSERT_DOUBLES_EQUAL to compare up to a certain number of decimal places.
........
Update build_oem.sh for geos. Also add silent rules support for geos
........
Add remark about the change of behaviour in SymetricDifference due to the geos upgrade.
........
Property changes on: trunk/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
/sandbox/jng/convenience_apis:8263
/sandbox/jng/createruntimemap:7486-7555
/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
/sandbox/jng/convenience_apis:8263
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/geos34x:8256-8259
/sandbox/jng/tiling:8174-8208
/sandbox/jng/v30:8212-8227
/sandbox/rfc94:5099-5163
Modified: trunk/MgDev/Common/Geometry/Geometry.h
===================================================================
--- trunk/MgDev/Common/Geometry/Geometry.h 2014-08-23 09:46:01 UTC (rev 8344)
+++ trunk/MgDev/Common/Geometry/Geometry.h 2014-08-23 22:56:14 UTC (rev 8345)
@@ -647,6 +647,11 @@
/// \param other (MgGeometry)
/// The MgGeometry to subtract from this one.
///
+ /// \remarks
+ /// As of 3.0 the resulting geometry, if it is an aggregate geometry will have its sub-geometries ordered based on the order
+ /// of your operand geometries. Take note of this if your code is concerned about the order of geometries in the symmetric difference
+ /// result
+ ///
/// \return
/// An MgGeometry representing the symmetric difference.
///
Modified: trunk/MgDev/Common/Geometry/Geometry.vcxproj
===================================================================
--- trunk/MgDev/Common/Geometry/Geometry.vcxproj 2014-08-23 09:46:01 UTC (rev 8344)
+++ trunk/MgDev/Common/Geometry/Geometry.vcxproj 2014-08-23 22:56:14 UTC (rev 8345)
@@ -94,7 +94,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\CoordinateSystem;..\Foundation;..\Geometry;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\geos-2.2.0\source\headers;..\..\Oem\CsMap\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\CoordinateSystem;..\Foundation;..\Geometry;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\geos\include;..\..\Oem\CsMap\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GEOMETRY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -105,7 +105,7 @@
<Link>
<AdditionalDependencies>csmapd.lib;ACEd.lib;GEOSd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgGeometryd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\CsMap\lib110\$(Configuration);..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\Oem\geos-2.2.0\VisualStudio\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\Oem\CsMap\lib110\$(Configuration);..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\Oem\geos\VisualStudio\$(Configuration);%(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-2.2.0\source\headers;..\..\Oem\CsMap\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\CoordinateSystem;..\Foundation;..\Geometry;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\geos\include;..\..\Oem\CsMap\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GEOMETRY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -131,7 +131,7 @@
<Link>
<AdditionalDependencies>csmapd.lib;ACEd.lib;GEOSd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgGeometryd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\CsMap\lib110\$(Configuration)64;..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\Oem\geos-2.2.0\VisualStudio\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\Oem\CsMap\lib110\$(Configuration)64;..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\Oem\geos\VisualStudio\$(Configuration)64;%(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-2.2.0\source\headers;..\..\Oem\CsMap\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\CoordinateSystem;..\Foundation;..\Geometry;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\geos\include;..\..\Oem\CsMap\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GEOMETRY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -153,7 +153,7 @@
<Link>
<AdditionalDependencies>csmap.lib;ACE.lib;GEOS.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgGeometry.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\CsMap\lib110\$(Configuration);..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\Oem\geos-2.2.0\VisualStudio\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\Oem\CsMap\lib110\$(Configuration);..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\Oem\geos\VisualStudio\$(Configuration);%(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-2.2.0\source\headers;..\..\Oem\CsMap\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\CoordinateSystem;..\Foundation;..\Geometry;..\..\Oem\ACE\ACE_wrappers;..\..\Oem\geos\include;..\..\Oem\CsMap\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GEOMETRY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -180,7 +180,7 @@
<Link>
<AdditionalDependencies>csmap.lib;ACE.lib;GEOS.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgGeometry.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\CsMap\lib110\$(Configuration)64;..\..\Oem\ACE\ACE_Wrappers\lib64\$(Configuration);..\..\Oem\geos-2.2.0\VisualStudio\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\Oem\CsMap\lib110\$(Configuration)64;..\..\Oem\ACE\ACE_Wrappers\lib64\$(Configuration);..\..\Oem\geos\VisualStudio\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
Modified: trunk/MgDev/Common/Geometry/GeometryConsoleTest/ReadMe.txt
===================================================================
--- trunk/MgDev/Common/Geometry/GeometryConsoleTest/ReadMe.txt 2014-08-23 09:46:01 UTC (rev 8344)
+++ trunk/MgDev/Common/Geometry/GeometryConsoleTest/ReadMe.txt 2014-08-23 22:56:14 UTC (rev 8345)
@@ -21,8 +21,8 @@
subst Q: %GISPLATFORMROOTDIR%
echo Setting the PATH variable to Platform componentes in the %GISPLATFORMROOTDIR" directory.
echo off
-set PATH=%PATH%;Q:\Common\bin\debug;Q:\Oem\ACE\ACE_wrappers\lib;Q:\Oem\dbxml-2.3.10\bin\debug;Q:\Oem\geos-2.2.0\VisualStudio\Debug
-set PATH=%PATH%;Q:\Common\bin\release;Q:\Oem\dbxml-2.3.10\bin;Q:\Oem\geos-2.2.0\VisualStudio\Release
+set PATH=%PATH%;Q:\Common\bin\debug;Q:\Oem\ACE\ACE_wrappers\lib;Q:\Oem\dbxml-2.3.10\bin\debug;Q:\Oem\geos\VisualStudio\Debug
+set PATH=%PATH%;Q:\Common\bin\release;Q:\Oem\dbxml-2.3.10\bin;Q:\Oem\geos\VisualStudio\Release
echo on
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/MgDev/Common/Geometry/GeometryExceptionDef.h
===================================================================
--- trunk/MgDev/Common/Geometry/GeometryExceptionDef.h 2014-08-23 09:46:01 UTC (rev 8344)
+++ trunk/MgDev/Common/Geometry/GeometryExceptionDef.h 2014-08-23 22:56:14 UTC (rev 8345)
@@ -19,17 +19,20 @@
#ifndef MG_GEOMETRY_EXCEPTION_DEF_H
#define MG_GEOMETRY_EXCEPTION_DEF_H
+// NOTE: Semantic change with GEOS (since 3.0.0). GEOSException now inherits from
+// std::exception and is caught by const reference
+
#define MG_GEOMETRY_TRY() \
MG_TRY() \
#define MG_GEOMETRY_CATCH(methodName) \
} \
- catch (GEOSException* e) \
+ catch (const geos::util::GEOSException& e) \
{ \
MgStringCollection arguments; \
- arguments.Add(MgUtil::MultiByteToWideChar(e->toString())); \
- mgException = NULL; \
- delete e; \
+ std::string sWhat = e.what(); \
+ arguments.Add(MgUtil::MultiByteToWideChar(sWhat)); \
+ mgException = NULL; \
\
MG_CATCH(methodName) \
Modified: trunk/MgDev/Common/Geometry/Makefile.am
===================================================================
--- trunk/MgDev/Common/Geometry/Makefile.am 2014-08-23 09:46:01 UTC (rev 8344)
+++ trunk/MgDev/Common/Geometry/Makefile.am 2014-08-23 22:56:14 UTC (rev 8345)
@@ -445,7 +445,7 @@
-I../Foundation \
-I../Geometry \
-I../../Oem/ACE/ACE_wrappers \
- -I../../Oem/geos-2.2.0/source/headers \
+ -I../../Oem/geos/include \
-I../../Oem/dbxml/xerces-c-src/src \
-I../../Oem/CsMap/Include \
-I../../Common/CoordinateSystem
@@ -454,7 +454,7 @@
-lACE \
-lMgFoundation \
../../Oem/CsMap/.libs/libCsmap.a \
- ../../Oem/geos-2.2.0/source/geom/.libs/libgeos.a
+ ../../Oem/geos/src/.libs/libgeos.a
libMgGeometry_la_LDFLAGS = -release $(PACKAGE_VERSION) \
-L../../Oem/ACE/ACE_wrappers/ace \
Modified: trunk/MgDev/Common/MapGuideCommon/Makefile.am
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/Makefile.am 2014-08-23 09:46:01 UTC (rev 8344)
+++ trunk/MgDev/Common/MapGuideCommon/Makefile.am 2014-08-23 22:56:14 UTC (rev 8345)
@@ -273,7 +273,7 @@
-I../Foundation \
-I../Geometry \
-I../../Oem/ACE/ACE_wrappers \
- -I../../Oem/geos-2.2.0/source/headers \
+ -I../../Oem/geos/source/headers \
-I../../Oem/dbxml/xerces-c-src/src
libMgMapGuideCommon_la_LIBADD = \
Modified: trunk/MgDev/Common/PlatformBase/Makefile.am
===================================================================
--- trunk/MgDev/Common/PlatformBase/Makefile.am 2014-08-23 09:46:01 UTC (rev 8344)
+++ trunk/MgDev/Common/PlatformBase/Makefile.am 2014-08-23 22:56:14 UTC (rev 8345)
@@ -248,7 +248,7 @@
-I../Foundation \
-I../Geometry \
-I../../Oem/ACE/ACE_wrappers \
- -I../../Oem/geos-2.2.0/source/headers \
+ -I../../Oem/geos/source/headers \
-I../../Oem/dbxml/xerces-c-src/src
libMgPlatformBase_la_LIBADD = \
Property changes on: trunk/MgDev/Desktop
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev/Desktop:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006,7152
/branches/2.5/MgDev/Desktop:7511
/branches/2.6/MgDev/Desktop:8276-8286,8314-8315
/sandbox/jng/createruntimemap/Desktop:7486-7555
/sandbox/jng/v30/Desktop:8215-8216,8218-8219
/sandbox/rfc94/Desktop:5099-5163
+ /branches/2.4/MgDev/Desktop:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006,7152
/branches/2.5/MgDev/Desktop:7511
/branches/2.6/MgDev/Desktop:8276-8286,8314-8315
/sandbox/jng/createruntimemap/Desktop:7486-7555
/sandbox/jng/geos34x/Desktop:8256-8259
/sandbox/jng/v30/Desktop:8215-8216,8218-8219
/sandbox/rfc94/Desktop:5099-5163
Modified: trunk/MgDev/Desktop/UnitTest/UnitTest.vcxproj
===================================================================
--- trunk/MgDev/Desktop/UnitTest/UnitTest.vcxproj 2014-08-23 09:46:01 UTC (rev 8344)
+++ trunk/MgDev/Desktop/UnitTest/UnitTest.vcxproj 2014-08-23 22:56:14 UTC (rev 8345)
@@ -94,7 +94,7 @@
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-2.2.0\VisualStudio\Debug\GEOSd.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 ..\..\Server\bin\Debug\MgGws*.* $(OutDir)
@@ -142,7 +142,7 @@
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-2.2.0\VisualStudio\Debug64\GEOSd.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 ..\..\Server\bin\Debug64\MgGws*.* $(OutDir)
@@ -190,7 +190,7 @@
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-2.2.0\VisualStudio\Release\GEOS.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 ..\..\Server\bin\Release\MgGws*.* $(OutDir)
@@ -242,7 +242,7 @@
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-2.2.0\VisualStudio\Release64\GEOS.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 ..\..\Server\bin\Release64\MgGws*.* $(OutDir)
Modified: trunk/MgDev/Oem/oem.sln
===================================================================
--- trunk/MgDev/Oem/oem.sln 2014-08-23 09:46:01 UTC (rev 8344)
+++ trunk/MgDev/Oem/oem.sln 2014-08-23 22:56:14 UTC (rev 8345)
@@ -43,7 +43,7 @@
{3CECB989-0B34-449D-9161-8BEE074D7EC0} = {3CECB989-0B34-449D-9161-8BEE074D7EC0}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GEOS", "geos-2.2.0\VisualStudio\GEOS.vcxproj", "{1B9196BF-C194-47BC-846A-D9BBB134F2B3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GEOS", "geos\VisualStudio\GEOS.vcxproj", "{1B9196BF-C194-47BC-846A-D9BBB134F2B3}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cppunit", "CppUnit-1.9.14\src\cppunit\cppunit.vcxproj", "{AA0817E7-095C-465C-90B3-9221DE17EC70}"
EndProject
Modified: trunk/MgDev/Server/src/PostBuild/PostBuild.mak
===================================================================
--- trunk/MgDev/Server/src/PostBuild/PostBuild.mak 2014-08-23 09:46:01 UTC (rev 8344)
+++ trunk/MgDev/Server/src/PostBuild/PostBuild.mak 2014-08-23 22:56:14 UTC (rev 8345)
@@ -58,11 +58,11 @@
..\..\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-2.2.0\VisualStudio\Debug\GEOSd.dll
- xcopy /r /d /y ..\..\..\Oem\geos-2.2.0\VisualStudio\Debug\GEOSd.dll ..\..\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-2.2.0\VisualStudio\Debug\GEOSd.pdb
- xcopy /r /d /y ..\..\..\Oem\geos-2.2.0\VisualStudio\Debug\GEOSd.pdb ..\..\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\
@@ -330,11 +330,11 @@
..\..\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-2.2.0\VisualStudio\Debug64\GEOSd.dll
- xcopy /r /d /y ..\..\..\Oem\geos-2.2.0\VisualStudio\Debug64\GEOSd.dll ..\..\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-2.2.0\VisualStudio\Debug64\GEOSd.pdb
- xcopy /r /d /y ..\..\..\Oem\geos-2.2.0\VisualStudio\Debug64\GEOSd.pdb ..\..\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\
@@ -602,11 +602,11 @@
..\..\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-2.2.0\VisualStudio\Release\GEOS.dll
- xcopy /r /d /y ..\..\..\Oem\geos-2.2.0\VisualStudio\Release\GEOS.dll ..\..\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-2.2.0\VisualStudio\Release\GEOS.pdb
- xcopy /r /d /y ..\..\..\Oem\geos-2.2.0\VisualStudio\Release\GEOS.pdb ..\..\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\
@@ -874,11 +874,11 @@
..\..\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-2.2.0\VisualStudio\Release64\GEOS.dll
- xcopy /r /d /y ..\..\..\Oem\geos-2.2.0\VisualStudio\Release64\GEOS.dll ..\..\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-2.2.0\VisualStudio\Release64\GEOS.pdb
- xcopy /r /d /y ..\..\..\Oem\geos-2.2.0\VisualStudio\Release64\GEOS.pdb ..\..\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\
@@ -1702,11 +1702,11 @@
..\..\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-2.2.0\VisualStudio\debug(v100)\GEOSd.dll
- xcopy /r /d /y ..\..\..\Oem\geos-2.2.0\VisualStudio\debug(v100)\GEOSd.dll ..\..\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-2.2.0\VisualStudio\debug(v100)\GEOSd.pdb
- xcopy /r /d /y ..\..\..\Oem\geos-2.2.0\VisualStudio\debug(v100)\GEOSd.pdb ..\..\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)\
@@ -1967,11 +1967,11 @@
..\..\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-2.2.0\VisualStudio\debug(v100)64\GEOSd.dll
- xcopy /r /d /y ..\..\..\Oem\geos-2.2.0\VisualStudio\debug(v100)64\GEOSd.dll ..\..\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-2.2.0\VisualStudio\debug(v100)64\GEOSd.pdb
- xcopy /r /d /y ..\..\..\Oem\geos-2.2.0\VisualStudio\debug(v100)64\GEOSd.pdb ..\..\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\
@@ -2232,11 +2232,11 @@
..\..\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-2.2.0\VisualStudio\release(v100)\GEOS.dll
- xcopy /r /d /y ..\..\..\Oem\geos-2.2.0\VisualStudio\release(v100)\GEOS.dll ..\..\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-2.2.0\VisualStudio\release(v100)\GEOS.pdb
- xcopy /r /d /y ..\..\..\Oem\geos-2.2.0\VisualStudio\release(v100)\GEOS.pdb ..\..\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)\
@@ -2497,11 +2497,11 @@
..\..\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-2.2.0\VisualStudio\release(v100)64\GEOS.dll
- xcopy /r /d /y ..\..\..\Oem\geos-2.2.0\VisualStudio\release(v100)64\GEOS.dll ..\..\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-2.2.0\VisualStudio\release(v100)64\GEOS.pdb
- xcopy /r /d /y ..\..\..\Oem\geos-2.2.0\VisualStudio\release(v100)64\GEOS.pdb ..\..\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\
Modified: trunk/MgDev/Server/src/UnitTesting/TestGeometry.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestGeometry.cpp 2014-08-23 09:46:01 UTC (rev 8344)
+++ trunk/MgDev/Server/src/UnitTesting/TestGeometry.cpp 2014-08-23 22:56:14 UTC (rev 8345)
@@ -1546,19 +1546,29 @@
MgWktReaderWriter readerWriter;
MgGeometryFactory factory;
+ //NOTE: Somewhere between GEOS 2.2.0 and GEOS 3.4.2 the result of a symetric difference
+ //is sensitive to the order of the operand geometries. For tests where we're comparing
+ //against an expected result, the operands have been flipped to provide the correct result
+ //
+ //eg. TEST 1 (GEOS 2.2.0)
+ //Ptr<MgGeometry> geom = point->SymetricDifference(pointCoord);
+ //
+ //eg. TEST 1 (GEOS 3.4.2)
+ //Ptr<MgGeometry> geom = pointCoord->SymetricDifference(point);
+
//TEST 1
STRING base = L"MULTIPOINT (4 8, 5 3)";
Ptr<MgPoint> point = CreatePoint();
Ptr<MgCoordinate> coord = factory.CreateCoordinateXY(4.0, 8.0);
Ptr<MgPoint> pointCoord = factory.CreatePoint(coord);
- Ptr<MgGeometry> geom = point->SymetricDifference(pointCoord);
+ Ptr<MgGeometry> geom = pointCoord->SymetricDifference(point);
STRING found = readerWriter.Write(geom);
CPPUNIT_ASSERT(CheckGeometry(found, base));
//TEST 2
base = L"GEOMETRYCOLLECTION (POINT (5 3), LINESTRING (0 1, 2 3, 4 5))";
Ptr<MgLineString> lineString = CreateLineString();
- geom = lineString->SymetricDifference(point);
+ geom = point->SymetricDifference(lineString);
found = readerWriter.Write(geom);
CPPUNIT_ASSERT(CheckGeometry(found, base));
@@ -1566,32 +1576,32 @@
base = L"POLYGON ((4 5, 5 5, 5 0, 0 0, 0 1, 0 5, 4 5), (1 1, 2 1, 2 2, 1 1),"
L" (3 3, 4 3, 4 4, 3 3))";
Ptr<MgPolygon> polygon = CreatePolygon();
- geom = polygon->SymetricDifference(lineString);
+ geom = lineString->SymetricDifference(polygon);
found = readerWriter.Write(geom);
CPPUNIT_ASSERT(CheckGeometry(found, base));
//TEST 4
base = L"GEOMETRYCOLLECTION (LINESTRING (0 0, -0.049331651274742601 0.18445058333395731, -0.076070558282857095 0.37350258771831019, -0.0798268075493902 0.5643992092210961, -0.060545624501699299 0.75435674523904783, -0.018508172206062701 0.94060518714990526, 0 0.99246192690647705, 1.5 1.5, 2 1), POLYGON ((3 0, 0 0, 0 0.99246192690647705, 0 5, 5 5, 5 0, 3 0), (1 1, 2 1, 2 2, 1.5 1.5, 1 1), (3 3, 4 3, 4 4,3 3)))";
Ptr<MgCurveString> curveString = CreateCurveString(0.0);
- geom = curveString->SymetricDifference(polygon);
+ geom = polygon->SymetricDifference(curveString);
found = readerWriter.Write(geom);
CPPUNIT_ASSERT(CheckGeometry(found, base));
//TEST 5
Ptr<MgCurvePolygon> curvePolygon = CreateCurvePolygon(0.0);
- geom = curvePolygon->SymetricDifference(pointCoord);
+ geom = pointCoord->SymetricDifference(curvePolygon);
//TEST 6
base = L"MULTIPOINT (1 2, 4 5, 5 3, 7 8)";
Ptr<MgMultiPoint> multiPoint = CreateMultiPoint();
- geom = multiPoint->SymetricDifference(point);
+ geom = point->SymetricDifference(multiPoint);
found = readerWriter.Write(geom);
CPPUNIT_ASSERT(CheckGeometry(found, base));
//TEST 7
base = L"GEOMETRYCOLLECTION (POINT (7 8), LINESTRING (0 1, 3 4, 6 7, 9 10, 12 13, 15 16))";
Ptr<MgMultiLineString> multiLineString = CreateMultiLineString();
- geom = multiLineString->SymetricDifference(multiPoint);
+ geom = multiPoint->SymetricDifference(multiLineString);
found = readerWriter.Write(geom);
CPPUNIT_ASSERT(CheckGeometry(found, base));
@@ -1600,7 +1610,7 @@
L" POLYGON ((5 0, 0 0, 0 1, 0 5, 4 5, 5 5, 5 0), (1 1, 2 1, 2 2, 1 1),"
L" (3 3, 4 3, 4 4, 3 3)))";
Ptr<MgMultiPolygon> multiPolygon = CreateMultiPolygon();
- geom = multiPolygon->SymetricDifference(multiLineString);
+ geom = multiLineString->SymetricDifference(multiPolygon);
found = readerWriter.Write(geom);
CPPUNIT_ASSERT(CheckGeometry(found, base));
@@ -1609,17 +1619,17 @@
L" LINESTRING (100 100, 100 101, 101 102, 103 100, 103 102, 200 200, 200 201,"
L" 201 202, 203 200, 203 202, 300 300, 300 301, 301 302, 303 300, 303 302))";
Ptr<MgMultiCurveString> multiCurveString = CreateMultiCurveString();
- geom = multiCurveString->SymetricDifference(multiPoint);
+ geom = multiPoint->SymetricDifference(multiCurveString);
found = readerWriter.Write(geom);
CPPUNIT_ASSERT(CheckGeometry(found, base));
//TEST 10
Ptr<MgMultiCurvePolygon> multiCurvePolygon = CreateMultiCurvePolygon(3, 0.0);
- geom = multiCurvePolygon->SymetricDifference(curvePolygon);
+ geom = curvePolygon->SymetricDifference(multiCurvePolygon);
//TEST 11
Ptr<MgMultiGeometry> multiGeometry = CreateMultiGeometry();
- geom = multiGeometry->SymetricDifference(multiCurvePolygon);
+ geom = multiCurvePolygon->SymetricDifference(multiGeometry);
}
catch (MgException* e)
{
@@ -2175,7 +2185,7 @@
//TEST 12
Ptr<MgMultiGeometry> multiGeometry = CreateMultiGeometry();
area = multiGeometry->GetArea();
- CPPUNIT_ASSERT(area == 23.375);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(area, 23.375, 0.0001);
//TEST 13
Ptr<MgCoordinate> coord1 = factory.CreateCoordinateXYZ(-45.0, -45.0, 1.0);
Modified: trunk/MgDev/Web/src/MapGuideApi/copydlls.bat
===================================================================
--- trunk/MgDev/Web/src/MapGuideApi/copydlls.bat 2014-08-23 09:46:01 UTC (rev 8344)
+++ trunk/MgDev/Web/src/MapGuideApi/copydlls.bat 2014-08-23 22:56:14 UTC (rev 8345)
@@ -38,7 +38,7 @@
xcopy /r /d /y "..\..\..\Oem\ACE\ACE_wrappers\lib\%2\ACE.dll" %WEB_BIN_RELEASE%
echo Copying GEOS Release DLL to %WEB_BIN_RELEASE%
-xcopy /r /d /y "..\..\..\Oem\geos-2.2.0\VisualStudio\%2\GEOS.dll" %WEB_BIN_RELEASE%
+xcopy /r /d /y "..\..\..\Oem\geos\VisualStudio\%2\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%
@@ -78,7 +78,7 @@
xcopy /r /d /y "..\..\..\Oem\ACE\ACE_wrappers\lib64\%2\ACE.dll" %WEB_BIN_RELEASE%64
echo Copying GEOS Release DLL to %WEB_BIN_RELEASE%64
-xcopy /r /d /y "..\..\..\Oem\geos-2.2.0\VisualStudio\%264\GEOS.dll" %WEB_BIN_RELEASE%64
+xcopy /r /d /y "..\..\..\Oem\geos\VisualStudio\%264\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
@@ -118,7 +118,7 @@
xcopy /r /d /y "..\..\..\Oem\ACE\ACE_wrappers\lib\%2\ACEd.dll" %WEB_BIN_DEBUG%
echo Copying GEOS Debug DLL to %WEB_BIN_DEBUG%
-xcopy /r /d /y "..\..\..\Oem\geos-2.2.0\VisualStudio\%2\GEOSd.dll" %WEB_BIN_DEBUG%
+xcopy /r /d /y "..\..\..\Oem\geos\VisualStudio\%2\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%
@@ -158,7 +158,7 @@
xcopy /r /d /y "..\..\..\Oem\ACE\ACE_wrappers\lib64\%2\ACEd.dll" %WEB_BIN_DEBUG%64
echo Copying GEOS Debug DLL to %WEB_BIN_DEBUG%64
-xcopy /r /d /y "..\..\..\Oem\geos-2.2.0\VisualStudio\%264\GEOSd.dll" %WEB_BIN_DEBUG%64
+xcopy /r /d /y "..\..\..\Oem\geos\VisualStudio\%264\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
Modified: trunk/MgDev/build_oem.sh
===================================================================
--- trunk/MgDev/build_oem.sh 2014-08-23 09:46:01 UTC (rev 8344)
+++ trunk/MgDev/build_oem.sh 2014-08-23 22:56:14 UTC (rev 8345)
@@ -220,32 +220,35 @@
}
#**********************************************************
-# Build GEOS 2.2.0
+# Build GEOS 3.4.2
# Notes: none
#**********************************************************
init_geos()
{
- LIB_NAME="GEOS 2.2.0"
+ LIB_NAME="GEOS 3.4.2"
}
build_geos()
{
- pushd geos-2.2.0
+ pushd geos
+ # For this version of GEOS, don't run the aclocal/libtoolize/automake/autoconf quartet as we normally do, as it
+ # may produce an unusable configure script. Just run autoreconf to regenerate the configure script from configure.in
+ autoreconf
if [ $BUILD_CPU -eq 64 ]; then
- sh ./configure --with-pic --prefix="${INSTALLDIR}"
+ sh ./configure --with-pic --enable-silent-rules --prefix="${INSTALLDIR}"
else
- sh ./configure --prefix="${INSTALLDIR}"
+ sh ./configure --enable-silent-rules --prefix="${INSTALLDIR}"
fi
make
# The check build is disabled as the build will fail with automake version < 2.59
- # check_build
+ check_build
popd
}
clean_geos()
{
- pushd geos-2.2.0
+ pushd geos
make clean
check_clean
popd
Modified: trunk/MgDev/build_sdk.bat
===================================================================
--- trunk/MgDev/build_sdk.bat 2014-08-23 09:46:01 UTC (rev 8344)
+++ trunk/MgDev/build_sdk.bat 2014-08-23 22:56:14 UTC (rev 8345)
@@ -306,8 +306,8 @@
%XCOPY% /S "%MG_OEM%\ACE\ACE_wrappers\ace\*.cpp" "%MG_SDK_INC%\ACE_wrappers\ACE" /EXCLUDE:svn_excludes.txt
echo [install]: SDK - Oem (GEOS)
rem Same with GEOS
-copy /Y "%MG_OEM%\geos-2.2.0\VisualStudio\%TYPEBUILD%\GEOS.dll" "%MG_SDK_BIN%"
-copy /Y "%MG_OEM%\geos-2.2.0\VisualStudio\%TYPEBUILD%\GEOS.pdb" "%MG_SDK_BIN%"
+copy /Y "%MG_OEM%\geos\VisualStudio\%TYPEBUILD%\GEOS.dll" "%MG_SDK_BIN%"
+copy /Y "%MG_OEM%\geos\VisualStudio\%TYPEBUILD%\GEOS.pdb" "%MG_SDK_BIN%"
echo [install]: SDK - Oem (xerces)
rem Same with xerces
copy /Y "%MG_OEM%\dbxml\xerces-c-src\Build\Win32\VC9\%TYPEBUILD%\xerces-c_3_1mg.dll" "%MG_SDK_BIN%"
Modified: trunk/MgDev/run_tests.bat
===================================================================
--- trunk/MgDev/run_tests.bat 2014-08-23 09:46:01 UTC (rev 8344)
+++ trunk/MgDev/run_tests.bat 2014-08-23 22:56:14 UTC (rev 8345)
@@ -11,6 +11,7 @@
SET SERVER_ADDR=localhost
SET WEBCONFIGINI=%CD%\UnitTest\webconfig.ini
SET SERVER_PORT=8018
+SET PATH=D:\mg-trunk\MgDev\Release\Web\Php;%PATH%;
REM SET WEBCONFIGINI=C:\Program Files\OSGeo\MapGuide\Web\www\webconfig.ini
REM SET SERVER_PORT=80
SET PHP_TEST_CWD=%CD%\Web\src\mapagent
@@ -22,7 +23,7 @@
SET PREPARE_PHP_WEBSERVER=1
SET RUN_SERVER_TESTS=0
SET RUN_PHP_TESTS=1
-SET RUN_DOTNET_TESTS=0
+SET RUN_DOTNET_TESTS=1
SET RETURN_CODE=0
More information about the mapguide-commits
mailing list