Skip to content

terralib / terralib

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 10ce5643 by Rodrigo Avancini
Options

Updating some libs to release-5.4, the same as windows vs2017.

1 parent 24194030
Expand all
Inline Side-by-side
Showing 5 changed files with 35 additions and 35 deletions
install/install-3rdparty-linux-ubuntu-16.04.sh
......@@ -464,18 +464,18 @@ fi
#
# GEOS version 3.4.2
# GEOS version 3.5.0
#
if [ ! -f "$TERRALIB_DEPENDENCIES_DIR/lib/libgeos.so" ]; then
echo "installing GEOS..."
echo ""
sleep 1s
tar xjvf geos-3.4.2.tar.bz2
valid $? "Error: could not uncompress geos-3.4.2.tar.bz2!"
tar xjvf geos-3.5.0.tar.bz2
valid $? "Error: could not uncompress geos-3.5.0.tar.bz2!"
cd geos-3.4.2
valid $? "Error: could not enter geos-3.4.2 dir!"
cd geos-3.5.0
valid $? "Error: could not enter geos-3.5.0 dir!"
./configure --prefix=$TERRALIB_DEPENDENCIES_DIR
valid $? "Error: could not configure GEOS!"
......@@ -764,18 +764,18 @@ fi
#
# Boost version 1.60
# Boost version 1.65.0
#
if [ ! -f "$TERRALIB_DEPENDENCIES_DIR/lib/libboost_thread.so" ]; then
echo "installing boost..."
echo ""
sleep 1s
tar xzvf boost_1_60_0.tar.gz
valid $? "Error: could not uncompress boost_1_60_0.tar.gz!"
tar xzvf boost_1_65_0.tar.gz
valid $? "Error: could not uncompress boost_1_65_0.tar.gz!"
cd boost_1_60_0
valid $? "Error: could not enter boost_1_60_0!"
cd boost_1_65_0
valid $? "Error: could not enter boost_1_65_0!"
./bootstrap.sh
valid $? "Error: could not configure Boost!"
......@@ -878,7 +878,7 @@ fi
#
# SpatiaLite version 4.2.0
# SpatiaLite version 4.3.0
# Site: https://www.gaia-gis.it/fossil/libspatialite
# Obs.: In the future we should turn on libxml2 support.
#
......@@ -886,11 +886,11 @@ if [ ! -f "$TERRALIB_DEPENDENCIES_DIR/lib/libspatialite.so" ]; then
echo "installing SpatiaLite..."
sleep 1s
tar xzvf libspatialite-4.2.0.tar.gz
valid $? "Error: could not uncompress libspatialite-4.2.0.tar.gz!"
tar xzvf libspatialite-4.3.0a.tar.gz
valid $? "Error: could not uncompress libspatialite-4.3.0a.tar.gz!"
cd libspatialite-4.2.0
valid $? "Error: could not enter libspatialite-4.2.0!"
cd libspatialite-4.3.0a
valid $? "Error: could not enter libspatialite-4.3.0a!"
CPPFLAGS="-I$TERRALIB_DEPENDENCIES_DIR -I$TERRALIB_DEPENDENCIES_DIR/include -I$TERRALIB_DEPENDENCIES_DIR/include/libxml2 -I$TERRALIB_DEPENDENCIES_DIR/include/libxml2/libxml" LDFLAGS="-L$TERRALIB_DEPENDENCIES_DIR/lib" ./configure --prefix=$TERRALIB_DEPENDENCIES_DIR --enable-proj --enable-geos --enable-geosadvanced --enable-iconv --enable-freexl --enable-geocallbacks --enable-epsg --enable-mathsql --enable-libxml2=no --enable-geopackage --with-geosconfig=$TERRALIB_DEPENDENCIES_DIR/bin/geos-config
valid $? "Error: could not configure libspatialite!"
......
install/install-3rdparty-macos-sierra.sh
......@@ -295,7 +295,7 @@ fi
#
# GEOS version 3.4.2
# GEOS version 3.5.0
# Site: http://geos.osgeo.org
#
if [ ! -f "$TERRALIB_DEPENDENCIES_DIR/lib/libgeos.dylib" ]; then
......@@ -304,11 +304,11 @@ if [ ! -f "$TERRALIB_DEPENDENCIES_DIR/lib/libgeos.dylib" ]; then
sleep 1s
tar xjvf geos-3.4.2.tar.bz2 > /dev/null 2> /dev/null
valid $? "Error: could not uncompress geos-3.4.2.tar.bz2!"
tar xjvf geos-3.5.0.tar.bz2 > /dev/null 2> /dev/null
valid $? "Error: could not uncompress geos-3.5.0.tar.bz2!"
cd geos-3.4.2 > /dev/null
valid $? "Error: could not enter geos-3.4.2 dir!"
cd geos-3.5.0 > /dev/null
valid $? "Error: could not enter geos-3.5.0 dir!"
./configure --prefix=$TERRALIB_DEPENDENCIES_DIR > /dev/null 2>> ../build.log
valid $? "Error: could not configure GEOS!"
......@@ -613,7 +613,7 @@ fi
#
# Boost version 1.60
# Boost version 1.65
# Site: http://www.boost.org
#
if [ ! -f "$TERRALIB_DEPENDENCIES_DIR/lib/libboost_thread.dylib" ]; then
......@@ -622,11 +622,11 @@ if [ ! -f "$TERRALIB_DEPENDENCIES_DIR/lib/libboost_thread.dylib" ]; then
sleep 1s
tar xzvf boost_1_60_0.tar.gz > /dev/null 2> /dev/null
valid $? "Error: could not uncompress boost_1_60_0.tar.gz!"
tar xzvf boost_1_65_0.tar.gz > /dev/null 2> /dev/null
valid $? "Error: could not uncompress boost_1_65_0.tar.gz!"
cd boost_1_60_0 > /dev/null
valid $? "Error: could not enter boost_1_60_0!"
cd boost_1_65_0 > /dev/null
valid $? "Error: could not enter boost_1_65_0!"
./bootstrap.sh --with-toolset=clang --prefix=$TERRALIB_DEPENDENCIES_DIR -with-icu=$TERRALIB_DEPENDENCIES_DIR > /dev/null 2>> ../build.log
valid $? "Error: could not configure Boost!"
......@@ -734,7 +734,7 @@ fi
#
# SpatiaLite version 4.2.0
# SpatiaLite version 4.3.0a
# Site: https://www.gaia-gis.it/fossil/libspatialite
# Obs.: In the future we should turn on libxml2 support.
#
......@@ -744,11 +744,11 @@ if [ ! -f "$TERRALIB_DEPENDENCIES_DIR/lib/libspatialite.dylib" ]; then
sleep 1s
tar xzvf libspatialite-4.2.0.tar.gz > /dev/null 2> /dev/null
valid $? "Error: could not uncompress libspatialite-4.2.0.tar.gz!"
tar xzvf libspatialite-4.3.0a.tar.gz > /dev/null 2> /dev/null
valid $? "Error: could not uncompress libspatialite-4.3.0a.tar.gz!"
cd libspatialite-4.2.0 > /dev/null
valid $? "Error: could not enter libspatialite-4.2.0!"
cd libspatialite-4.3.0a > /dev/null
valid $? "Error: could not enter libspatialite-4.3.0a!"
CPPFLAGS="-I$TERRALIB_DEPENDENCIES_DIR -I$TERRALIB_DEPENDENCIES_DIR/include -I$TERRALIB_DEPENDENCIES_DIR/include/libxml2 -I$TERRALIB_DEPENDENCIES_DIR/include/libxml2/libxml" LDFLAGS="-L$TERRALIB_DEPENDENCIES_DIR/lib" ./configure --prefix=$TERRALIB_DEPENDENCIES_DIR --enable-proj --enable-geos --enable-geosadvanced --enable-iconv --enable-freexl --enable-geocallbacks --enable-epsg --enable-mathsql --enable-libxml2=no --enable-geopackage --with-geosconfig=$TERRALIB_DEPENDENCIES_DIR/bin/geos-config > /dev/null 2>> ../build.log
valid $? "Error: could not configure libspatialite!"
......
packages/linux/deb-boost.sh
......@@ -30,8 +30,8 @@ DEBNAME=terralib-boost
DEBVERSION=1.60.0
DEBARC=amd64
LIBNAME=Boost
FILENAME=boost_1_60_0.tar.gz
FOLDERNAME=boost_1_60_0
FILENAME=boost_1_65_0.tar.gz
FOLDERNAME=boost_1_65_0
if [ -z "$OUTPUT_PATH" ]; then
OUTPUT_PATH=`pwd`/../../../3rdparty
fi
......@@ -66,7 +66,7 @@ Copyright: Copyright (C) 2008 National Institute For Space Research (INPE) - Bra
License: LGPL-3.0
TerraLib is free software, you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
TerraLib is distributed in the hope that it will be useful,
......@@ -74,7 +74,7 @@ License: LGPL-3.0
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 General Public License
You should have received a copy of the GNU General Public License
along with this program. If not, write to TerraLib Team at <terralib-team@terralib.org>.
EOF
#
......@@ -101,7 +101,7 @@ EOF
#
# Create rules file:
#
cat > debian/rules <<EOF
cat > debian/rules <<EOF
#!/usr/bin/make -f
%:
dh \$@
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!