[prev in list] [next in list] [prev in thread] [next in thread]
List: fdo-commits
Subject: [fdo-commits] r7607 - sandbox/gdal2/Thirdparty/gdal
From: svn_fdo () osgeo ! org
Date: 2018-01-11 19:22:36
Message-ID: 20180111192236.B9DB73900D8 () trac ! osgeo ! org
[Download RAW message or body]
Author: jng
Date: 2018-01-11 11:22:36 -0800 (Thu, 11 Jan 2018)
New Revision: 7607
Modified:
sandbox/gdal2/Thirdparty/gdal/build.sh
Log:
#912: Fix line endings
Modified: sandbox/gdal2/Thirdparty/gdal/build.sh
===================================================================
--- sandbox/gdal2/Thirdparty/gdal/build.sh 2018-01-11 19:02:30 UTC (rev 7606)
+++ sandbox/gdal2/Thirdparty/gdal/build.sh 2018-01-11 19:22:36 UTC (rev 7607)
@@ -1,198 +1,198 @@
-#!/bin/sh
-
-##
-## Copyright (C) 2013 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
-##
-
-TYPEACTION=buildinstall
-TYPEARCHITECTURE=32
-
-### study parameters ###
-while test $# -gt 0
-do
- arg="$1"
- shift
- case $arg in
- -h |--h | --help)
- SHOWHELP=yes
- break
- ;;
- -b | --b | --config)
- if test "$1" == ""; then
- echo "$arg Invalid parameter $1"
- exit 1
- else
- TYPEARCHITECTURE="$1"
- fi
- shift
- ;;
- -a | --a | --action)
- if test "$1" == buildinstall; then
- TYPEACTION=buildinstall
- elif test "$1" == build; then
- TYPEACTION=build
- elif test "$1" == install; then
- TYPEACTION=install
- elif test "$1" == uninstall; then
- TYPEACTION=uninstall
- elif test "$1" == clean; then
- TYPEACTION=clean
- else
- echo "$arg Invalid parameter $1"
- exit 1
- fi
- shift
- ;;
- -*)
- echo "The command option is not recognized: $arg"
- echo "Please use the format:"
- SHOWHELP=yes
- break
- ;;
-
- *)
- echo "The command is not recognized: $arg"
- echo "Please use the format:"
- SHOWHELP=yes
- break
- ;;
- esac
-done
-### end of study parameters ###
-
-
-if test "$SHOWHELP" == yes; then
-
- echo "*******************************************************************"
- echo "build.sh [--h]"
- echo " [--a Action]"
- echo " [--b BuildArchicture]"
- echo " "
- echo "Help: --h[elp]"
- echo "Action: --a[ction] buildinstall(default), build, install, \
uninstall, clean"
- echo "ConfigArchitecture: --b[build] 32(default), 64"
- echo "*******************************************************************"
-
- exit 0
-fi
-
-if test "$FDOGDAL" == ""; then
-
- echo "Error: Environment variable $FDOGDAL is unset. Cannot continue build."
- exit 1
-
-fi
-
-if test "$FDOGDAL" == "$FDOTHIRDPARTY/gdal"; then
-
- 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.17.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 - yes
- echo postgreSQL support - no
- echo odbc support - no
-
- if [[ "$CFLAGS" != *"-m$TYPEARCHITECTURE"* ]]; then
- CFLAGS="$CFLAGS -m$TYPEARCHITECTURE"
- echo "Exporting CFLAGS: "$CFLAGS""
- export CFLAGS
- fi
-
- if [[ "$CPPFLAGS" != *"-m$TYPEARCHITECTURE"* ]]; then
- CPPFLAGS="$CPPFLAGS -m$TYPEARCHITECTURE"
- echo "Exporting CPPFLAGS: "$CPPFLAGS""
- export CPPFLAGS
- fi
-
- if [[ "$LDFLAGS" != *"-m$TYPEARCHITECTURE"* ]]; then
- LDFLAGS="$LDFLAGS -m$TYPEARCHITECTURE"
- echo "Exporting LDFLAGS: "$LDFLAGS""
- export LDFLAGS
- fi
-
- if test "$TYPEARCHITECTURE" == "32" ; then
- if test "$HOSTTYPE" == "i686" ; then
- if [[ "$CPPFLAGS" != *"-march=i686"* ]]; then
- CPPFLAGS="$CPPFLAGS -march=i686"
- echo "Exporting CPPFLAGS: "$CPPFLAGS""
- export CPPFLAGS
- fi
- fi
- fi
-
- ./configure --with-gif=internal --with-jpeg=internal --with-png=internal \
--with-libtiff=internal --with-geotiff=internal --with-pg=no --with-python=no \
--with-libz=internal --with-odbc=no
- if [ "$?" -ne 0 ] ; then
- exit 1
- fi
-
- if test "$TYPEACTION" == buildinstall || test "$TYPEACTION" == build ; then
-
- make
- if [ "$?" -ne 0 ] ; then
- exit 1
- fi
-
- cp -f .libs/libgdal.a lib/
- cp -f .libs/libgdal.so lib/
- cp -f .libs/libgdal.so.1 lib/
- cp -f .libs/libgdal.so.1.17.0 lib/
-
- cp -f port/*.h include/
- cp -f gcore/*.h include/
- cp -f alg/*.h include/
- cp -f ogr/*.h include/
-
- fi
-
- if test "$TYPEACTION" == clean ; then
-
- rm -rf lib/libgdal.a
- rm -rf lib/libgdal.so
- rm -rf lib/libgdal.so.1
- rm -rf lib/libgdal.so.1.17.0
-
- make clean
- if [ "$?" -ne 0 ] ; then
- exit 1
- fi
-
- fi
-
-else
-
- echo "Building of the Thirdparty/GDAL libraries has been skipped. Environment \
variable FDOGDAL points to a previously installed version of GDAL at \
$FDOGDAL"
-
-fi
-
-exit 0
-
-
+#!/bin/sh
+
+##
+## Copyright (C) 2013 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
+##
+
+TYPEACTION=buildinstall
+TYPEARCHITECTURE=32
+
+### study parameters ###
+while test $# -gt 0
+do
+ arg="$1"
+ shift
+ case $arg in
+ -h |--h | --help)
+ SHOWHELP=yes
+ break
+ ;;
+ -b | --b | --config)
+ if test "$1" == ""; then
+ echo "$arg Invalid parameter $1"
+ exit 1
+ else
+ TYPEARCHITECTURE="$1"
+ fi
+ shift
+ ;;
+ -a | --a | --action)
+ if test "$1" == buildinstall; then
+ TYPEACTION=buildinstall
+ elif test "$1" == build; then
+ TYPEACTION=build
+ elif test "$1" == install; then
+ TYPEACTION=install
+ elif test "$1" == uninstall; then
+ TYPEACTION=uninstall
+ elif test "$1" == clean; then
+ TYPEACTION=clean
+ else
+ echo "$arg Invalid parameter $1"
+ exit 1
+ fi
+ shift
+ ;;
+ -*)
+ echo "The command option is not recognized: $arg"
+ echo "Please use the format:"
+ SHOWHELP=yes
+ break
+ ;;
+
+ *)
+ echo "The command is not recognized: $arg"
+ echo "Please use the format:"
+ SHOWHELP=yes
+ break
+ ;;
+ esac
+done
+### end of study parameters ###
+
+
+if test "$SHOWHELP" == yes; then
+
+ echo "*******************************************************************"
+ echo "build.sh [--h]"
+ echo " [--a Action]"
+ echo " [--b BuildArchicture]"
+ echo " "
+ echo "Help: --h[elp]"
+ echo "Action: --a[ction] buildinstall(default), build, install, \
uninstall, clean" + echo "ConfigArchitecture: --b[build] 32(default), 64"
+ echo "*******************************************************************"
+
+ exit 0
+fi
+
+if test "$FDOGDAL" == ""; then
+
+ echo "Error: Environment variable $FDOGDAL is unset. Cannot continue build."
+ exit 1
+
+fi
+
+if test "$FDOGDAL" == "$FDOTHIRDPARTY/gdal"; then
+
+ 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.17.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 - yes
+ echo postgreSQL support - no
+ echo odbc support - no
+
+ if [[ "$CFLAGS" != *"-m$TYPEARCHITECTURE"* ]]; then
+ CFLAGS="$CFLAGS -m$TYPEARCHITECTURE"
+ echo "Exporting CFLAGS: "$CFLAGS""
+ export CFLAGS
+ fi
+
+ if [[ "$CPPFLAGS" != *"-m$TYPEARCHITECTURE"* ]]; then
+ CPPFLAGS="$CPPFLAGS -m$TYPEARCHITECTURE"
+ echo "Exporting CPPFLAGS: "$CPPFLAGS""
+ export CPPFLAGS
+ fi
+
+ if [[ "$LDFLAGS" != *"-m$TYPEARCHITECTURE"* ]]; then
+ LDFLAGS="$LDFLAGS -m$TYPEARCHITECTURE"
+ echo "Exporting LDFLAGS: "$LDFLAGS""
+ export LDFLAGS
+ fi
+
+ if test "$TYPEARCHITECTURE" == "32" ; then
+ if test "$HOSTTYPE" == "i686" ; then
+ if [[ "$CPPFLAGS" != *"-march=i686"* ]]; then
+ CPPFLAGS="$CPPFLAGS -march=i686"
+ echo "Exporting CPPFLAGS: "$CPPFLAGS""
+ export CPPFLAGS
+ fi
+ fi
+ fi
+
+ ./configure --with-gif=internal --with-jpeg=internal --with-png=internal \
--with-libtiff=internal --with-geotiff=internal --with-pg=no --with-python=no \
--with-libz=internal --with-odbc=no + if [ "$?" -ne 0 ] ; then
+ exit 1
+ fi
+
+ if test "$TYPEACTION" == buildinstall || test "$TYPEACTION" == build ; then
+
+ make
+ if [ "$?" -ne 0 ] ; then
+ exit 1
+ fi
+
+ cp -f .libs/libgdal.a lib/
+ cp -f .libs/libgdal.so lib/
+ cp -f .libs/libgdal.so.1 lib/
+ cp -f .libs/libgdal.so.1.17.0 lib/
+
+ cp -f port/*.h include/
+ cp -f gcore/*.h include/
+ cp -f alg/*.h include/
+ cp -f ogr/*.h include/
+
+ fi
+
+ if test "$TYPEACTION" == clean ; then
+
+ rm -rf lib/libgdal.a
+ rm -rf lib/libgdal.so
+ rm -rf lib/libgdal.so.1
+ rm -rf lib/libgdal.so.1.17.0
+
+ make clean
+ if [ "$?" -ne 0 ] ; then
+ exit 1
+ fi
+
+ fi
+
+else
+
+ echo "Building of the Thirdparty/GDAL libraries has been skipped. Environment \
variable FDOGDAL points to a previously installed version of GDAL at $FDOGDAL" +
+fi
+
+exit 0
+
+
_______________________________________________
fdo-commits mailing list
fdo-commits@lists.osgeo.org
https://lists.osgeo.org/mailman/listinfo/fdo-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic