[fdo-commits] r2626 - in trunk: . Providers/GDAL Providers/GDAL/Src
Providers/GDAL/Src/Provider Providers/GDAL/Src/UnitTest
Providers/WMS Providers/WMS/Src Providers/WMS/Src/Provider
Providers/WMS/Src/UnitTest Thirdparty
svn_fdo at osgeo.org
svn_fdo at osgeo.org
Sat Mar 3 22:30:51 EST 2007
Author: gregboone
Date: 2007-03-03 22:30:51 -0500 (Sat, 03 Mar 2007)
New Revision: 2626
Added:
trunk/Thirdparty/Thirdparty_gdal.sh
trunk/Thirdparty/Thirdparty_gdal.sln
Modified:
trunk/Providers/GDAL/Src/Makefile.am
trunk/Providers/GDAL/Src/Provider/Makefile.am
trunk/Providers/GDAL/Src/Provider/RFP.vcproj
trunk/Providers/GDAL/Src/UnitTest/UnitTest.vcproj
trunk/Providers/GDAL/configure.in
trunk/Providers/WMS/Src/Makefile.am
trunk/Providers/WMS/Src/Provider/Makefile.am
trunk/Providers/WMS/Src/Provider/WMSProvider.vcproj
trunk/Providers/WMS/Src/UnitTest/UnitTest.vcproj
trunk/Providers/WMS/configure.in
trunk/Thirdparty/Makefile.am
trunk/Thirdparty/Thirdparty.sh
trunk/Thirdparty/Thirdparty.sln
trunk/Thirdparty/Thirdparty_wms.sh
trunk/Thirdparty/Thirdparty_wms.sln
trunk/Thirdparty/build.bat
trunk/setenvironment.bat
trunk/setenvironment.sh
Log:
Ticket #5: GDAL: Update FDO Thirdparty to latest GDAL Source. Version 1.4.0
Modified: trunk/Providers/GDAL/Src/Makefile.am
===================================================================
--- trunk/Providers/GDAL/Src/Makefile.am 2007-03-04 03:25:35 UTC (rev 2625)
+++ trunk/Providers/GDAL/Src/Makefile.am 2007-03-04 03:30:51 UTC (rev 2626)
@@ -56,4 +56,4 @@
libGRFPProvider_la_LDFLAGS = \
-shared \
-release $(VERSION) \
- -L$(FDOTHIRDPARTY)/GDAL1.3/linux/lib/optimized
+ -L$(FDOGDAL)/.libs
Modified: trunk/Providers/GDAL/Src/Provider/Makefile.am
===================================================================
--- trunk/Providers/GDAL/Src/Provider/Makefile.am 2007-03-04 03:25:35 UTC (rev 2625)
+++ trunk/Providers/GDAL/Src/Provider/Makefile.am 2007-03-04 03:30:51 UTC (rev 2626)
@@ -118,6 +118,6 @@
-I../Message/Inc/ \
-I$(FDO)/Unmanaged/Inc \
-I$(FDOUTILITIES)/Common/Inc \
- -I$(FDOTHIRDPARTY)/GDAL1.3/linux/include
+ -I$(FDOGDAL)/include
CXXFLAGS = @CXXFLAGS@ -D__USE_GNU -DLINUX -DLINUX_IA32
Modified: trunk/Providers/GDAL/Src/Provider/RFP.vcproj
===================================================================
--- trunk/Providers/GDAL/Src/Provider/RFP.vcproj 2007-03-04 03:25:35 UTC (rev 2625)
+++ trunk/Providers/GDAL/Src/Provider/RFP.vcproj 2007-03-04 03:30:51 UTC (rev 2626)
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="$(FDO)\Unmanaged\Inc;$(FDOUTILITIES)\Common\Inc;$(FDOTHIRDPARTY)\gdal1.3\windows\include;..\..\Inc;..\"
+ AdditionalIncludeDirectories="$(FDO)\Unmanaged\Inc;$(FDOUTILITIES)\Common\Inc;$(FDOGDAL)\include;..\..\Inc;..\"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FDOGRFP_EXPORTS;;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -67,10 +67,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="FDO.lib FDOCommon.lib FDOGeometry.lib FDOSpatial.lib gdal.lib"
+ AdditionalDependencies="FDO.lib FDOCommon.lib FDOGeometry.lib FDOSpatial.lib gdal_i.lib"
OutputFile="$(OutDir)/GRFPProvider.dll"
LinkIncremental="2"
- AdditionalLibraryDirectories=""$(FDO)\Unmanaged\Lib\Win32\debug";"$(FDOUTILITIES)\Common\Lib\Win32\debug";"$(FDOTHIRDPARTY)\GDAL1.3\windows\lib\VC8\debug""
+ AdditionalLibraryDirectories=""$(FDO)\Unmanaged\Lib\Win32\debug";"$(FDOUTILITIES)\Common\Lib\Win32\debug";"$(FDOGDAL)\lib\win32\debug""
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/GRFPProvider.pdb"
SubSystem="2"
@@ -132,7 +132,7 @@
Optimization="2"
InlineFunctionExpansion="1"
OmitFramePointers="true"
- AdditionalIncludeDirectories=""$(FDO)\Unmanaged\Inc";"$(FDOUTILITIES)\Common\Inc";"$(FDOTHIRDPARTY)\gdal1.3\windows\include";..\..\Inc;..\"
+ AdditionalIncludeDirectories=""$(FDO)\Unmanaged\Inc";"$(FDOUTILITIES)\Common\Inc";"$(FDOGDAL)\include";..\..\Inc;..\"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FDOGRFP_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
StringPooling="true"
RuntimeLibrary="2"
@@ -157,10 +157,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="FDO.lib FDOCommon.lib FDOGeometry.lib FDOSpatial.lib gdal.lib"
+ AdditionalDependencies="FDO.lib FDOCommon.lib FDOGeometry.lib FDOSpatial.lib gdal_i.lib"
OutputFile="$(OutDir)/GRFPProvider.dll"
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(FDO)\Unmanaged\Lib\Win32\Release";"$(FDOUTILITIES)\Common\Lib\Win32\Release";"$(FDOTHIRDPARTY)\GDAL1.3\windows\lib\VC8\release""
+ AdditionalLibraryDirectories=""$(FDO)\Unmanaged\Lib\Win32\Release";"$(FDOUTILITIES)\Common\Lib\Win32\Release";"$(FDOGDAL)\lib\win32\release""
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/GRFPProvider.pdb"
SubSystem="2"
Modified: trunk/Providers/GDAL/Src/UnitTest/UnitTest.vcproj
===================================================================
--- trunk/Providers/GDAL/Src/UnitTest/UnitTest.vcproj 2007-03-04 03:25:35 UTC (rev 2625)
+++ trunk/Providers/GDAL/Src/UnitTest/UnitTest.vcproj 2007-03-04 03:30:51 UTC (rev 2626)
@@ -605,8 +605,8 @@
<Tool
Name="VCCustomBuildTool"
Description="Copying thirdparty dlls"
- CommandLine="copy $(FDOTHIRDPARTY)\cppunit\lib\testrunnerd.dll $(OutDir)
copy $(FDOTHIRDPARTY)\cppunit\lib\cppunitd_dll.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Debug\Xalan-C_1_7_0D.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Debug\XalanMessages_1_7_0D.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xerces\c\Build\Win32\VC8\Debug\xerces-c_2_5_0D.dll $(OutDir)
copy $(FDOTHIRDPARTY)\GDAL1.3\windows\bin\VC8\debug\gdal13.dll $(OutDir)
echo "delete me please">$(OutDir)\CopyThirdparty.ilk
"
- AdditionalDependencies="$(FDOTHIRDPARTY)\cppunit\lib\testrunnerd.dll;$(FDOTHIRDPARTY)\cppunit\lib\cppunitd_dll.dll;$(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Debug\Xalan-C_1_7_0D.dll;$(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Debug\XalanMessages_1_7_0D.dll;$(FDOTHIRDPARTY)\apache\xml-xerces\c\Build\Win32\VC8\Debug\xerces-c_2_5_0D.dll;$(FDOTHIRDPARTY)\GDAL1.3\windows\bin\VC8\debug\gdal13.dll;$(FDOTHIRDPARTY)\GDAL1.3\windows\bin\VC8\debug\gdal13.pdb"
+ CommandLine="copy $(FDOTHIRDPARTY)\cppunit\lib\testrunnerd.dll $(OutDir)
copy $(FDOTHIRDPARTY)\cppunit\lib\cppunitd_dll.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Debug\Xalan-C_1_7_0D.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Debug\XalanMessages_1_7_0D.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xerces\c\Build\Win32\VC8\Debug\xerces-c_2_5_0D.dll $(OutDir)
copy $(FDOGDAL)\bin\win32\debug\gdal14.dll $(OutDir)
echo "delete me please">$(OutDir)\CopyThirdparty.ilk
"
+ AdditionalDependencies="$(FDOTHIRDPARTY)\cppunit\lib\testrunnerd.dll;$(FDOTHIRDPARTY)\cppunit\lib\cppunitd_dll.dll;$(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Debug\Xalan-C_1_7_0D.dll;$(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Debug\XalanMessages_1_7_0D.dll;$(FDOTHIRDPARTY)\apache\xml-xerces\c\Build\Win32\VC8\Debug\xerces-c_2_5_0D.dll;$(FDOGDAL)\bin\win32\debug\gdal14.dll"
Outputs="$(OutDir)\CopyThirdparty.ilk"
/>
</FileConfiguration>
@@ -616,8 +616,8 @@
<Tool
Name="VCCustomBuildTool"
Description="Copying thirdparty dlls"
- CommandLine="copy $(FDOTHIRDPARTY)\cppunit\lib\testrunner.dll $(OutDir)
copy $(FDOTHIRDPARTY)\cppunit\lib\cppunit_dll.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Release\Xalan-C_1_7_0.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Release\XalanMessages_1_7_0.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xerces\c\Build\Win32\VC8\Release\xerces-c_2_5_0.dll $(OutDir)
copy $(FDOTHIRDPARTY)\GDAL1.3\windows\bin\VC8\release\gdal13.dll $(OutDir)
echo "delete me please">$(OutDir)\CopyThirdparty.ilk
"
- AdditionalDependencies="$(FDOTHIRDPARTY)\cppunit\lib\testrunner.dll;$(FDOTHIRDPARTY)\cppunit\lib\cppunit_dll.dll;$(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC7\Release\Xalan-C_1_7_0.dll;$(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC7\Release\XalanMessages_1_7_0.dll;$(FDOTHIRDPARTY)\apache\xml-xerces\c\Build\Win32\VC7\Release\xerces-c_2_5_0.dll;$(FDOTHIRDPARTY)\GDAL1.3\windows\bin\VC8\release\gdal13.dll"
+ CommandLine="copy $(FDOTHIRDPARTY)\cppunit\lib\testrunner.dll $(OutDir)
copy $(FDOTHIRDPARTY)\cppunit\lib\cppunit_dll.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Release\Xalan-C_1_7_0.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Release\XalanMessages_1_7_0.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xerces\c\Build\Win32\VC8\Release\xerces-c_2_5_0.dll $(OutDir)
copy $(FDOGDAL)\bin\win32\release\gdal14.dll $(OutDir)
echo "delete me please">$(OutDir)\CopyThirdparty.ilk
"
+ AdditionalDependencies="$(FDOTHIRDPARTY)\cppunit\lib\testrunner.dll;$(FDOTHIRDPARTY)\cppunit\lib\cppunit_dll.dll;$(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC7\Release\Xalan-C_1_7_0.dll;$(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC7\Release\XalanMessages_1_7_0.dll;$(FDOTHIRDPARTY)\apache\xml-xerces\c\Build\Win32\VC7\Release\xerces-c_2_5_0.dll;$(FDOGDAL)\bin\win32\release\gdal14.dll"
Outputs="$(OutDir)\CopyThirdparty.ilk"
/>
</FileConfiguration>
Modified: trunk/Providers/GDAL/configure.in
===================================================================
--- trunk/Providers/GDAL/configure.in 2007-03-04 03:25:35 UTC (rev 2625)
+++ trunk/Providers/GDAL/configure.in 2007-03-04 03:30:51 UTC (rev 2626)
@@ -14,127 +14,150 @@
## License along with this library; if not, write to the Free Software
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-
-#------------------configure.in----------------------------------------
-dnl Configure.in for OSGeo FDO GDAL Raster Provider
-#----------------------------------------------------------------------
-# Variables
-# Following are the makefile directories
-#----------------------------------------------------------------------
-AC_INIT(FDOGDAL,3.3.0,http://fdo.osgeo.org)
-AC_CONFIG_SRCDIR(configure.in)
-AM_INIT_AUTOMAKE
-
-AC_PREFIX_DEFAULT(/usr/local/fdo-3.3.0)
-
-AC_LANG_C
-AC_PROG_CC
-AC_LANG_CPLUSPLUS
-AC_PROG_CXX
-AC_PROG_YACC
-AC_DISABLE_STATIC
-AM_PROG_LIBTOOL
-
-AC_SUBST(VERSION, "3.3.0")
-
-dnl *******************************************************
-dnl FDO 3.3.0 Configuration
-dnl FDO / FDO Utilities / FDO Thirdpary paths
-dnl *******************************************************
-# custom Fdo path specification
-
-AC_ARG_WITH([fdo],
- FDO_HELP_STRING([--with-fdo], [specifies directory for FDO API files [[default=DEFAULT]]]),
- [custom_fdo=$withval],
- [custom_fdo=DEFAULT])
-
-if test $custom_fdo = "DEFAULT"; then
- if test -d $FDO && test ! $FDO = ""; then
- AC_MSG_NOTICE([Building with default location of FDO API files at $FDO])
- else
- AC_MSG_ERROR([The default FDO API path $FDO is not a valid directory. Please use the custom option])
- fi
-else
- if test -d $custom_fdo; then
- FDO="$custom_fdo"
- AC_MSG_NOTICE([Building with custom location of FDO API directory at $FDO])
- else
- AC_MSG_ERROR([The specified FDO API path $custom_fdo is not a valid directory])
- fi
-fi
-
-AC_ARG_WITH([fdo-utilities],
- FDO_HELP_STRING([--with-fdo-utilities],[specifies directory for FDO API Utility files [[default=DEFAULT]]]),
- [custom_fdo_utilities=$withval],
- [custom_fdo_utilities=DEFAULT])
-
-if test $custom_fdo_utilities = "DEFAULT"; then
- if test -d $FDOUTILITIES && test ! $FDOUTILITIES = ""; then
- AC_MSG_NOTICE([Building with default location of FDO Utility files at $FDOUTILITIES])
- else
- AC_MSG_ERROR([the default FDO Utilities path $FDOUTILITIES is not a valid directory. Please use the custom option])
- fi
-else
- if test -d $custom_fdo_utilities; then
- FDOUTILITIES="$custom_fdo_utilities"
- AC_MSG_NOTICE([Building with custom location of FDO Utilities directory at $FDOUTILITIES])
- else
- AC_MSG_ERROR([The specified FDO Utilities path $custom_fdo_utilities is not a valid directory])
- fi
-fi
-
-AC_ARG_WITH([fdo-thirdparty],
- FDO_HELP_STRING([--with-fdo-thirdparty], [specifies directory for FDO API Thirdparty files [[default=DEFAULT]]]),
- [custom_fdo_thirdparty=$withval],
- [custom_fdo_thirdparty=DEFAULT])
-
-if test $custom_fdo_thirdparty = "DEFAULT"; then
- if test -d $FDOTHIRDPARTY && test ! $FDOTHIRDPARTY = ""; then
- AC_MSG_NOTICE([Building with default location of FDO Thirdparty files at $FDOTHIRDPARTY])
- else
- AC_MSG_ERROR([The default FDO Thirdparty path $custom_fdo_thirdparty is not a valid directory. Please use the custom option])
- fi
-else
- if test -d $custom_fdo_thirdparty; then
- FDOTHIRDPARTY="$custom_fdo_thirdparty"
- AC_MSG_NOTICE([Building with custom location of FDO Thirdperty directory at $FDOTHIRDPARTY])
- else
- AC_MSG_ERROR([The specified FDO Thirdparty path $custom_fdo_thirdparty is not a valid directory])
- fi
-fi
-
-AC_SUBST(FDO)
-AC_SUBST(FDOUTILITIES)
-AC_SUBST(FDOTHIRDPARTY)
-
-# Check for Debug or Release build settings
-AC_ARG_ENABLE([debug],
- MAP_HELP_STRING([--enable-debug], [enable debug build [[default=no]]]),
- [enable_debug=$enableval],
- [enable_debug=no])
-
-if test $enable_debug = yes; then
- AC_MSG_NOTICE([Using debug configuration])
- CXXFLAGS="-g -MMD -MT "
- AC_SUBST(CXXFLAGS, ["-g -MMD -MT "])
-else
- AC_MSG_NOTICE([Using optimized configuration])
- CXXFLAGS="-MMD -MT "
- AC_SUBST(CXXFLAGS, ["-MMD -MT "])
-fi
-
-##output Makefiles##
-AC_CONFIG_FILES(Makefile)
-
-AC_CONFIG_FILES([\
-Inc/Makefile \
-Src/Makefile \
-Src/Message/Makefile \
-Src/Overrides/Makefile \
-Src/Provider/Makefile \
-Src/UnitTest/Makefile])
-
-AC_CONFIG_FILES(Docs/Makefile)
-
-AC_OUTPUT
-
+
+#------------------configure.in----------------------------------------
+dnl Configure.in for OSGeo FDO GDAL Raster Provider
+#----------------------------------------------------------------------
+# Variables
+# Following are the makefile directories
+#----------------------------------------------------------------------
+AC_INIT(FDOGDAL,3.3.0,http://fdo.osgeo.org)
+AC_CONFIG_SRCDIR(configure.in)
+AM_INIT_AUTOMAKE
+
+AC_PREFIX_DEFAULT(/usr/local/fdo-3.3.0)
+
+AC_LANG_C
+AC_PROG_CC
+AC_LANG_CPLUSPLUS
+AC_PROG_CXX
+AC_PROG_YACC
+AC_DISABLE_STATIC
+AM_PROG_LIBTOOL
+
+AC_SUBST(VERSION, "3.3.0")
+
+dnl *******************************************************
+dnl FDO 3.3.0 Configuration
+dnl FDO / Utilities / Thirdpary / GDAL paths
+dnl *******************************************************
+# custom Fdo path specification
+
+AC_ARG_WITH([fdo],
+ FDO_HELP_STRING([--with-fdo], [specifies directory for FDO API files [[default=DEFAULT]]]),
+ [custom_fdo=$withval],
+ [custom_fdo=DEFAULT])
+
+if test $custom_fdo = "DEFAULT"; then
+ if test -d $FDO && test ! $FDO = ""; then
+ AC_MSG_NOTICE([Building with default location of FDO API files at $FDO])
+ else
+ AC_MSG_ERROR([The default FDO API path $FDO is not a valid directory. Please use the custom option])
+fi
+else
+ if test -d $custom_fdo; then
+ FDO="$custom_fdo"
+ AC_MSG_NOTICE([Building with custom location of FDO API directory at $FDO])
+ else
+ AC_MSG_ERROR([The specified FDO API path $custom_fdo is not a valid directory])
+ fi
+fi
+
+AC_ARG_WITH([fdo-utilities],
+ FDO_HELP_STRING([--with-fdo-utilities],[specifies directory for FDO API Utility files [[default=DEFAULT]]]),
+ [custom_fdo_utilities=$withval],
+ [custom_fdo_utilities=DEFAULT])
+
+if test $custom_fdo_utilities = "DEFAULT"; then
+ if test -d $FDOUTILITIES && test ! $FDOUTILITIES = ""; then
+ AC_MSG_NOTICE([Building with default location of FDO Utility files at $FDOUTILITIES])
+ else
+ AC_MSG_ERROR([the default FDO Utilities path $FDOUTILITIES is not a valid directory. Please use the custom option])
+fi
+else
+ if test -d $custom_fdo_utilities; then
+ FDOUTILITIES="$custom_fdo_utilities"
+ AC_MSG_NOTICE([Building with custom location of FDO Utilities directory at $FDOUTILITIES])
+ else
+ AC_MSG_ERROR([The specified FDO Utilities path $custom_fdo_utilities is not a valid directory])
+ fi
+fi
+
+AC_ARG_WITH([fdo-thirdparty],
+ FDO_HELP_STRING([--with-fdo-thirdparty], [specifies directory for FDO API Thirdparty files [[default=DEFAULT]]]),
+ [custom_fdo_thirdparty=$withval],
+ [custom_fdo_thirdparty=DEFAULT])
+
+if test $custom_fdo_thirdparty = "DEFAULT"; then
+ if test -d $FDOTHIRDPARTY && test ! $FDOTHIRDPARTY = ""; then
+ AC_MSG_NOTICE([Building with default location of FDO Thirdparty files at $FDOTHIRDPARTY])
+ else
+ AC_MSG_ERROR([The default FDO Thirdparty path $custom_fdo_thirdparty is not a valid directory. Please use the custom option])
+ fi
+else
+ if test -d $custom_fdo_thirdparty; then
+ FDOTHIRDPARTY="$custom_fdo_thirdparty"
+ AC_MSG_NOTICE([Building with custom location of FDO Thirdperty directory at $FDOTHIRDPARTY])
+ else
+ AC_MSG_ERROR([The specified FDO Thirdparty path $custom_fdo_thirdparty is not a valid directory])
+ fi
+fi
+
+AC_ARG_WITH([fdo-gdal],
+ FDO_HELP_STRING([--with-fdo-gdal],
+ [specifies directory for thirdparty GDAL files [[default=DEFAULT]]]),
+ [custom_fdo_gdal=$withval],
+ [custom_fdo_gdal=DEFAULT])
+
+if test $custom_fdo_gdal = "DEFAULT"; then
+ FDOTHIRDPARTY="$PWD/Thirdparty/gdal"
+ if test -d $FDOGDAL; then
+ AC_MSG_NOTICE([Building with default location of thirdparty GDAL files at $FDOGDAL])
+ else
+ AC_MSG_ERROR([The default GDAL path $custom_fdo_gdal is not a valid directory. Please use the custom option])
+ fi
+else
+ if test -d $custom_fdo_gdal; then
+ FDOTHIRDPARTY="$custom_fdo_gdal"
+ AC_MSG_NOTICE([Building with custom location of thirdparty GDAL files at $FDOGDAL])
+ else
+ AC_MSG_ERROR([The specified GDAL path $custom_fdo_gdal is not a valid directory])
+ fi
+fi
+
+AC_SUBST(FDO)
+AC_SUBST(FDOUTILITIES)
+AC_SUBST(FDOTHIRDPARTY)
+AC_SUBST(FDOGDAL)
+
+# Check for Debug or Release build settings
+AC_ARG_ENABLE([debug],
+ MAP_HELP_STRING([--enable-debug], [enable debug build [[default=no]]]),
+ [enable_debug=$enableval],
+ [enable_debug=no])
+
+if test $enable_debug = yes; then
+ AC_MSG_NOTICE([Using debug configuration])
+ CXXFLAGS="-g -MMD -MT "
+ AC_SUBST(CXXFLAGS, ["-g -MMD -MT "])
+else
+ AC_MSG_NOTICE([Using optimized configuration])
+ CXXFLAGS="-MMD -MT "
+ AC_SUBST(CXXFLAGS, ["-MMD -MT "])
+fi
+
+##output Makefiles##
+AC_CONFIG_FILES(Makefile)
+
+AC_CONFIG_FILES([\
+Inc/Makefile \
+Src/Makefile \
+Src/Message/Makefile \
+Src/Overrides/Makefile \
+Src/Provider/Makefile \
+Src/UnitTest/Makefile])
+
+AC_CONFIG_FILES(Docs/Makefile)
+
+AC_OUTPUT
+
Modified: trunk/Providers/WMS/Src/Makefile.am
===================================================================
--- trunk/Providers/WMS/Src/Makefile.am 2007-03-04 03:25:35 UTC (rev 2625)
+++ trunk/Providers/WMS/Src/Makefile.am 2007-03-04 03:30:51 UTC (rev 2626)
@@ -61,6 +61,6 @@
libWMSProvider_la_LDFLAGS = \
-shared \
-release $(VERSION) \
- -L$(FDOTHIRDPARTY)/GDAL1.3/linux/lib/optimized
+ -L$(FDOGDAL)/.libs
Modified: trunk/Providers/WMS/Src/Provider/Makefile.am
===================================================================
--- trunk/Providers/WMS/Src/Provider/Makefile.am 2007-03-04 03:25:35 UTC (rev 2625)
+++ trunk/Providers/WMS/Src/Provider/Makefile.am 2007-03-04 03:30:51 UTC (rev 2626)
@@ -122,7 +122,7 @@
-I$(FDO)/Unmanaged/Inc \
-I$(FDOUTILITIES)/Common/Inc \
-I$(FDOUTILITIES)/OWS/Inc \
- -I$(FDOTHIRDPARTY)/GDAL1.3/linux/include
+ -I$(FDOGDAL)/include
CXXFLAGS = @CXXFLAGS@ -D__USE_GNU -DLINUX -DLINUX_IA32 -pthread
Modified: trunk/Providers/WMS/Src/Provider/WMSProvider.vcproj
===================================================================
--- trunk/Providers/WMS/Src/Provider/WMSProvider.vcproj 2007-03-04 03:25:35 UTC (rev 2625)
+++ trunk/Providers/WMS/Src/Provider/WMSProvider.vcproj 2007-03-04 03:30:51 UTC (rev 2626)
@@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".\;$(FDO)\Unmanaged\inc;$(FDOUTILITIES)\Common\inc;$(FDOUTILITIES)\OWS\inc;..\..\inc;$(FDOTHIRDPARTY)\GDAL1.3\windows\include"
+ AdditionalIncludeDirectories=".\;"$(FDO)\Unmanaged\inc";"$(FDOUTILITIES)\Common\inc";"$(FDOUTILITIES)\OWS\inc";..\..\inc;"$(FDOGDAL)\include""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FDOWMS_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
RuntimeLibrary="3"
TreatWChar_tAsBuiltInType="true"
@@ -65,7 +65,7 @@
Name="VCLinkerTool"
AdditionalDependencies="FDO.lib FDOCommon.lib FDOGeometry.lib ProvidersCommon.lib OWS.lib WMSOverrides.lib gdal_i.lib FDOSpatial.lib Advapi32.lib"
OutputFile="$(OutDir)\WMSProvider.dll"
- AdditionalLibraryDirectories="$(FDO)\Unmanaged\Lib\Win32\Debug;$(FDOUTILITIES)\Common\Lib\Win32\Debug;$(FDOUTILITIES)\OWS\Lib\Win32\Debug;..\..\Lib\Win32\Debug;$(FDOTHIRDPARTY)\GDAL1.3\windows\lib\VC8\debug"
+ AdditionalLibraryDirectories=""$(FDO)\Unmanaged\Lib\Win32\Debug";"$(FDOUTILITIES)\Common\Lib\Win32\Debug";"$(FDOUTILITIES)\OWS\Lib\Win32\Debug";..\..\Lib\Win32\Debug;"$(FDOGDAL)\lib\win32\debug""
IgnoreDefaultLibraryNames="LIBCMTD"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/WMSProvider.pdb"
@@ -123,7 +123,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".\;$(FDO)\Unmanaged\inc;$(FDOUTILITIES)\Common\inc;$(FDOUTILITIES)\OWS\inc;..\..\inc;$(FDOTHIRDPARTY)\GDAL1.3\windows\include"
+ AdditionalIncludeDirectories=".\;"$(FDO)\Unmanaged\inc";"$(FDOUTILITIES)\Common\inc";"$(FDOUTILITIES)\OWS\inc";..\..\inc;"$(FDOGDAL)\include""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FDOWMS_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
RuntimeLibrary="2"
TreatWChar_tAsBuiltInType="true"
@@ -148,7 +148,7 @@
Name="VCLinkerTool"
AdditionalDependencies="FDO.lib FDOCommon.lib ProvidersCommon.lib FDOGeometry.lib OWS.lib WMSOverrides.lib gdal_i.lib FDOSpatial.lib Advapi32.lib"
OutputFile="$(OutDir)\WMSProvider.dll"
- AdditionalLibraryDirectories="$(FDO)\Unmanaged\Lib\Win32\Release;$(FDOUTILITIES)\Common\Lib\Win32\Release;$(FDOUTILITIES)\OWS\Lib\Win32\Release;..\..\Lib\Win32\Release;$(FDOTHIRDPARTY)\GDAL1.3\windows\lib\VC8\release"
+ AdditionalLibraryDirectories=""$(FDO)\Unmanaged\Lib\Win32\Release";"$(FDOUTILITIES)\Common\Lib\Win32\Release";"$(FDOUTILITIES)\OWS\Lib\Win32\Release";..\..\Lib\Win32\Release;"$(FDOGDAL)\lib\win32\release""
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/WMSProvider.pdb"
ImportLibrary="..\..\Lib\Win32\Release\WMSProvider.lib"
Modified: trunk/Providers/WMS/Src/UnitTest/UnitTest.vcproj
===================================================================
--- trunk/Providers/WMS/Src/UnitTest/UnitTest.vcproj 2007-03-04 03:25:35 UTC (rev 2625)
+++ trunk/Providers/WMS/Src/UnitTest/UnitTest.vcproj 2007-03-04 03:30:51 UTC (rev 2626)
@@ -688,8 +688,8 @@
<Tool
Name="VCCustomBuildTool"
Description="Copying thirdparty dlls"
- CommandLine="copy $(FDOTHIRDPARTY)\cppunit\lib\testrunnerd.dll $(OutDir)
copy $(FDOTHIRDPARTY)\cppunit\lib\cppunitd_dll.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Debug\Xalan-C_1_7_0D.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Debug\XalanMessages_1_7_0D.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xerces\c\Build\Win32\VC8\Debug\xerces-c_2_5_0D.dll $(OutDir)
copy $(FDOTHIRDPARTY)\boost_1_32_0\bin\boost\libs\thread\build\boost_thread.dll\vc-8_0\debug\threading-multi\boost_thread-vc80-mt-gd-1_32.dll $(OutDir)
copy $(FDOTHIRDPARTY)\GDAL1.3\windows\bin\VC8\debug\gdal13.dll $(OutDir)
echo "delete me please">$(OutDir)\CopyThirdparty.ilk
"
- AdditionalDependencies="$(FDOTHIRDPARTY)\cppunit\lib\testrunnerd.dll;$(FDOTHIRDPARTY)\cppunit\lib\cppunitd_dll.dll;$(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Debug\Xalan-C_1_7_0D.dll;$(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Debug\XalanMessages_1_7_0D.dll;$(FDOTHIRDPARTY)\apache\xml-xerces\c\Build\Win32\VC8\Debug\xerces-c_2_5_0D.dll;$(FDOTHIRDPARTY)\boost_1_32_0\bin\boost\libs\thread\build\boost_thread.dll\vc-8_0\debug\threading-multi\boost_thread-vc80-mt-gd-1_32.dll;$(FDOTHIRDPARTY)\GDAL1.3\windows\bin\VC8\debug\gdal13.dll"
+ CommandLine="copy $(FDOTHIRDPARTY)\cppunit\lib\testrunnerd.dll $(OutDir)
copy $(FDOTHIRDPARTY)\cppunit\lib\cppunitd_dll.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Debug\Xalan-C_1_7_0D.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Debug\XalanMessages_1_7_0D.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xerces\c\Build\Win32\VC8\Debug\xerces-c_2_5_0D.dll $(OutDir)
copy $(FDOTHIRDPARTY)\boost_1_32_0\bin\boost\libs\thread\build\boost_thread.dll\vc-8_0\debug\threading-multi\boost_thread-vc80-mt-gd-1_32.dll $(OutDir)
copy $(FDOGDAL)\bin\win32\debug\gdal14.dll $(OutDir)
echo "delete me please">$(OutDir)\CopyThirdparty.ilk
"
+ AdditionalDependencies="$(FDOTHIRDPARTY)\cppunit\lib\testrunnerd.dll;$(FDOTHIRDPARTY)\cppunit\lib\cppunitd_dll.dll;$(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Debug\Xalan-C_1_7_0D.dll;$(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Debug\XalanMessages_1_7_0D.dll;$(FDOTHIRDPARTY)\apache\xml-xerces\c\Build\Win32\VC8\Debug\xerces-c_2_5_0D.dll;$(FDOTHIRDPARTY)\boost_1_32_0\bin\boost\libs\thread\build\boost_thread.dll\vc-8_0\debug\threading-multi\boost_thread-vc80-mt-gd-1_32.dll;$(FDOGDAL)\bin\win32\debug\gdal14.dll"
Outputs="$(OutDir)\CopyThirdparty.ilk"
/>
</FileConfiguration>
@@ -699,8 +699,8 @@
<Tool
Name="VCCustomBuildTool"
Description="Copying thirdparty dlls"
- CommandLine="copy $(FDOTHIRDPARTY)\cppunit\lib\testrunner.dll $(OutDir)
copy $(FDOTHIRDPARTY)\cppunit\lib\cppunit_dll.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Release\Xalan-C_1_7_0.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Release\XalanMessages_1_7_0.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xerces\c\Build\Win32\VC8\Release\xerces-c_2_5_0.dll $(OutDir)
copy $(FDOTHIRDPARTY)\boost_1_32_0\bin\boost\libs\thread\build\boost_thread.dll\vc-8_0\release\threading-multi\boost_thread-vc80-mt-1_32.dll $(OutDir)
copy $(FDOTHIRDPARTY)\GDAL1.3\windows\bin\VC8\release\gdal13.dll $(OutDir)
echo "delete me please">$(OutDir)\CopyThirdparty.ilk
"
- AdditionalDependencies="$(FDOTHIRDPARTY)\cppunit\lib\testrunner.dll;$(FDOTHIRDPARTY)\cppunit\lib\cppunit_dll.dll;$(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Release\Xalan-C_1_7_0.dll;$(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Release\XalanMessages_1_7_0.dll;$(FDOTHIRDPARTY)\apache\xml-xerces\c\Build\Win32\VC8\Release\xerces-c_2_5_0.dll;$(FDOTHIRDPARTY)\boost_1_32_0\bin\boost\libs\thread\build\boost_thread.dll\vc-8_0\releas\threading-multi\boost_thread-vc80-mt-1_32.dll;$(FDOTHIRDPARTY)\GDAL1.3\windows\bin\VC8\release\gdal13.dll"
+ CommandLine="copy $(FDOTHIRDPARTY)\cppunit\lib\testrunner.dll $(OutDir)
copy $(FDOTHIRDPARTY)\cppunit\lib\cppunit_dll.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Release\Xalan-C_1_7_0.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Release\XalanMessages_1_7_0.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xerces\c\Build\Win32\VC8\Release\xerces-c_2_5_0.dll $(OutDir)
copy $(FDOTHIRDPARTY)\boost_1_32_0\bin\boost\libs\thread\build\boost_thread.dll\vc-8_0\release\threading-multi\boost_thread-vc80-mt-1_32.dll $(OutDir)
copy $(FDOGDAL)\bin\win32\release\gdal14.dll $(OutDir)
echo "delete me please">$(OutDir)\CopyThirdparty.ilk
"
+ AdditionalDependencies="$(FDOTHIRDPARTY)\cppunit\lib\testrunner.dll;$(FDOTHIRDPARTY)\cppunit\lib\cppunit_dll.dll;$(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Release\Xalan-C_1_7_0.dll;$(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Release\XalanMessages_1_7_0.dll;$(FDOTHIRDPARTY)\apache\xml-xerces\c\Build\Win32\VC8\Release\xerces-c_2_5_0.dll;$(FDOTHIRDPARTY)\boost_1_32_0\bin\boost\libs\thread\build\boost_thread.dll\vc-8_0\releas\threading-multi\boost_thread-vc80-mt-1_32.dll;$(FDOGDAL)\bin\win32\release\gdal14.dll"
Outputs="$(OutDir)\CopyThirdparty.ilk"
/>
</FileConfiguration>
@@ -710,8 +710,8 @@
<Tool
Name="VCCustomBuildTool"
Description="Copying thirdparty dlls"
- CommandLine="copy $(FDOTHIRDPARTY)\cppunit\lib\testrunnerd.dll $(OutDir)
copy $(FDOTHIRDPARTY)\cppunit\lib\cppunitd_dll.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Debug\Xalan-C_1_7_0D.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Debug\XalanMessages_1_7_0D.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xerces\c\Build\Win32\VC8\Debug\xerces-c_2_5_0D.dll $(OutDir)
copy $(FDOTHIRDPARTY)\boost_1_32_0\bin\boost\libs\thread\build\boost_thread.dll\vc-8_0\debug\threading-multi\boost_thread-vc80-mt-gd-1_32.dll $(OutDir)
copy $(FDOTHIRDPARTY)\GDAL1.3\windows\bin\VC8\debug\gdal13.dll $(OutDir)
echo "delete me please">$(OutDir)\CopyThirdparty.ilk
"
- AdditionalDependencies="$(FDOTHIRDPARTY)\cppunit\lib\testrunnerd.dll;$(FDOTHIRDPARTY)\cppunit\lib\cppunitd_dll.dll;$(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Debug\Xalan-C_1_7_0D.dll;$(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Debug\XalanMessages_1_7_0D.dll;$(FDOTHIRDPARTY)\apache\xml-xerces\c\Build\Win32\VC8\Debug\xerces-c_2_5_0D.dll;$(FDOTHIRDPARTY)\boost_1_32_0\bin\boost\libs\thread\build\boost_thread.dll\vc-8_0\debug\threading-multi\boost_thread-vc80-mt-gd-1_32.dll;$(FDOTHIRDPARTY)\GDAL1.3\windows\bin\VC8\debug\gdal13.dll"
+ CommandLine="copy $(FDOTHIRDPARTY)\cppunit\lib\testrunnerd.dll $(OutDir)
copy $(FDOTHIRDPARTY)\cppunit\lib\cppunitd_dll.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Debug\Xalan-C_1_7_0D.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Debug\XalanMessages_1_7_0D.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xerces\c\Build\Win32\VC8\Debug\xerces-c_2_5_0D.dll $(OutDir)
copy $(FDOTHIRDPARTY)\boost_1_32_0\bin\boost\libs\thread\build\boost_thread.dll\vc-8_0\debug\threading-multi\boost_thread-vc80-mt-gd-1_32.dll $(OutDir)
copy $(FDOGDAL)\bin\win32\debug\gdal14.dll $(OutDir)
echo "delete me please">$(OutDir)\CopyThirdparty.ilk
"
+ AdditionalDependencies="$(FDOTHIRDPARTY)\cppunit\lib\testrunnerd.dll;$(FDOTHIRDPARTY)\cppunit\lib\cppunitd_dll.dll;$(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Debug\Xalan-C_1_7_0D.dll;$(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Debug\XalanMessages_1_7_0D.dll;$(FDOTHIRDPARTY)\apache\xml-xerces\c\Build\Win32\VC8\Debug\xerces-c_2_5_0D.dll;$(FDOTHIRDPARTY)\boost_1_32_0\bin\boost\libs\thread\build\boost_thread.dll\vc-8_0\debug\threading-multi\boost_thread-vc80-mt-gd-1_32.dll;$(FDOGDAL)\bin\win32\debug\gdal14.dll"
Outputs="$(OutDir)\CopyThirdparty.ilk"
/>
</FileConfiguration>
@@ -721,8 +721,8 @@
<Tool
Name="VCCustomBuildTool"
Description="Copying thirdparty dlls"
- CommandLine="copy $(FDOTHIRDPARTY)\cppunit\lib\testrunner.dll $(OutDir)
copy $(FDOTHIRDPARTY)\cppunit\lib\cppunit_dll.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Release\Xalan-C_1_7_0.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Release\XalanMessages_1_7_0.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xerces\c\Build\Win32\VC8\Release\xerces-c_2_5_0.dll $(OutDir)
copy $(FDOTHIRDPARTY)\boost_1_32_0\bin\boost\libs\thread\build\boost_thread.dll\vc-8_0\release\threading-multi\boost_thread-vc80-mt-1_32.dll $(OutDir)
copy $(FDOTHIRDPARTY)\GDAL1.3\windows\bin\VC8\release\gdal13.dll $(OutDir)
echo "delete me please">$(OutDir)\CopyThirdparty.ilk
"
- AdditionalDependencies="$(FDOTHIRDPARTY)\cppunit\lib\testrunner.dll;$(FDOTHIRDPARTY)\cppunit\lib\cppunit_dll.dll;$(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Release\Xalan-C_1_7_0.dll;$(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Release\XalanMessages_1_7_0.dll;$(FDOTHIRDPARTY)\apache\xml-xerces\c\Build\Win32\VC8\Release\xerces-c_2_5_0.dll;$(FDOTHIRDPARTY)\boost_1_32_0\bin\boost\libs\thread\build\boost_thread.dll\vc-8_0\releas\threading-multi\boost_thread-vc80-mt-1_32.dll;$(FDOTHIRDPARTY)\GDAL1.3\windows\bin\VC8\release\gdal13.dll"
+ CommandLine="copy $(FDOTHIRDPARTY)\cppunit\lib\testrunner.dll $(OutDir)
copy $(FDOTHIRDPARTY)\cppunit\lib\cppunit_dll.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Release\Xalan-C_1_7_0.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Release\XalanMessages_1_7_0.dll $(OutDir)
copy $(FDOTHIRDPARTY)\apache\xml-xerces\c\Build\Win32\VC8\Release\xerces-c_2_5_0.dll $(OutDir)
copy $(FDOTHIRDPARTY)\boost_1_32_0\bin\boost\libs\thread\build\boost_thread.dll\vc-8_0\release\threading-multi\boost_thread-vc80-mt-1_32.dll $(OutDir)
copy $(FDOGDAL)\bin\win32\release\gdal14.dll $(OutDir)
echo "delete me please">$(OutDir)\CopyThirdparty.ilk
"
+ AdditionalDependencies="$(FDOTHIRDPARTY)\cppunit\lib\testrunner.dll;$(FDOTHIRDPARTY)\cppunit\lib\cppunit_dll.dll;$(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Release\Xalan-C_1_7_0.dll;$(FDOTHIRDPARTY)\apache\xml-xalan\c\Build\Win32\VC8\Release\XalanMessages_1_7_0.dll;$(FDOTHIRDPARTY)\apache\xml-xerces\c\Build\Win32\VC8\Release\xerces-c_2_5_0.dll;$(FDOTHIRDPARTY)\boost_1_32_0\bin\boost\libs\thread\build\boost_thread.dll\vc-8_0\releas\threading-multi\boost_thread-vc80-mt-1_32.dll;$(FDOGDAL)\bin\win32\release\gdal14.dll"
Outputs="$(OutDir)\CopyThirdparty.ilk"
/>
</FileConfiguration>
Modified: trunk/Providers/WMS/configure.in
===================================================================
--- trunk/Providers/WMS/configure.in 2007-03-04 03:25:35 UTC (rev 2625)
+++ trunk/Providers/WMS/configure.in 2007-03-04 03:30:51 UTC (rev 2626)
@@ -39,96 +39,111 @@
dnl *******************************************************
dnl FDO 3.3.0 Configuration
-dnl FDO / FDO Utilities / FDO Thirdpary paths
+dnl FDO / Utilities / Thirdpary / GDAL paths
dnl *******************************************************
# custom Fdo path specification
AC_ARG_WITH([fdo],
- FDO_HELP_STRING([--with-fdo],
- [specifies directory for FDO API files [[default=DEFAULT]]]),
- [custom_fdo=$withval],
- [custom_fdo=DEFAULT])
+ FDO_HELP_STRING([--with-fdo], [specifies directory for FDO API files [[default=DEFAULT]]]),
+ [custom_fdo=$withval],
+ [custom_fdo=DEFAULT])
if test $custom_fdo = "DEFAULT"; then
- if test -d $FDO && test ! $FDO = ""; then
- AC_MSG_NOTICE([Building with default location of FDO API files at $FDO])
- else
- AC_MSG_ERROR([The default FDO API path $FDO is not a valid directory. Please use the custom option])
- fi
+ if test -d $FDO && test ! $FDO = ""; then
+ AC_MSG_NOTICE([Building with default location of FDO API files at $FDO])
+ else
+ AC_MSG_ERROR([The default FDO API path $FDO is not a valid directory. Please use the custom option])
+fi
else
- if test -d $custom_fdo; then
- FDO="$custom_fdo"
- AC_MSG_NOTICE([Building with custom location of FDO API directory at $FDO])
- else
- AC_MSG_ERROR([The specified FDO API path $custom_fdo is not a valid directory])
- fi
+ if test -d $custom_fdo; then
+ FDO="$custom_fdo"
+ AC_MSG_NOTICE([Building with custom location of FDO API directory at $FDO])
+ else
+ AC_MSG_ERROR([The specified FDO API path $custom_fdo is not a valid directory])
+ fi
fi
AC_ARG_WITH([fdo-utilities],
- FDO_HELP_STRING([--with-fdo-utilities],
- [specifies directory for FDO API Utility files [[default=DEFAULT]]]),
- [custom_fdo_utilities=$withval],
- [custom_fdo_utilities=DEFAULT])
+ FDO_HELP_STRING([--with-fdo-utilities],[specifies directory for FDO API Utility files [[default=DEFAULT]]]),
+ [custom_fdo_utilities=$withval],
+ [custom_fdo_utilities=DEFAULT])
if test $custom_fdo_utilities = "DEFAULT"; then
- if test -d $FDOUTILITIES && test ! $FDOUTILITIES = ""; then
- AC_MSG_NOTICE([Building with default location of FDO Utility files at $FDOUTILITIES])
- else
- AC_MSG_ERROR([the default FDO Utilities path $FDOUTILITIES is not a valid directory. Please use the custom option])
- fi
+ if test -d $FDOUTILITIES && test ! $FDOUTILITIES = ""; then
+ AC_MSG_NOTICE([Building with default location of FDO Utility files at $FDOUTILITIES])
+ else
+ AC_MSG_ERROR([the default FDO Utilities path $FDOUTILITIES is not a valid directory. Please use the custom option])
+fi
else
- if test -d $custom_fdo_utilities; then
- FDOUTILITIES="$custom_fdo_utilities"
- AC_MSG_NOTICE([Building with custom location of FDO Utilities directory at $FDOUTILITIES])
- else
- AC_MSG_ERROR([The specified FDO Utilities path $custom_fdo_utilities is not a valid directory])
- fi
+ if test -d $custom_fdo_utilities; then
+ FDOUTILITIES="$custom_fdo_utilities"
+ AC_MSG_NOTICE([Building with custom location of FDO Utilities directory at $FDOUTILITIES])
+ else
+ AC_MSG_ERROR([The specified FDO Utilities path $custom_fdo_utilities is not a valid directory])
+ fi
fi
AC_ARG_WITH([fdo-thirdparty],
- FDO_HELP_STRING([--with-fdo-thirdparty],
- [specifies directory for FDO API Thirdparty files [[default=DEFAULT]]]),
- [custom_fdo_thirdparty=$withval],
- [custom_fdo_thirdparty=DEFAULT])
+ FDO_HELP_STRING([--with-fdo-thirdparty], [specifies directory for FDO API Thirdparty files [[default=DEFAULT]]]),
+ [custom_fdo_thirdparty=$withval],
+ [custom_fdo_thirdparty=DEFAULT])
if test $custom_fdo_thirdparty = "DEFAULT"; then
- if test -d $FDOTHIRDPARTY && test ! $FDOTHIRDPARTY = ""; then
- AC_MSG_NOTICE([Building with default location of FDO Thirdparty files at $FDOTHIRDPARTY])
- else
- AC_MSG_ERROR([The default FDO Thirdparty path $custom_fdo_thirdparty is not a valid directory. Please use the custom option])
- fi
+ if test -d $FDOTHIRDPARTY && test ! $FDOTHIRDPARTY = ""; then
+ AC_MSG_NOTICE([Building with default location of FDO Thirdparty files at $FDOTHIRDPARTY])
+ else
+ AC_MSG_ERROR([The default FDO Thirdparty path $custom_fdo_thirdparty is not a valid directory. Please use the custom option])
+ fi
else
- if test -d $custom_fdo_thirdparty; then
- FDOTHIRDPARTY="$custom_fdo_thirdparty"
- AC_MSG_NOTICE([Building with custom location of FDO Thirdperty directory at $FDOTHIRDPARTY])
- else
- AC_MSG_ERROR([The specified FDO Thirdparty path $custom_fdo_thirdparty is not a valid directory])
- fi
+ if test -d $custom_fdo_thirdparty; then
+ FDOTHIRDPARTY="$custom_fdo_thirdparty"
+ AC_MSG_NOTICE([Building with custom location of FDO Thirdperty directory at $FDOTHIRDPARTY])
+ else
+ AC_MSG_ERROR([The specified FDO Thirdparty path $custom_fdo_thirdparty is not a valid directory])
+ fi
fi
+AC_ARG_WITH([fdo-gdal],
+ FDO_HELP_STRING([--with-fdo-gdal],
+ [specifies directory for thirdparty GDAL files [[default=DEFAULT]]]),
+ [custom_fdo_gdal=$withval],
+ [custom_fdo_gdal=DEFAULT])
+
+if test $custom_fdo_gdal = "DEFAULT"; then
+ FDOTHIRDPARTY="$PWD/Thirdparty/gdal"
+ if test -d $FDOGDAL; then
+ AC_MSG_NOTICE([Building with default location of thirdparty GDAL files at $FDOGDAL])
+ else
+ AC_MSG_ERROR([The default GDAL path $custom_fdo_gdal is not a valid directory. Please use the custom option])
+ fi
+else
+ if test -d $custom_fdo_gdal; then
+ FDOTHIRDPARTY="$custom_fdo_gdal"
+ AC_MSG_NOTICE([Building with custom location of thirdparty GDAL files at $FDOGDAL])
+ else
+ AC_MSG_ERROR([The specified GDAL path $custom_fdo_gdal is not a valid directory])
+ fi
+fi
+
AC_SUBST(FDO)
AC_SUBST(FDOUTILITIES)
AC_SUBST(FDOTHIRDPARTY)
+AC_SUBST(FDOGDAL)
# Check for Debug or Release build settings
AC_ARG_ENABLE([debug],
- MAP_HELP_STRING([--enable-debug],
- [enable debug build [[default=no]]]),
- [enable_debug=$enableval],
- [enable_debug=no])
+ MAP_HELP_STRING([--enable-debug], [enable debug build [[default=no]]]),
+ [enable_debug=$enableval],
+ [enable_debug=no])
if test $enable_debug = yes; then
- AC_MSG_NOTICE([Using debug configuration])
- CXXFLAGS="-g -MMD -MT "
- AC_SUBST(CXXFLAGS, ["-g -MMD -MT "])
- CXXFLAGS_SDF="-g "
- AC_SUBST(CXXFLAGS_SDF, ["-g "])
+ AC_MSG_NOTICE([Using debug configuration])
+ CXXFLAGS="-g -MMD -MT "
+ AC_SUBST(CXXFLAGS, ["-g -MMD -MT "])
else
- AC_MSG_NOTICE([Using optimized configuration])
- CXXFLAGS="-MMD -MT "
- AC_SUBST(CXXFLAGS, ["-MMD -MT "])
- CXXFLAGS_SDF=""
- AC_SUBST(CXXFLAGS_SDF, [""])
+ AC_MSG_NOTICE([Using optimized configuration])
+ CXXFLAGS="-MMD -MT "
+ AC_SUBST(CXXFLAGS, ["-MMD -MT "])
fi
##output Makefiles##
Modified: trunk/Thirdparty/Makefile.am
===================================================================
--- trunk/Thirdparty/Makefile.am 2007-03-04 03:25:35 UTC (rev 2625)
+++ trunk/Thirdparty/Makefile.am 2007-03-04 03:30:51 UTC (rev 2626)
@@ -281,7 +281,7 @@
apache/xml-xalan/c/lib/libxalan-c.so.17.0 \
apache/xml-xalan/c/lib/libxalanMsg.so.17.0 \
apache/xml-xerces/c/lib/libxerces-c.so.25.0 \
- GDAL1.3/linux/lib/optimized/libgdal.so.1.9.0
+ gdal/.libs/libgdal.so.1.11.0
install-data-hook :
@ln -s -f $(thdlibdir)/libxalan-c.so.17.0 $(thdlibdir)/libxalan-c.so.17
@@ -290,8 +290,8 @@
@ln -s -f $(thdlibdir)/libxalanMsg.so.17.0 $(thdlibdir)/libxalanMsg.so
@ln -s -f $(thdlibdir)/libxerces-c.so.25.0 $(thdlibdir)/libxerces-c.so.25
@ln -s -f $(thdlibdir)/libxerces-c.so.25.0 $(thdlibdir)/libxerces-c.so
- @ln -s -f $(thdlibdir)/libgdal.so.1.9.0 $(thdlibdir)/libgdal.so.1
- @ln -s -f $(thdlibdir)/libgdal.so.1.9.0 $(thdlibdir)/libgdal.so
+ @ln -s -f $(thdlibdir)/libgdal.so.1.11.0 $(thdlibdir)/libgdal.so.1
+ @ln -s -f $(thdlibdir)/libgdal.so.1.11.0 $(thdlibdir)/libgdal.so
@chmod a+x $(thdlibdir)/libxalan-c.so.17
@chmod a+x $(thdlibdir)/libxalan-c.so
@chmod a+x $(thdlibdir)/libxalanMsg.so.17
Modified: trunk/Thirdparty/Thirdparty.sh
===================================================================
--- trunk/Thirdparty/Thirdparty.sh 2007-03-04 03:25:35 UTC (rev 2625)
+++ trunk/Thirdparty/Thirdparty.sh 2007-03-04 03:30:51 UTC (rev 2626)
@@ -83,10 +83,8 @@
## Thirdparty_WMS
pushd . >& /dev/null
-cd GDAL1.3
-echo Building GDAL1.3
-mkdir -p linux/lib/optimized
-rm -f linux/lib/optimized/*.*
+cd gdal
+echo Building GDAL
cd src
chmod a+x ./configure
echo Build GDAL library with the following settings:
@@ -101,8 +99,4 @@
echo postgreSQL support - no
./configure --with-gif=internal --with-jpeg=internal --with-png=internal --with-libtiff=internal --with-geotiff=internal --without-ogr --with-pg=no --with-python=no --with-libz=internal
make
-cp -f ./.libs/libgdal.a ../linux/lib/optimized
-cp -f ./.libs/libgdal.so ../linux/lib/optimized
-cp -f ./.libs/libgdal.so.1 ../linux/lib/optimized
-cp -f ./.libs/libgdal.so.1.9.0 ../linux/lib/optimized
popd >& /dev/null
Modified: trunk/Thirdparty/Thirdparty.sln
===================================================================
--- trunk/Thirdparty/Thirdparty.sln 2007-03-04 03:25:35 UTC (rev 2625)
+++ trunk/Thirdparty/Thirdparty.sln 2007-03-04 03:30:51 UTC (rev 2626)
@@ -30,7 +30,7 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openssl", "openssl\openssl.vcproj", "{00D47558-B06D-4CC5-AF16-61940361BCE3}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Gdal1.3", "GDAL1.3\src\Gdal1.3.vcproj", "{F0B80E4B-FD5B-4371-9E47-7B82424EBA53}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdal", "gdal\gdal.vcproj", "{F0B80E4B-FD5B-4371-9E47-7B82424EBA53}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boost_1_32_0", "boost_1_32_0\boost_1_32_0.vcproj", "{317315E2-24B6-490C-967D-4B77B7DF5C34}"
EndProject
Added: trunk/Thirdparty/Thirdparty_gdal.sh
===================================================================
--- trunk/Thirdparty/Thirdparty_gdal.sh (rev 0)
+++ trunk/Thirdparty/Thirdparty_gdal.sh 2007-03-04 03:30:51 UTC (rev 2626)
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+##
+## Copyright (C) 2004-2006 Autodesk, Inc.
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of version 2.1 of the GNU Lesser
+## General Public License as published by the Free Software Foundation.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+##
+
+#############################################
+## build third party libraries for WMS: ##
+## boost_1_32_0, libcurl, openssl, gdal ##
+#############################################
+
+## Thirdparty_GDAL
+pushd . >& /dev/null
+cd gdal
+echo Building gdal
+cd src
+chmod a+x ./configure
+echo Build GDAL library with the following settings:
+echo gif support - internal
+echo jpeg support - internal
+echo png support - internal
+echo tiff support - internal
+echo geotiff support - internal
+echo libz support - internal
+echo python support - no
+echo OGR support - no
+echo postgreSQL support - no
+./configure --with-gif=internal --with-jpeg=internal --with-png=internal --with-libtiff=internal --with-geotiff=internal --without-ogr --with-pg=no --with-python=no --with-libz=internal
+make
+popd >& /dev/null
Property changes on: trunk/Thirdparty/Thirdparty_gdal.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/Thirdparty/Thirdparty_gdal.sln
===================================================================
--- trunk/Thirdparty/Thirdparty_gdal.sln (rev 0)
+++ trunk/Thirdparty/Thirdparty_gdal.sln 2007-03-04 03:30:51 UTC (rev 2626)
@@ -0,0 +1,19 @@
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdal", "gdal\gdal.vcproj", "{F0B80E4B-FD5B-4371-9E47-7B82424EBA53}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Release|Win32 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {F0B80E4B-FD5B-4371-9E47-7B82424EBA53}.Debug|Win32.ActiveCfg = Debug|Win32
+ {F0B80E4B-FD5B-4371-9E47-7B82424EBA53}.Debug|Win32.Build.0 = Debug|Win32
+ {F0B80E4B-FD5B-4371-9E47-7B82424EBA53}.Release|Win32.ActiveCfg = Release|Win32
+ {F0B80E4B-FD5B-4371-9E47-7B82424EBA53}.Release|Win32.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Property changes on: trunk/Thirdparty/Thirdparty_gdal.sln
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/Thirdparty/Thirdparty_wms.sh
===================================================================
--- trunk/Thirdparty/Thirdparty_wms.sh 2007-03-04 03:25:35 UTC (rev 2625)
+++ trunk/Thirdparty/Thirdparty_wms.sh 2007-03-04 03:30:51 UTC (rev 2626)
@@ -19,7 +19,7 @@
#############################################
## build third party libraries for WMS: ##
-## boost_1_32_0, libcurl, openssl, GDAL1.3 ##
+## boost_1_32_0, libcurl, openssl, gdal ##
#############################################
pushd . >& /dev/null
@@ -57,10 +57,8 @@
## Thirdparty_WMS
pushd . >& /dev/null
-cd GDAL1.3
-echo Building GDAL1.3
-mkdir -p linux/lib/optimized
-rm -f linux/lib/optimized/*.*
+cd gdal
+echo Building gdal
cd src
chmod a+x ./configure
echo Build GDAL library with the following settings:
@@ -75,8 +73,4 @@
echo postgreSQL support - no
./configure --with-gif=internal --with-jpeg=internal --with-png=internal --with-libtiff=internal --with-geotiff=internal --without-ogr --with-pg=no --with-python=no --with-libz=internal
make
-cp -f ./.libs/libgdal.a ../linux/lib/optimized
-cp -f ./.libs/libgdal.so ../linux/lib/optimized
-cp -f ./.libs/libgdal.so.1 ../linux/lib/optimized
-cp -f ./.libs/libgdal.so.1.9.0 ../linux/lib/optimized
popd >& /dev/null
Modified: trunk/Thirdparty/Thirdparty_wms.sln
===================================================================
--- trunk/Thirdparty/Thirdparty_wms.sln 2007-03-04 03:25:35 UTC (rev 2625)
+++ trunk/Thirdparty/Thirdparty_wms.sln 2007-03-04 03:30:51 UTC (rev 2626)
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Gdal1.3", "GDAL1.3\src\Gdal1.3.vcproj", "{F0B80E4B-FD5B-4371-9E47-7B82424EBA53}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdal", "gdal\gdal.vcproj", "{F0B80E4B-FD5B-4371-9E47-7B82424EBA53}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openssl", "openssl\openssl.vcproj", "{00D47558-B06D-4CC5-AF16-61940361BCE3}"
EndProject
Modified: trunk/Thirdparty/build.bat
===================================================================
--- trunk/Thirdparty/build.bat 2007-03-04 03:25:35 UTC (rev 2625)
+++ trunk/Thirdparty/build.bat 2007-03-04 03:30:51 UTC (rev 2626)
@@ -33,6 +33,7 @@
SET SDFENABLETHR=yes
SET WFSENABLETHR=yes
SET WMSENABLETHR=yes
+SET GDALENABLETHR=yes
SET FDOERROR=0
:study_params
@@ -62,12 +63,14 @@
SET SDFENABLETHR=no
SET WFSENABLETHR=no
SET WMSENABLETHR=no
+ SET GDALENABLETHR=no
SET FDOENABLETHR=no
:stp0_get_with
if not "%2"=="providers" goto stp1_get_with
SET SDFENABLETHR=yes
SET WFSENABLETHR=yes
SET WMSENABLETHR=yes
+ SET GDALENABLETHR=yes
goto next_param
:stp1_get_with
if not "%2"=="sdf" goto stp2_get_with
@@ -86,10 +89,15 @@
SET FDOENABLETHR=yes
goto next_param
:stp5_get_with
+if not "%2"=="gdal" goto stp6_get_with
+ SET GDALENABLETHR=yes
+ goto next_param
+:stp6_get_with
if not "%2"=="all" goto custom_error
SET SDFENABLETHR=yes
SET WFSENABLETHR=yes
SET WMSENABLETHR=yes
+ SET GDALENABLETHR=yes
SET FDOENABLETHR=yes
goto next_param
@@ -195,7 +203,7 @@
rem # Build WMS Provider Thirdparty Files
:rebuild_wms
-if "%WMSENABLETHR%"=="no" goto end
+if "%WMSENABLETHR%"=="no" goto rebuild_gdal
if "%TYPEACTIONTHR%"=="install" goto install_wms_files
echo %MSACTIONTHR% %TYPEBUILDTHR% Thirdparty WMS dlls
@@ -205,7 +213,7 @@
msbuild libcurl\lib\curllib.sln /t:%MSACTIONTHR% /p:Configuration=%TYPEBUILDTHR% /p:Platform="Win32" /nologo /consoleloggerparameters:NoSummary
SET FDOERROR=%errorlevel%
if "%FDOERROR%"=="1" goto error
-msbuild GDAL1.3\src\Gdal1.3.sln /t:%MSACTIONTHR% /p:Configuration=%TYPEBUILDTHR% /p:Platform="Win32" /nologo /consoleloggerparameters:NoSummary
+msbuild gdal\gdal.sln /t:%MSACTIONTHR% /p:Configuration=%TYPEBUILDTHR% /p:Platform="Win32" /nologo /consoleloggerparameters:NoSummary
SET FDOERROR=%errorlevel%
if "%FDOERROR%"=="1" goto error
msbuild boost_1_32_0\boost_1_32_0.vcproj /t:%MSACTIONTHR% /p:Configuration=%TYPEBUILDTHR% /p:Platform="Win32" /nologo /consoleloggerparameters:NoSummary
@@ -217,10 +225,29 @@
rem # Install WMS Provider Thirdparty Files
:install_wms_files
echo copy %TYPEBUILDTHR% Thirdparty WMS dlls
-copy /y "GDAL1.3\windows\bin\VC8\%TYPEBUILDTHR%\gdal13.dll" "%FDOBINPATHTHR%"
+copy /y "gdal\bin\win32\%TYPEBUILDTHR%\gdal14.dll" "%FDOBINPATHTHR%"
copy /y "boost_1_32_0\bin\boost\libs\thread\build\boost_thread.dll\vc-8_0\%TYPEBUILDTHR%\threading-multi\boost_thread-vc80-mt%TYPEBUILDTHRPATH%-1_32.dll" "%FDOBINPATHTHR%"
rem # End WMS part #
+
+rem # Build GDAL Provider Thirdparty Files
+:rebuild_gdal
+if "%GDALENABLETHR%"=="no" goto end
+if "%TYPEACTIONTHR%"=="install" goto install_gdal_files
+
+echo %MSACTIONTHR% %TYPEBUILDTHR% Thirdparty GDAL dlls
+msbuild gdal\gdal.sln /t:%MSACTIONTHR% /p:Configuration=%TYPEBUILDTHR% /p:Platform="Win32" /nologo /consoleloggerparameters:NoSummary
+SET FDOERROR=%errorlevel%
+if "%FDOERROR%"=="1" goto error
+if "%TYPEACTIONTHR%"=="build" goto end
+if "%TYPEACTIONTHR%"=="clean" goto end
+
+rem # Install GDAL Provider Thirdparty Files
+:install_gdal_files
+echo copy %TYPEBUILDTHR% Thirdparty GDAL dlls
+copy /y "gdal\bin\win32\%TYPEBUILDTHR%\gdal14.dll" "%FDOBINPATHTHR%"
+rem # End GDAL part #
+
:end
echo End Thirdparty %MSACTIONTHR%
exit /B 0
@@ -240,6 +267,6 @@
echo OutFolder: -o[utpath]=destination folder for binaries
echo BuildType: -c[onfig]=release(default), debug
echo Action: -a[ction]=build(default), buildinstall, install, clean
-echo WithModule: -w[ith]=all(default), fdo, providers, sdf, wfs, wms
+echo WithModule: -w[ith]=all(default), fdo, providers, sdf, wfs, wms, gdal
echo **************************************************************************
exit /B 0
\ No newline at end of file
Modified: trunk/setenvironment.bat
===================================================================
--- trunk/setenvironment.bat 2007-03-04 03:25:35 UTC (rev 2625)
+++ trunk/setenvironment.bat 2007-03-04 03:30:51 UTC (rev 2626)
@@ -42,6 +42,9 @@
if not exist "%FDOMYSQL%" SET FDOMYSQL=C:\Program Files\MySQL\MySQL Server 5.0
if not exist "%FDOMYSQL%" echo Optional FDO environment variable FDOMYSQL is not set
+if not exist "%FDOGDAL%" SET FDOGDAL=%FDOTHIRDPARTY%\gdal
+if not exist "%FDOGDAL%" echo Optional FDO environment variable FDOGDAL is not set
+
SET ACTIVENAMECHECK="Microsoft .Net Framework"
SET ACTIVEPATHCHECK="C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727"
if not exist %ACTIVEPATHCHECK% goto error
Modified: trunk/setenvironment.sh
===================================================================
--- trunk/setenvironment.sh 2007-03-04 03:25:35 UTC (rev 2625)
+++ trunk/setenvironment.sh 2007-03-04 03:30:51 UTC (rev 2626)
@@ -63,6 +63,19 @@
echo ""
fi
+export FDOGDAL=$FDOTHIRDPARTY/gdal
+
+if test ! -e "$FDOGDAL"; then
+ echo ""
+ echo "OPTIONAL: The default location for the GDAL SDK files"
+ echo "was not found. The setenvironment script sets the default value to: "
+ echo "$FDOTHIRDPARTY/gdal. "
+ echo "If you need to build the FDO GDAL or WMS Providers, modify the "
+ echo "setenvironment.sh script with a valid path and set FDOGDAL to "
+ echo "point to the location of the GDAL SDK files."
+ echo ""
+fi
+
export FDOMYSQL=$FDOTHIRDPARTY/mysql/rhlinux
if test ! -e "$FDOMYSQL"; then
More information about the fdo-commits
mailing list