[mapguide-commits] r9362 - in branches/3.1/MgDev: . Common/CoordinateSystem
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Mar 6 06:27:16 PST 2018
Author: jng
Date: 2018-03-06 06:27:16 -0800 (Tue, 06 Mar 2018)
New Revision: 9362
Modified:
branches/3.1/MgDev/
branches/3.1/MgDev/Common/CoordinateSystem/CoordSysMathComparator.cpp
branches/3.1/MgDev/build.bat
Log:
Merged revision(s) 9353, 9360 from trunk/MgDev:
build.bat: Test for "errorlevel not equal to 0" instead of "errorlevel equal to 1" and lay more of these errorlevel checks throughout
........
Disable invalid assertion in CCoordinateSystemMathComparator::SameCoordinateSystem
Fixes #1827
........
Index: branches/3.1/MgDev
===================================================================
--- branches/3.1/MgDev 2018-03-06 14:13:18 UTC (rev 9361)
+++ branches/3.1/MgDev 2018-03-06 14:27:16 UTC (rev 9362)
Property changes on: branches/3.1/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
## -15,4 +15,4 ##
/sandbox/jng/tiling:8174-8208
/sandbox/jng/v30:8212-8227
/sandbox/rfc94:5099-5163
-/trunk/MgDev:8955-8956,8969,8980-8981,8986,8996,9000,9004-9006,9010,9018-9021,9034,9038,9042,9094,9106-9107,9147,9339-9343
\ No newline at end of property
+/trunk/MgDev:8955-8956,8969,8980-8981,8986,8996,9000,9004-9006,9010,9018-9021,9034,9038,9042,9094,9106-9107,9147,9339-9343,9353,9360
\ No newline at end of property
Modified: branches/3.1/MgDev/Common/CoordinateSystem/CoordSysMathComparator.cpp
===================================================================
--- branches/3.1/MgDev/Common/CoordinateSystem/CoordSysMathComparator.cpp 2018-03-06 14:13:18 UTC (rev 9361)
+++ branches/3.1/MgDev/Common/CoordinateSystem/CoordSysMathComparator.cpp 2018-03-06 14:27:16 UTC (rev 9362)
@@ -484,8 +484,13 @@
// Map scale is rarely (if ever) used and us usally set to unity.
if (!FloatEqual(def1.map_scl, def2.map_scl, kdEpsilonScale)) return false;
+ //Disabling assertion below (per: https://trac.osgeo.org/mapguide/ticket/1827):
+ //
+ // CSMAP generates the unit_scl value from the ellipsoid / datum when an ellipsoid / datum is set via [CoordSys::SetEllipsoid / SetDatum] methods.
+ // When then comparing the resulting coordinate system objects, the ellipsoids are considered the same (by the math comparator) but the unit scales are not; at least not by the assert
+ //
//If the units match, the unit scale matches.
- assert(FloatEqual(def1.unit_scl, def2.unit_scl, kdEpsilonScale));
+ //assert(FloatEqual(def1.unit_scl, def2.unit_scl, kdEpsilonScale));
//Note: We deliberately do not make any assertion
//about def1.scale being equal to def2.scale. They
Modified: branches/3.1/MgDev/build.bat
===================================================================
--- branches/3.1/MgDev/build.bat 2018-03-06 14:13:18 UTC (rev 9361)
+++ branches/3.1/MgDev/build.bat 2018-03-06 14:27:16 UTC (rev 9362)
@@ -144,13 +144,16 @@
:clean_oem
echo [clean]: Clean Oem
%MSBUILD_CLEAN% %MG_OEM%\Oem.sln
+if not "%errorlevel%"=="0" goto error
echo [clean]: Clean Oem - CS-Map
%MSBUILD_CLEAN% %MG_OEM%\CSMap\VC110\OpenSource.sln
+if not "%errorlevel%"=="0" goto error
if not "%TYPECOMPONENT%"=="all" goto quit
:clean_server
echo [clean]: Clean Server
%MSBUILD_CLEAN% %MG_SERVER%\Server.sln
+if not "%errorlevel%"=="0" goto error
if not "%TYPECOMPONENT%"=="all" goto quit
:clean_web
@@ -185,11 +188,11 @@
:build_oem
echo [build]: Building Oem
%MSBUILD% %MG_OEM%\Oem.sln
-if "%errorlevel%"=="1" goto error
+if not "%errorlevel%"=="0" 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\VC140\OpenSource.sln
-if "%errorlevel%"=="1" goto error
+if not "%errorlevel%"=="0" goto error
if "%TYPECOMPONENT%"=="oem" goto quit
if "%TYPECOMPONENT%"=="server" goto quit
if "%TYPECOMPONENT%"=="web" goto quit
@@ -198,7 +201,7 @@
:build_server
echo [build]: Building Server
%MSBUILD% %MG_SERVER%\Server.sln
-if "%errorlevel%"=="1" goto error
+if not "%errorlevel%"=="0" goto error
if "%TYPECOMPONENT%"=="oem" goto quit
if "%TYPECOMPONENT%"=="server" goto quit
if "%TYPECOMPONENT%"=="web" goto quit
@@ -207,7 +210,7 @@
:build_web
echo [build]: Building Web Tier
%MSBUILD% %MG_WEB_SRC%\WebTier.sln
-if "%errorlevel%"=="1" goto error
+if not "%errorlevel%"=="0" goto error
if "%TYPECOMPONENT%"=="oem" goto quit
if "%TYPECOMPONENT%"=="server" goto quit
if "%TYPECOMPONENT%"=="web" goto quit
@@ -318,12 +321,16 @@
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"
+if not "%errorlevel%"=="0" goto error
echo [build]: Web Tier - Build Fusion API docs
call %ANT% docs -f "%MG_OEM%\fusion\build.xml"
+if not "%errorlevel%"=="0" goto error
echo [install]: Web Tier - fusion
call %ANT% deploy -Ddeploy.home="%MG_OUTPUT_WEB%\www\fusion" -f "%MG_OEM%\fusion\build.xml"
+if not "%errorlevel%"=="0" goto error
echo [install]: Fusion - build pack
call %ANT% selfbuild -Dselfbuild.home="%MG_OUTPUT%\fusion-selfbuild" -f "%MG_OEM%\fusion\build.xml"
+if not "%errorlevel%"=="0" goto error
echo [install]: Web Tier - fusion templates
%XCOPY% "%MG_OEM%\fusionMG" "%MG_OUTPUT_WEB%\www\fusion" /EXCLUDE:svn_excludes.txt+%CONFIGURATION%_excludes.txt
echo [install]: Web Tier - Apache module
@@ -362,6 +369,7 @@
echo [build]: Sheboygan Sample data set
pushd %MG_DEV%\UnitTest\TestData\Samples\Sheboygan
call build.bat
+ if not "%errorlevel%"=="0" goto error
popd
)
copy /Y "%MG_DEV%\UnitTest\TestData\Samples\Sheboygan\Sheboygan.mgp" "%MG_OUTPUT%"
More information about the mapguide-commits
mailing list