[mapguide-commits] r5889 - in trunk/MgDev:
Oem/CppUnit-1.9.14/src/cppunit Server/src/UnitTesting
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Jun 1 02:20:11 EDT 2011
Author: hubu
Date: 2011-05-31 23:20:11 -0700 (Tue, 31 May 2011)
New Revision: 5889
Modified:
trunk/MgDev/Oem/CppUnit-1.9.14/src/cppunit/cppunit.vcxproj
trunk/MgDev/Server/src/UnitTesting/TestCoordinateSystem.cpp
trunk/MgDev/Server/src/UnitTesting/TestFeatureService.cpp
trunk/MgDev/Server/src/UnitTesting/TestGeometry.cpp
trunk/MgDev/Server/src/UnitTesting/TestKmlService.cpp
trunk/MgDev/Server/src/UnitTesting/TestLogManager.cpp
trunk/MgDev/Server/src/UnitTesting/TestMappingService.cpp
trunk/MgDev/Server/src/UnitTesting/TestMdfModel.cpp
trunk/MgDev/Server/src/UnitTesting/TestPerformance.cpp
trunk/MgDev/Server/src/UnitTesting/TestRenderingService.cpp
trunk/MgDev/Server/src/UnitTesting/TestResourceService.cpp
trunk/MgDev/Server/src/UnitTesting/TestServerAdminService.cpp
trunk/MgDev/Server/src/UnitTesting/TestServerManager.cpp
trunk/MgDev/Server/src/UnitTesting/TestServiceManager.cpp
trunk/MgDev/Server/src/UnitTesting/TestSiteManager.cpp
trunk/MgDev/Server/src/UnitTesting/TestSiteService.cpp
trunk/MgDev/Server/src/UnitTesting/TestTileService.cpp
trunk/MgDev/Server/src/UnitTesting/TestTransformMesh.cpp
trunk/MgDev/Server/src/UnitTesting/UnitTesting.cpp
Log:
RFC107 - porting mapguide server to VS2010.
Fix break build of Unit testing on vs2010.
Modified: trunk/MgDev/Oem/CppUnit-1.9.14/src/cppunit/cppunit.vcxproj
===================================================================
--- trunk/MgDev/Oem/CppUnit-1.9.14/src/cppunit/cppunit.vcxproj 2011-06-01 05:13:42 UTC (rev 5888)
+++ trunk/MgDev/Oem/CppUnit-1.9.14/src/cppunit/cppunit.vcxproj 2011-06-01 06:20:11 UTC (rev 5889)
@@ -152,9 +152,9 @@
</Lib>
<PostBuildEvent>
<Message>Copying target to lib64/</Message>
- <Command>if not exist ..\..\lib mkdir ..\..\lib
-copy "$(TargetPath)" ..\..\lib\"$(TargetName)".lib
-copy "$(TargetDir)""$(TargetName)".pdb ..\..\lib\"$(TargetName)".pdb
+ <Command>if not exist ..\..\lib64 mkdir ..\..\lib64
+copy "$(TargetPath)" ..\..\lib64\"$(TargetName)".lib
+copy "$(TargetDir)""$(TargetName)".pdb ..\..\lib64\"$(TargetName)".pdb
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
@@ -227,8 +227,8 @@
</Lib>
<PostBuildEvent>
<Message>Copying target to lib64/</Message>
- <Command>if not exist ..\..\lib mkdir ..\..\lib
-copy "$(TargetPath)" ..\..\lib\"$(TargetName)".lib
+ <Command>if not exist ..\..\lib64 mkdir ..\..\lib64
+copy "$(TargetPath)" ..\..\lib64\"$(TargetName)".lib
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
Modified: trunk/MgDev/Server/src/UnitTesting/TestCoordinateSystem.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestCoordinateSystem.cpp 2011-06-01 05:13:42 UTC (rev 5888)
+++ trunk/MgDev/Server/src/UnitTesting/TestCoordinateSystem.cpp 2011-06-01 06:20:11 UTC (rev 5889)
@@ -18,6 +18,7 @@
#include "MapGuideCommon.h"
#include "TestCoordinateSystem.h"
#include "CppUnitExtensions.h"
+#include "FoundationDefs.h"
#ifndef _WIN32
#define stricmp strcasecmp
Modified: trunk/MgDev/Server/src/UnitTesting/TestFeatureService.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestFeatureService.cpp 2011-06-01 05:13:42 UTC (rev 5888)
+++ trunk/MgDev/Server/src/UnitTesting/TestFeatureService.cpp 2011-06-01 06:20:11 UTC (rev 5889)
@@ -23,8 +23,8 @@
#include "Services/FeatureService.h"
#include "ServerFeatureService.h"
#include "Fdo.h"
+#include "FoundationDefs.h"
-
const STRING TEST_LOCALE = L"en";
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(TestFeatureService, "TestFeatureService");
Modified: trunk/MgDev/Server/src/UnitTesting/TestGeometry.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestGeometry.cpp 2011-06-01 05:13:42 UTC (rev 5888)
+++ trunk/MgDev/Server/src/UnitTesting/TestGeometry.cpp 2011-06-01 06:20:11 UTC (rev 5889)
@@ -18,8 +18,8 @@
#include "MapGuideCommon.h"
#include "TestGeometry.h"
#include "CppUnitExtensions.h"
+#include "FoundationDefs.h"
-
const STRING ArbitraryWkt = L"LOCAL_CS [ \"Non-Earth (Mile)\", LOCAL_DATUM [\"Local Datum\", 0], UNIT [\"Mile_US\", 1609.344], AXIS [\"X\", EAST], AXIS[\"Y\", NORTH]]";
const STRING GeographicWkt = L"GEOGCS[\"LL84\",DATUM[\"WGS84\",SPHEROID[\"WGS84\",6378137.000,298.25722293]],PRIMEM[\"Greenwich\",0],UNIT[\"Degree\",0.017453292519943295]]";
const STRING ProjectedWkt = L"PROJCS[\"GA-W\",GEOGCS[\"LL27\",DATUM[\"NAD27\",SPHEROID[\"CLRK66\",6378206.400,294.97869821]],PRIMEM[\"Greenwich\",0],UNIT[\"Degree\",0.017453292519943295]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"false_easting\",500000.000],PARAMETER[\"false_northing\",0.000],PARAMETER[\"scale_factor\",0.999900000000],PARAMETER[\"central_meridian\",-84.16666666666670],PARAMETER[\"latitude_of_origin\",30.00000000000000],UNIT[\"Foot_US\",0.30480060960122]]";
Modified: trunk/MgDev/Server/src/UnitTesting/TestKmlService.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestKmlService.cpp 2011-06-01 05:13:42 UTC (rev 5888)
+++ trunk/MgDev/Server/src/UnitTesting/TestKmlService.cpp 2011-06-01 06:20:11 UTC (rev 5889)
@@ -21,7 +21,7 @@
#include "ServerResourceService.h"
#include "ServerSiteService.h"
#include "../Common/Manager/FdoConnectionManager.h"
-
+#include "FoundationDefs.h"
const STRING TEST_LOCALE = L"en";
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(TestKmlService, "TestKmlService");
Modified: trunk/MgDev/Server/src/UnitTesting/TestLogManager.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestLogManager.cpp 2011-06-01 05:13:42 UTC (rev 5888)
+++ trunk/MgDev/Server/src/UnitTesting/TestLogManager.cpp 2011-06-01 06:20:11 UTC (rev 5889)
@@ -20,7 +20,7 @@
#include "CppUnitExtensions.h"
#include "LogManager.h"
#include "TestLogManagerThread.h"
-
+#include "FoundationDefs.h"
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(TestLogManager, "TestLogManager");
const wchar_t TestName[] = L"TestName.log";
Modified: trunk/MgDev/Server/src/UnitTesting/TestMappingService.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestMappingService.cpp 2011-06-01 05:13:42 UTC (rev 5888)
+++ trunk/MgDev/Server/src/UnitTesting/TestMappingService.cpp 2011-06-01 06:20:11 UTC (rev 5889)
@@ -23,7 +23,7 @@
#include "ServerSiteService.h"
#include "../Common/Manager/FdoConnectionManager.h"
#include "CppUnitExtensions.h"
-
+#include "FoundationDefs.h"
const STRING TEST_LOCALE = L"en";
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(TestMappingService, "TestMappingService");
Modified: trunk/MgDev/Server/src/UnitTesting/TestMdfModel.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestMdfModel.cpp 2011-06-01 05:13:42 UTC (rev 5888)
+++ trunk/MgDev/Server/src/UnitTesting/TestMdfModel.cpp 2011-06-01 06:20:11 UTC (rev 5889)
@@ -19,7 +19,7 @@
#include "TestMdfModel.h"
#include "ServiceManager.h"
#include "SAX2Parser.h"
-
+#include "FoundationDefs.h"
const STRING TEST_LOCALE = L"en";
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(TestMdfModel, "TestMdfModel");
Modified: trunk/MgDev/Server/src/UnitTesting/TestPerformance.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestPerformance.cpp 2011-06-01 05:13:42 UTC (rev 5888)
+++ trunk/MgDev/Server/src/UnitTesting/TestPerformance.cpp 2011-06-01 06:20:11 UTC (rev 5889)
@@ -23,7 +23,7 @@
#include "Services/FeatureService.h"
#include "ServerFeatureService.h"
#include "Fdo.h"
-
+#include "FoundationDefs.h"
// **************************************** PLEASE READ ****************************************
// Note: The resources used here require that the following packages are installed:
// 1) PerformanceTest.mgp
Modified: trunk/MgDev/Server/src/UnitTesting/TestRenderingService.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestRenderingService.cpp 2011-06-01 05:13:42 UTC (rev 5888)
+++ trunk/MgDev/Server/src/UnitTesting/TestRenderingService.cpp 2011-06-01 06:20:11 UTC (rev 5889)
@@ -23,7 +23,7 @@
#include "../Common/Manager/FdoConnectionManager.h"
//#include "GDRenderer.h"
//#include "AGGRenderer.h"
-
+#include "FoundationDefs.h"
const STRING TEST_LOCALE = L"en";
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(TestRenderingService, "TestRenderingService");
Modified: trunk/MgDev/Server/src/UnitTesting/TestResourceService.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestResourceService.cpp 2011-06-01 05:13:42 UTC (rev 5888)
+++ trunk/MgDev/Server/src/UnitTesting/TestResourceService.cpp 2011-06-01 06:20:11 UTC (rev 5889)
@@ -22,7 +22,7 @@
#include "CppUnitExtensions.h"
#include "SecurityCache.h"
#include "../Common/Manager/FdoConnectionManager.h"
-
+#include "FoundationDefs.h"
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(TestResourceService, "TestResourceService");
// define thread group for tiling tests
Modified: trunk/MgDev/Server/src/UnitTesting/TestServerAdminService.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestServerAdminService.cpp 2011-06-01 05:13:42 UTC (rev 5888)
+++ trunk/MgDev/Server/src/UnitTesting/TestServerAdminService.cpp 2011-06-01 06:20:11 UTC (rev 5889)
@@ -21,7 +21,7 @@
#include "ServerAdminService.h"
#include "TestServerAdminService.h"
#include "CppUnitExtensions.h"
-
+#include "FoundationDefs.h"
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(TestServerAdminService, "TestServerAdminService");
const STRING adminName = L"Administrator";
Modified: trunk/MgDev/Server/src/UnitTesting/TestServerManager.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestServerManager.cpp 2011-06-01 05:13:42 UTC (rev 5888)
+++ trunk/MgDev/Server/src/UnitTesting/TestServerManager.cpp 2011-06-01 06:20:11 UTC (rev 5889)
@@ -18,7 +18,7 @@
#include "MapGuideCommon.h"
#include "ServerManager.h"
#include "TestServerManager.h"
-
+#include "FoundationDefs.h"
const STRING TEST_LOCALE = L"en";
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(TestServerManager, "TestServerManager");
Modified: trunk/MgDev/Server/src/UnitTesting/TestServiceManager.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestServiceManager.cpp 2011-06-01 05:13:42 UTC (rev 5888)
+++ trunk/MgDev/Server/src/UnitTesting/TestServiceManager.cpp 2011-06-01 06:20:11 UTC (rev 5889)
@@ -18,7 +18,7 @@
#include "MapGuideCommon.h"
#include "ServiceManager.h"
#include "TestServiceManager.h"
-
+#include "FoundationDefs.h"
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(TestServiceManager, "TestServiceManager");
void TestServiceManager::setUp()
Modified: trunk/MgDev/Server/src/UnitTesting/TestSiteManager.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestSiteManager.cpp 2011-06-01 05:13:42 UTC (rev 5888)
+++ trunk/MgDev/Server/src/UnitTesting/TestSiteManager.cpp 2011-06-01 06:20:11 UTC (rev 5889)
@@ -17,7 +17,7 @@
#include "MapGuideCommon.h"
#include "TestSiteManager.h"
-
+#include "FoundationDefs.h"
const STRING TEST_SESSION_ID = L"48cb0286-0000-1000-8001-005056c00008_en_6F7A8590045708AE0D05";
const STRING TEST_TARGET = L"111.122.133.144";
const STRING TEST_SUPPORT_SERVER = L"144.133.122.111";
Modified: trunk/MgDev/Server/src/UnitTesting/TestSiteService.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestSiteService.cpp 2011-06-01 05:13:42 UTC (rev 5888)
+++ trunk/MgDev/Server/src/UnitTesting/TestSiteService.cpp 2011-06-01 06:20:11 UTC (rev 5889)
@@ -20,7 +20,7 @@
#include "ServerSiteService.h"
#include "TestSiteService.h"
#include "CppUnitExtensions.h"
-
+#include "FoundationDefs.h"
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(TestSiteService, "TestSiteService");
const STRING adminName = L"Administrator";
Modified: trunk/MgDev/Server/src/UnitTesting/TestTileService.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestTileService.cpp 2011-06-01 05:13:42 UTC (rev 5888)
+++ trunk/MgDev/Server/src/UnitTesting/TestTileService.cpp 2011-06-01 06:20:11 UTC (rev 5889)
@@ -21,7 +21,7 @@
#include "ServiceManager.h"
#include "ServerSiteService.h"
#include "../Common/Manager/FdoConnectionManager.h"
-
+#include "FoundationDefs.h"
#define PATH_LEN 512
// determines the number of requests to make, as a factor of the number of tiles
Modified: trunk/MgDev/Server/src/UnitTesting/TestTransformMesh.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestTransformMesh.cpp 2011-06-01 05:13:42 UTC (rev 5888)
+++ trunk/MgDev/Server/src/UnitTesting/TestTransformMesh.cpp 2011-06-01 06:20:11 UTC (rev 5889)
@@ -22,6 +22,7 @@
#include "TransformMesh.h"
#include "MgCSTrans.h"
#include "Bounds.h"
+#include "FoundationDefs.h"
const STRING GeographicWkt = L"GEOGCS[\"LL84\",DATUM[\"WGS84\",SPHEROID[\"WGS84\",6378137.000,298.25722293]],PRIMEM[\"Greenwich\",0],UNIT[\"Degree\",0.01745329251994]]";
Modified: trunk/MgDev/Server/src/UnitTesting/UnitTesting.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/UnitTesting.cpp 2011-06-01 05:13:42 UTC (rev 5888)
+++ trunk/MgDev/Server/src/UnitTesting/UnitTesting.cpp 2011-06-01 06:20:11 UTC (rev 5889)
@@ -22,7 +22,7 @@
#include <cppunit/XmlOutputter.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
#include <cppunit/ui/text/TestRunner.h>
-
+#include "FoundationDefs.h"
int Execute(CREFSTRING fileName, CREFSTRING test)
{
int nResult = 0;
More information about the mapguide-commits
mailing list