[mapguide-commits] r1337 - in trunk/MgDev: Common/CoordinateSystem
Common/Geometry Common/MapGuideCommon Common/PlatformBase Oem
Server/src/Core Server/src/PostBuild Server/src/UnitTesting
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Mar 21 19:28:35 EDT 2007
Author: stevedang
Date: 2007-03-21 19:28:35 -0400 (Wed, 21 Mar 2007)
New Revision: 1337
Modified:
trunk/MgDev/Common/CoordinateSystem/CoordinateSystem.vcproj
trunk/MgDev/Common/CoordinateSystem/Makefile.am
trunk/MgDev/Common/Geometry/Geometry.vcproj
trunk/MgDev/Common/Geometry/Makefile.am
trunk/MgDev/Common/MapGuideCommon/Makefile.am
trunk/MgDev/Common/PlatformBase/Makefile.am
trunk/MgDev/Oem/Makefile.am
trunk/MgDev/Oem/oem.sln
trunk/MgDev/Server/src/Core/Makefile.am
trunk/MgDev/Server/src/PostBuild/PostBuild.mak
trunk/MgDev/Server/src/UnitTesting/TestCoordinateSystem.cpp
Log:
GDAl 1.4.0 and PROJ 4.5.0 upgrades.
Modified: trunk/MgDev/Common/CoordinateSystem/CoordinateSystem.vcproj
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/CoordinateSystem.vcproj 2007-03-21 23:16:49 UTC (rev 1336)
+++ trunk/MgDev/Common/CoordinateSystem/CoordinateSystem.vcproj 2007-03-21 23:28:35 UTC (rev 1337)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""..\..\Oem\gdal-1.3.0\ogr\";"..\..\Oem\gdal-1.3.0\port\";"..\..\Oem\proj-4.4.9\src""
+ AdditionalIncludeDirectories=""..\..\Oem\gdal-1.4.0\ogr\";"..\..\Oem\gdal-1.4.0\port\";"..\..\Oem\proj-4.5.0\src""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true"
ExceptionHandling="2"
@@ -66,8 +66,8 @@
AdditionalDependencies="ogr.lib cpl.lib proj_i.lib"
OutputFile="$(OutDir)/MgCoordinateSystemd.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories=""..\..\Oem\gdal-1.3.0\ogr";"..\..\Oem\gdal-1.3.0\port";"..\..\Oem\proj-4.4.9\src""
- IgnoreDefaultLibraryNames="MSVCRT"
+ AdditionalLibraryDirectories=""..\..\Oem\gdal-1.4.0\ogr";"..\..\Oem\gdal-1.4.0\port";"..\..\Oem\proj-4.5.0\src""
+ IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/MgCoordinateSystemd.pdb"
SubSystem="2"
@@ -126,7 +126,7 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
OmitFramePointers="true"
- AdditionalIncludeDirectories=""..\..\Oem\gdal-1.3.0\ogr\";"..\..\Oem\gdal-1.3.0\port\";"..\..\Oem\proj-4.4.9\src""
+ AdditionalIncludeDirectories=""..\..\Oem\gdal-1.4.0\ogr\";"..\..\Oem\gdal-1.4.0\port\";"..\..\Oem\proj-4.5.0\src""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE"
StringPooling="true"
ExceptionHandling="2"
@@ -151,7 +151,7 @@
AdditionalDependencies="ogr.lib cpl.lib proj_i.lib"
OutputFile="$(OutDir)/MgCoordinateSystem.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories=""..\..\Oem\gdal-1.3.0\ogr";"..\..\Oem\gdal-1.3.0\port";"..\..\Oem\proj-4.4.9\src""
+ AdditionalLibraryDirectories=""..\..\Oem\gdal-1.4.0\ogr";"..\..\Oem\gdal-1.4.0\port";"..\..\Oem\proj-4.5.0\src""
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/MgCoordinateSystem.pdb"
Modified: trunk/MgDev/Common/CoordinateSystem/Makefile.am
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/Makefile.am 2007-03-21 23:16:49 UTC (rev 1336)
+++ trunk/MgDev/Common/CoordinateSystem/Makefile.am 2007-03-21 23:28:35 UTC (rev 1337)
@@ -3,9 +3,9 @@
EXTRA_DIST = categories.txt CoordinateSystem.rc CoordinateSystem.vcproj
INCLUDES = \
- -I../../Oem/gdal-1.3.0/ogr \
- -I../../Oem/gdal-1.3.0/port \
- -I../../Oem/proj-4.4.9/src
+ -I../../Oem/gdal-1.4.0/ogr \
+ -I../../Oem/gdal-1.4.0/port \
+ -I../../Oem/proj-4.5.0/src
lib_LTLIBRARIES = libMgCoordinateSystem.la
@@ -72,5 +72,5 @@
libMgCoordinateSystem_la_LIBADD = -lgdal -lproj
libMgCoordinateSystem_la_LDFLAGS = -version-info 7:0:0 \
- -L../../Oem/gdal-1.3.0 \
- -L../../Oem/proj-4.4.9/src
+ -L../../Oem/gdal-1.4.0 \
+ -L../../Oem/proj-4.5.0/src
Modified: trunk/MgDev/Common/Geometry/Geometry.vcproj
===================================================================
--- trunk/MgDev/Common/Geometry/Geometry.vcproj 2007-03-21 23:16:49 UTC (rev 1336)
+++ trunk/MgDev/Common/Geometry/Geometry.vcproj 2007-03-21 23:28:35 UTC (rev 1337)
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".\;..\Security;..\MdfModel;..\Foundation;..\CoordinateSystem;"..\..\Oem\geos-2.2.0\source\headers";"..\..\Oem\gdal-1.3.0\ogr";"..\..\Oem\gdal-1.3.0\port";"..\..\Oem\proj-4.4.9\src";..\..\oem\ace\ACE_wrappers"
+ AdditionalIncludeDirectories=".\;..\Security;..\MdfModel;..\Foundation;..\CoordinateSystem;"..\..\Oem\geos-2.2.0\source\headers";"..\..\Oem\gdal-1.4.0\ogr";"..\..\Oem\gdal-1.4.0\port";"..\..\Oem\proj-4.5.0\src";..\..\oem\ace\ACE_wrappers"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GEOMETRY_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -122,7 +122,7 @@
<Tool
Name="VCCLCompilerTool"
WholeProgramOptimization="false"
- AdditionalIncludeDirectories=".\;..\Security;..\MdfModel;..\Foundation;..\CoordinateSystem;"..\..\Oem\geos-2.2.0\source\headers";"..\..\Oem\gdal-1.3.0\ogr";"..\..\Oem\gdal-1.3.0\port";"..\..\Oem\proj-4.4.9\src";..\..\oem\ace\ACE_wrappers"
+ AdditionalIncludeDirectories=".\;..\Security;..\MdfModel;..\Foundation;..\CoordinateSystem;"..\..\Oem\geos-2.2.0\source\headers";"..\..\Oem\gdal-1.4.0\ogr";"..\..\Oem\gdal-1.4.0\port";"..\..\Oem\proj-4.5.0\src";..\..\oem\ace\ACE_wrappers"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GEOMETRY_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
Modified: trunk/MgDev/Common/Geometry/Makefile.am
===================================================================
--- trunk/MgDev/Common/Geometry/Makefile.am 2007-03-21 23:16:49 UTC (rev 1336)
+++ trunk/MgDev/Common/Geometry/Makefile.am 2007-03-21 23:28:35 UTC (rev 1337)
@@ -257,9 +257,9 @@
-I../../Oem/ACE/ACE_wrappers \
-I../../Oem/geos-2.2.0/source/headers \
-I../../Oem/dbxml-2.2.13/xerces-c-src/src \
- -I../../Oem/proj-4.4.9/src \
- -I../../Oem/gdal-1.3.0/ogr \
- -I../../Oem/gdal-1.3.0/port \
+ -I../../Oem/proj-4.5.0/src \
+ -I../../Oem/gdal-1.4.0/ogr \
+ -I../../Oem/gdal-1.4.0/port \
-I$(top_builddir)/$(map_coordsys_include_path)
libMgGeometry_la_LIBADD = \
Modified: trunk/MgDev/Common/MapGuideCommon/Makefile.am
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/Makefile.am 2007-03-21 23:16:49 UTC (rev 1336)
+++ trunk/MgDev/Common/MapGuideCommon/Makefile.am 2007-03-21 23:28:35 UTC (rev 1337)
@@ -251,9 +251,9 @@
-I../../Oem/ACE/ACE_wrappers \
-I../../Oem/geos-2.2.0/source/headers \
-I../../Oem/dbxml-2.2.13/xerces-c-src/src \
- -I../../Oem/proj-4.4.9/src \
- -I../../Oem/gdal-1.3.0/ogr \
- -I../../Oem/gdal-1.3.0/port
+ -I../../Oem/proj-4.5.0/src \
+ -I../../Oem/gdal-1.4.0/ogr \
+ -I../../Oem/gdal-1.4.0/port
libMgMapGuideCommon_la_LIBADD = \
-lACE \
Modified: trunk/MgDev/Common/PlatformBase/Makefile.am
===================================================================
--- trunk/MgDev/Common/PlatformBase/Makefile.am 2007-03-21 23:16:49 UTC (rev 1336)
+++ trunk/MgDev/Common/PlatformBase/Makefile.am 2007-03-21 23:28:35 UTC (rev 1337)
@@ -213,9 +213,9 @@
-I../../Oem/ACE/ACE_wrappers \
-I../../Oem/geos-2.2.0/source/headers \
-I../../Oem/dbxml-2.2.13/xerces-c-src/src \
- -I../../Oem/proj-4.4.9/src \
- -I../../Oem/gdal-1.3.0/ogr \
- -I../../Oem/gdal-1.3.0/port
+ -I../../Oem/proj-4.5.0/src \
+ -I../../Oem/gdal-1.4.0/ogr \
+ -I../../Oem/gdal-1.4.0/port
libMgPlatformBase_la_LIBADD = \
-lACE \
Modified: trunk/MgDev/Oem/Makefile.am
===================================================================
--- trunk/MgDev/Oem/Makefile.am 2007-03-21 23:16:49 UTC (rev 1336)
+++ trunk/MgDev/Oem/Makefile.am 2007-03-21 23:28:35 UTC (rev 1337)
@@ -3,10 +3,10 @@
SUBDIRS = $(map_opt_oem_subdirs) DWFTK7.1
DIST_SUBDIRS =
-EXTRA_DIST = ACE CppUnit-1.9.14 dbxml-2.2.13 DWFTK7.1 FDO/ProviderList/ServerCommunity fcgi gd gdal-1.3.0 geos-2.2.0 php proj-4.4.9 SQLite SWIGEx oem.sln
+EXTRA_DIST = ACE CppUnit-1.9.14 dbxml-2.2.13 DWFTK7.1 FDO/ProviderList/ServerCommunity fcgi gd gdal-1.4.0 geos-2.2.0 php proj-4.5.0 SQLite SWIGEx oem.sln
dist-hook:
- rm -f $(distdir)/gdal-1.3.0/port/cpl_config.h
+ rm -f $(distdir)/gdal-1.4.0/port/cpl_config.h
install-exec-am:
@cp -fp ACE/ACE_wrappers/ace/*.so ${prefix}/lib
Modified: trunk/MgDev/Oem/oem.sln
===================================================================
--- trunk/MgDev/Oem/oem.sln 2007-03-21 23:16:49 UTC (rev 1336)
+++ trunk/MgDev/Oem/oem.sln 2007-03-21 23:28:35 UTC (rev 1337)
@@ -78,11 +78,11 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GEOS", "geos-2.2.0\VisualStudio\GEOS.vcproj", "{1B9196BF-C194-47BC-846A-D9BBB134F2B3}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CPL", "gdal-1.3.0\port\CPL.vcproj", "{E8F6DBAE-C078-4826-D996-01EFA74219F6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CPL", "gdal-1.4.0\port\cpl.vcproj", "{E8F6DBAE-C078-4826-D996-01EFA74219F6}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OGR", "gdal-1.3.0\ogr\OGR.vcproj", "{E8F6DBAE-C078-4826-C885-01EFA74219F6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OGR", "gdal-1.4.0\ogr\ogr.vcproj", "{E8F6DBAE-C078-4826-C885-01EFA74219F6}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PROJ4", "proj-4.4.9\src\PROJ4.vcproj", "{E8F6DBAE-C078-4826-B774-01EFA74219F6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PROJ", "proj-4.5.0\src\proj.vcproj", "{E8F6DBAE-C078-4826-B774-01EFA74219F6}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cppunit", "CppUnit-1.9.14\src\cppunit\cppunit.vcproj", "{AA0817E7-095C-465C-90B3-9221DE17EC70}"
EndProject
Modified: trunk/MgDev/Server/src/Core/Makefile.am
===================================================================
--- trunk/MgDev/Server/src/Core/Makefile.am 2007-03-21 23:16:49 UTC (rev 1336)
+++ trunk/MgDev/Server/src/Core/Makefile.am 2007-03-21 23:28:35 UTC (rev 1337)
@@ -241,8 +241,8 @@
UnitTesting :
@echo "#!/bin/sh" > unittest.sh
- @echo "if test -z \"\$$GDAL_DATA\"; then export GDAL_DATA=$(map_srcdir)/Oem/gdal-1.3.0/data; fi;" >> unittest.sh
- @echo "if test -z \"\$$PROJ_LIB\"; then export PROJ_LIB=$(map_srcdir)/Oem/proj-4.4.9/nad; fi;" >> unittest.sh
+ @echo "if test -z \"\$$GDAL_DATA\"; then export GDAL_DATA=$(map_srcdir)/Oem/gdal-1.4.0/data; fi;" >> unittest.sh
+ @echo "if test -z \"\$$PROJ_LIB\"; then export PROJ_LIB=$(map_srcdir)/Oem/proj-4.5.0/nad; fi;" >> unittest.sh
@echo "echo GDAL_DATA=\$$GDAL_DATA" >> unittest.sh
@echo "echo PROJ_LIB=\$$PROJ_LIB" >> unittest.sh
@echo "./mgserver test" >> unittest.sh
@@ -343,8 +343,8 @@
@cp -fp ../../../Common/Schema/*.xsd $(schemadir)
@cp -fp ../../../Common/CoordinateSystem/categories.txt ${prefix}/bin/
@cp -fp ../../../Oem/DWFTK7.1/develop/global/fonts/* ${prefix}/bin/
- @cp -fp ../../../Oem/gdal-1.3.0/data/* $(proj4datadir)
- @cp -fp ../../../Oem/proj-4.4.9/nad/* $(proj4naddir)
+ @cp -fp ../../../Oem/gdal-1.4.0/data/* $(proj4datadir)
+ @cp -fp ../../../Oem/proj-4.5.0/nad/* $(proj4naddir)
@cp -fp ../../../Oem/dbxml-2.2.13/install/bin/db_archive ${prefix}/bin/
@cp -fp ../../../Oem/dbxml-2.2.13/install/bin/db_checkpoint ${prefix}/bin/
@cp -fp ../../../Oem/dbxml-2.2.13/install/bin/db_recover ${prefix}/bin/
Modified: trunk/MgDev/Server/src/PostBuild/PostBuild.mak
===================================================================
--- trunk/MgDev/Server/src/PostBuild/PostBuild.mak 2007-03-21 23:16:49 UTC (rev 1336)
+++ trunk/MgDev/Server/src/PostBuild/PostBuild.mak 2007-03-21 23:28:35 UTC (rev 1337)
@@ -88,11 +88,11 @@
..\..\bin\debug\xerces-c_2_7D.pdb : ..\..\..\Oem\dbxml-2.2.13\bin\debug\xerces-c_2_7D.pdb
xcopy /r /d /y ..\..\..\Oem\dbxml-2.2.13\bin\debug\xerces-c_2_7D.pdb ..\..\bin\debug\
-..\..\bin\debug\proj.dll : ..\..\..\Oem\proj-4.4.9\src\proj.dll
- xcopy /r /d /y ..\..\..\Oem\proj-4.4.9\src\proj.dll ..\..\bin\debug\
+..\..\bin\debug\proj.dll : ..\..\..\Oem\proj-4.5.0\src\proj.dll
+ xcopy /r /d /y ..\..\..\Oem\proj-4.5.0\src\proj.dll ..\..\bin\debug\
-..\..\bin\debug\proj.pdb : ..\..\..\Oem\proj-4.4.9\src\proj.pdb
- xcopy /r /d /y ..\..\..\Oem\proj-4.4.9\src\proj.pdb ..\..\bin\debug\
+..\..\bin\debug\proj.pdb : ..\..\..\Oem\proj-4.5.0\src\proj.pdb
+ xcopy /r /d /y ..\..\..\Oem\proj-4.5.0\src\proj.pdb ..\..\bin\debug\
..\..\bin\debug\categories.txt : ..\..\..\Common\CoordinateSystem\categories.txt
xcopy /r /d /y ..\..\..\Common\CoordinateSystem\categories.txt ..\..\bin\debug\
@@ -335,11 +335,11 @@
..\..\bin\release\xerces-c_2_7.pdb : ..\..\..\Oem\dbxml-2.2.13\bin\xerces-c_2_7.pdb
xcopy /r /d /y ..\..\..\Oem\dbxml-2.2.13\bin\xerces-c_2_7.pdb ..\..\bin\release\
-..\..\bin\release\proj.dll : ..\..\..\Oem\proj-4.4.9\src\proj.dll
- xcopy /r /d /y ..\..\..\Oem\proj-4.4.9\src\proj.dll ..\..\bin\release\
+..\..\bin\release\proj.dll : ..\..\..\Oem\proj-4.5.0\src\proj.dll
+ xcopy /r /d /y ..\..\..\Oem\proj-4.5.0\src\proj.dll ..\..\bin\release\
-..\..\bin\release\proj.pdb : ..\..\..\Oem\proj-4.4.9\src\proj.pdb
- xcopy /r /d /y ..\..\..\Oem\proj-4.4.9\src\proj.pdb ..\..\bin\release\
+..\..\bin\release\proj.pdb : ..\..\..\Oem\proj-4.5.0\src\proj.pdb
+ xcopy /r /d /y ..\..\..\Oem\proj-4.5.0\src\proj.pdb ..\..\bin\release\
..\..\bin\release\categories.txt : ..\..\..\Common\CoordinateSystem\categories.txt
xcopy /r /d /y ..\..\..\Common\CoordinateSystem\categories.txt ..\..\bin\release\
Modified: trunk/MgDev/Server/src/UnitTesting/TestCoordinateSystem.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestCoordinateSystem.cpp 2007-03-21 23:16:49 UTC (rev 1336)
+++ trunk/MgDev/Server/src/UnitTesting/TestCoordinateSystem.cpp 2007-03-21 23:28:35 UTC (rev 1337)
@@ -46,7 +46,7 @@
const STRING Projected_UTM18_NAD83 = L"PROJCS[\"UTM Zone 18, Northern Hemisphere\",GEOGCS[\"GRS 1980(IUGG, 1980)\",DATUM[\"unknown\",SPHEROID[\"GRS80\",6378137,298.257222101]],PRIMEM[\"Greenwich\",0],UNIT[\"degree\",0.0174532925199433]],PROJECTION[\"Transverse_Mercator\"],PARAMETER[\"latitude_of_origin\",0],PARAMETER[\"central_meridian\",-75],PARAMETER[\"scale_factor\",0.9996],PARAMETER[\"false_easting\",500000],PARAMETER[\"false_northing\",0],UNIT[\"Meter\",1]]";
const STRING EPSG_4326_Wkt = L"GEOGCS[\"WGS 84\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.257223563,AUTHORITY[\"EPSG\",\"7030\"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY[\"EPSG\",\"6326\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.0174532925199433,AUTHORITY[\"EPSG\",\"9108\"]],AXIS[\"Lat\",NORTH],AXIS[\"Long\",EAST],AUTHORITY[\"EPSG\",\"4326\"]]";
-const STRING EPSG_4326_Wkt_Alt = L"GEOGCS[\"WGS 84\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.257223563,AUTHORITY[\"EPSG\",\"7030\"]],AUTHORITY[\"EPSG\",\"6326\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994328,AUTHORITY[\"EPSG\",\"9122\"]],AUTHORITY[\"EPSG\",\"4326\"]]";
+const STRING EPSG_4326_Wkt_Alt = L"GEOGCS[\"WGS 84\",DATUM[\"WGS_1984\",SPHEROID[\"WGS 84\",6378137,298.257223563,AUTHORITY[\"EPSG\",\"7030\"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY[\"EPSG\",\"6326\"]],PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],UNIT[\"degree\",0.01745329251994328,AUTHORITY[\"EPSG\",\"9122\"]],AUTHORITY[\"EPSG\",\"4326\"]]";
const STRING TEST_LOCALE = L"en";
More information about the mapguide-commits
mailing list