[fdo-commits] r2654 - in trunk: . Providers/GDAL/Src/Provider
Thirdparty
svn_fdo at osgeo.org
svn_fdo at osgeo.org
Wed Mar 7 15:49:29 EST 2007
Author: gregboone
Date: 2007-03-07 15:49:29 -0500 (Wed, 07 Mar 2007)
New Revision: 2654
Modified:
trunk/Providers/GDAL/Src/Provider/Makefile.am
trunk/Thirdparty/Makefile.am
trunk/Thirdparty/Thirdparty.sh
trunk/Thirdparty/Thirdparty_gdal.sh
trunk/Thirdparty/Thirdparty_wms.sh
trunk/setenvironment.sh
Log:
Ticket #5: Update to GDAL 1.4.0
Modified: trunk/Providers/GDAL/Src/Provider/Makefile.am
===================================================================
--- trunk/Providers/GDAL/Src/Provider/Makefile.am 2007-03-07 17:45:54 UTC (rev 2653)
+++ trunk/Providers/GDAL/Src/Provider/Makefile.am 2007-03-07 20:49:29 UTC (rev 2654)
@@ -118,6 +118,6 @@
-I../Message/Inc/ \
-I$(FDO)/Unmanaged/Inc \
-I$(FDOUTILITIES)/Common/Inc \
- -I$(FDOGDAL)/include
+ -I$(FDOGDAL)/include
CXXFLAGS = @CXXFLAGS@ -D__USE_GNU -DLINUX -DLINUX_IA32
Modified: trunk/Thirdparty/Makefile.am
===================================================================
--- trunk/Thirdparty/Makefile.am 2007-03-07 17:45:54 UTC (rev 2653)
+++ trunk/Thirdparty/Makefile.am 2007-03-07 20:49:29 UTC (rev 2654)
@@ -278,9 +278,10 @@
thdlibdir = $(prefix)/lib
thdlib_DATA = \
- 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
+ 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 \
+ gdal/lib/libgdal.so.1.11.0
install-data-hook :
@ln -s -f $(thdlibdir)/libxalan-c.so.17.0 $(thdlibdir)/libxalan-c.so.17
@@ -289,12 +290,16 @@
@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.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
@chmod a+x $(thdlibdir)/libxalanMsg.so
@chmod a+x $(thdlibdir)/libxerces-c.so.25
@chmod a+x $(thdlibdir)/libxerces-c.so
+ @chmod a+x $(thdlibdir)/libgdal.so.1
+ @chmod a+x $(thdlibdir)/libgdal.so
uninstall :
@rm -f $(thdlibdir)/libxalan-c.so*
@@ -302,3 +307,4 @@
@rm -f $(thdlibdir)/libxerces-c.so*
@rm -f $(thdlibdir)/libgdal.so*
+
Modified: trunk/Thirdparty/Thirdparty.sh
===================================================================
--- trunk/Thirdparty/Thirdparty.sh 2007-03-07 17:45:54 UTC (rev 2653)
+++ trunk/Thirdparty/Thirdparty.sh 2007-03-07 20:49:29 UTC (rev 2654)
@@ -81,23 +81,41 @@
popd >& /dev/null
-## Thirdparty_WMS
-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
-make install
-popd >& /dev/null
+## Thirdparty_WMS/GDAL
+if test "$FDOGDAL" == "$FDOTHIRDPARTY/gdal"; then
+ pushd . >& /dev/null
+ cd gdal
+ echo Building gdal
+ mkdir -p lib
+ mkdir -p include
+ rm -f lib/*.libgdal.a
+ rm -f lib/*.libgdal.so
+ rm -f lib/*.libgdal.so.1
+ rm -f lib/*.libgdal.so.1.11.0
+ rm -f include/*
+ 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
+ cp -f .libs/libgdal.a lib/
+ cp -f .libs/libgdal.la lib/
+ cp -f .libs/libgdal.so lib/
+ cp -f .libs/libgdal.so.1 lib/
+ cp -f .libs/libgdal.so.1.11.0 lib/
+ cp -f port/*.h include/
+ cp -f gcore/*.h include/
+ cp -f alg/*.h include/
+ cp -f ogr/*.h include/
+ popd >& /dev/null
+else
+ echo "Building of the Thirdparty/GDAL libraries has been skipped. Environment variable FDOGDAL points to a previously installed version of GDAL at $FDOGDAL. This version of GDAL will be used to build the FDO WMS and GDAL providers."
+fi
Modified: trunk/Thirdparty/Thirdparty_gdal.sh
===================================================================
--- trunk/Thirdparty/Thirdparty_gdal.sh 2007-03-07 17:45:54 UTC (rev 2653)
+++ trunk/Thirdparty/Thirdparty_gdal.sh 2007-03-07 20:49:29 UTC (rev 2654)
@@ -21,23 +21,41 @@
## 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
-make install
-popd >& /dev/null
+## Thirdparty_WMS/GDAL
+if test "$FDOGDAL" == "$FDOTHIRDPARTY/gdal"; then
+ pushd . >& /dev/null
+ cd gdal
+ echo Building gdal
+ mkdir -p lib
+ mkdir -p include
+ rm -f lib/*.libgdal.a
+ rm -f lib/*.libgdal.so
+ rm -f lib/*.libgdal.so.1
+ rm -f lib/*.libgdal.so.1.11.0
+ rm -f include/*
+ 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
+ cp -f .libs/libgdal.a lib/
+ cp -f .libs/libgdal.la lib/
+ cp -f .libs/libgdal.so lib/
+ cp -f .libs/libgdal.so.1 lib/
+ cp -f .libs/libgdal.so.1.11.0 lib/
+ cp -f port/*.h include/
+ cp -f gcore/*.h include/
+ cp -f alg/*.h include/
+ cp -f ogr/*.h include/
+ popd >& /dev/null
+else
+ echo "Building of the Thirdparty/GDAL libraries has been skipped. Environment variable FDOGDAL points to a previously installed version of GDAL at $FDOGDAL. This version of GDAL will be used to build the FDO WMS and GDAL providers."
+fi
Modified: trunk/Thirdparty/Thirdparty_wms.sh
===================================================================
--- trunk/Thirdparty/Thirdparty_wms.sh 2007-03-07 17:45:54 UTC (rev 2653)
+++ trunk/Thirdparty/Thirdparty_wms.sh 2007-03-07 20:49:29 UTC (rev 2654)
@@ -55,22 +55,41 @@
mv -f ./libcrypto.a ./lib/linux/libcrypto.a
popd >& /dev/null
-## Thirdparty_WMS
-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
+## Thirdparty_WMS/GDAL
+if test "$FDOGDAL" == "$FDOTHIRDPARTY/gdal"; then
+ pushd . >& /dev/null
+ cd gdal
+ echo Building gdal
+ mkdir -p lib
+ mkdir -p include
+ rm -f lib/*.libgdal.a
+ rm -f lib/*.libgdal.so
+ rm -f lib/*.libgdal.so.1
+ rm -f lib/*.libgdal.so.1.11.0
+ rm -f include/*
+ 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
+ cp -f .libs/libgdal.a lib/
+ cp -f .libs/libgdal.la lib/
+ cp -f .libs/libgdal.so lib/
+ cp -f .libs/libgdal.so.1 lib/
+ cp -f .libs/libgdal.so.1.11.0 lib/
+ cp -f port/*.h include/
+ cp -f gcore/*.h include/
+ cp -f alg/*.h include/
+ cp -f ogr/*.h include/
+ popd >& /dev/null
+else
+ echo "Building of the Thirdparty/GDAL libraries has been skipped. Environment variable FDOGDAL points to a previously installed version of GDAL at $FDOGDAL. This version of GDAL will be used to build the FDO WMS and GDAL providers."
+fi
Modified: trunk/setenvironment.sh
===================================================================
--- trunk/setenvironment.sh 2007-03-07 17:45:54 UTC (rev 2653)
+++ trunk/setenvironment.sh 2007-03-07 20:49:29 UTC (rev 2654)
@@ -54,7 +54,7 @@
if test ! -e "$SDEHOME"; then
echo ""
- echo "OPTIONAL: The default location for the ArcSDE client SDK files"
+ echo "NOTE: The default location for the ArcSDE client SDK files"
echo "was not found. The setenvironment script sets the default value to: "
echo "$FDOTHIRDPARTY/ESRI/ArcSDEClient91/Linux. "
echo "If you need to build the FDO ArcSDE Provider, modify the "
@@ -63,24 +63,26 @@
echo ""
fi
-export FDOGDAL=/usr/local
+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 "user/local. "
- 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
+echo ""
+echo "NOTE: The setenvironment.sh script sets the installation location for "
+echo "the GDAL SDK files to $FDOTHIRDPARTY/gdal. "
+echo "If this value remains unchanged, the FDO build process will"
+echo "build the version of GDAL located in Thirdparty/gdal and will "
+echo "install the resulting libraries in /usr/local/fdo-3.3.0. The FDO build"
+echo "process will then use that location when building the GDAL and"
+echo "WMS providers. If you wish to build the FDO GDAL or WMS Providers"
+echo "using a previously installed version of GDAL, modify the setenvironment.sh "
+echo "script and set FDOGDAL to point to the existing GDAL installation."
+echo "For example: /user/local (The default GDAL installation path)."
+echo ""
export FDOMYSQL=$FDOTHIRDPARTY/mysql/rhlinux
if test ! -e "$FDOMYSQL"; then
echo ""
- echo "OPTIONAL: The default location for the MySQL SDK files "
+ echo "NOTE: The default location for the MySQL SDK files "
echo "was not found. The setenvironment script sets the default value to: "
echo "$FDOTHIRDPARTY/mysql/rhlinux "
echo "If you need to build the FDO MySQL Provider, and have chosen not "
@@ -88,7 +90,7 @@
echo "process, modify the setenvironment.sh script and set FDOMYSQL to point"
echo "to the location of the MySQL client installation. If you have chosen "
echo "to install the MySQL client using the RPM install, this environment "
- echo "variable does not need to be set"
+ echo "variable does not need to be set and this warning can be ignored."
echo ""
fi
@@ -96,11 +98,11 @@
if test ! -e "$FDOODBC"; then
echo ""
- echo "OPTIONAL: The default path for the ODBC SDK files was not found. "
+ echo "NOTE: The default path for the ODBC SDK files was not found. "
echo "The setenvironment script sets the default value to: "
echo "$FDOODBC"
echo "If you need to build the ODBC prvovider, modify the setenvironment.sh "
- echo "script and set FDOODBC to point to the location of the ODBC SDK"
+ echo "script and set FDOODBC to point to the location of the ODBC SDK."
echo ""
fi
More information about the fdo-commits
mailing list