[geos-commits] [SCM] GEOS branch master updated. f2600b74c5ad1889824651d24fed784fa32e47c2
git at osgeo.org
git at osgeo.org
Mon Mar 25 18:40:05 PDT 2019
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".
The branch, master has been updated
via f2600b74c5ad1889824651d24fed784fa32e47c2 (commit)
via e7e4a239771cf361964a276f65bff45f56ba3bec (commit)
via 6f9916f751954904b1f6b98e0398eebff9021a11 (commit)
from adfd98a3de0872db6d44541f12f83a7c610dcf23 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f2600b74c5ad1889824651d24fed784fa32e47c2
Author: Daniel Baston <dbaston at gmail.com>
Date: Mon Mar 25 17:46:21 2019 -0400
Fix make distcheck failures
diff --git a/include/geos/operation/polygonize/Makefile.am b/include/geos/operation/polygonize/Makefile.am
index f9e83ce..4329213 100644
--- a/include/geos/operation/polygonize/Makefile.am
+++ b/include/geos/operation/polygonize/Makefile.am
@@ -1,16 +1,16 @@
#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
+# This file is part of project GEOS (http://trac.osgeo.org/geos/)
#
-#SUBDIRS =
+#SUBDIRS =
-#EXTRA_DIST =
+#EXTRA_DIST =
geosdir = $(includedir)/geos/operation/polygonize
geos_HEADERS = \
+ BuildArea.h \
EdgeRing.h \
PolygonizeDirectedEdge.h \
PolygonizeEdge.h \
PolygonizeGraph.h \
- Polygonizer.h \
- BuildArea.h
+ Polygonizer.h
diff --git a/include/geos/operation/valid/Makefile.am b/include/geos/operation/valid/Makefile.am
index 8e1c3ad..8d62486 100644
--- a/include/geos/operation/valid/Makefile.am
+++ b/include/geos/operation/valid/Makefile.am
@@ -1,9 +1,9 @@
#
-# This file is part of project GEOS (http://trac.osgeo.org/geos/)
+# This file is part of project GEOS (http://trac.osgeo.org/geos/)
#
-#SUBDIRS =
+#SUBDIRS =
-#EXTRA_DIST =
+#EXTRA_DIST =
geosdir = $(includedir)/geos/operation/valid
@@ -11,8 +11,9 @@ geos_HEADERS = \
ConnectedInteriorTester.h \
ConsistentAreaTester.h \
IsValidOp.h \
+ MakeValid.h \
QuadtreeNestedRingTester.h \
RepeatedPointTester.h \
SimpleNestedRingTester.h \
SweeplineNestedRingTester.h \
- TopologyValidationError.h
+ TopologyValidationError.h
diff --git a/tests/xmltester/Makefile.am b/tests/xmltester/Makefile.am
index abb7e28..fc34b9d 100644
--- a/tests/xmltester/Makefile.am
+++ b/tests/xmltester/Makefile.am
@@ -120,8 +120,8 @@ FAILING_XMLTESTS = \
$(srcdir)/tests/issue/issue-geos-488.xml \
$(srcdir)/tests/issue/issue-geos-344.xml \
$(srcdir)/tests/robust/TestRobustRelateFloat.xml \
- $(srcdir)/misc/TestBigNastyBuffer.xml \
- $(srcdir)/misc/TestSameDirection.xml
+ $(srcdir)/tests/misc/TestBigNastyBuffer.xml \
+ $(srcdir)/tests/misc/TestSameDirection.xml
commit e7e4a239771cf361964a276f65bff45f56ba3bec
Author: Daniel Baston <dbaston at gmail.com>
Date: Mon Mar 25 20:58:55 2019 -0400
Install git2cl for Travis autotools builds
diff --git a/.travis.yml b/.travis.yml
index c772453..7f6d5b0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,7 +39,7 @@ matrix:
addons:
apt:
sources: *sources
- packages: ['g++-7','ccache']
+ packages: ['g++-7','ccache','git2cl']
env:
- E="TOOL=autotools && CXX=g++-7 && ARCH=-m64 && CC=gcc-7"
@@ -51,7 +51,7 @@ matrix:
addons:
apt:
sources: *sources
- packages: ['g++-7-multilib','gcc-7-multilib','g++-multilib','gcc-multilib','ccache']
+ packages: ['g++-7-multilib','gcc-7-multilib','g++-multilib','gcc-multilib','ccache','git2cl']
env:
- E="TOOL=autotools && CXX=g++-7 && ARCH=-m32 && CC=gcc-7"
@@ -75,7 +75,7 @@ matrix:
addons:
apt:
sources: *sources
- packages: ['g++-4.8','ccache']
+ packages: ['g++-4.8','ccache','git2cl']
env:
- E="TOOL=autotools && CXX=g++-4.8 && ARCH=-m64 && CC=gcc-4.8"
@@ -87,7 +87,7 @@ matrix:
addons:
apt:
sources: *sources
- packages: ['g++-4.8-multilib','gcc-4.8-multilib','g++-multilib','gcc-multilib','ccache']
+ packages: ['g++-4.8-multilib','gcc-4.8-multilib','g++-multilib','gcc-multilib','ccache','git2cl']
env:
- E="TOOL=autotools && CXX=g++-4.8 && ARCH=-m32 && CC=gcc-4.8"
@@ -111,7 +111,7 @@ matrix:
addons:
apt:
sources: *sources
- packages: ['clang-3.9','ccache']
+ packages: ['clang-3.9','ccache','git2cl']
env:
- E="TOOL=autotools && CXX=clang++-3.9 && ARCH=-m64 && CC=clang-3.9"
@@ -123,7 +123,7 @@ matrix:
addons:
apt:
sources: *sources
- packages: ['clang','ccache']
+ packages: ['clang','ccache','git2cl']
env:
- E="TOOL=autotools && CXX=clang++ && ARCH=-m64 && CC=clang"
commit 6f9916f751954904b1f6b98e0398eebff9021a11
Author: Daniel Baston <dbaston at gmail.com>
Date: Mon Mar 25 16:53:15 2019 -0400
Run make distcheck on Travis
diff --git a/tools/ci/common.sh b/tools/ci/common.sh
index 5611b0e..91deae1 100644
--- a/tools/ci/common.sh
+++ b/tools/ci/common.sh
@@ -33,10 +33,3 @@ run_make()
{
[ $TCI_NUMTHREADS -gt 0 ] && make -j $TCI_NUMTHREADS || make
}
-
-run_test()
-{
- [ -f CMakeCache.txt ] && \
- ctest --output-on-failure . || \
- make check
-}
diff --git a/tools/ci/script_autotools.sh b/tools/ci/script_autotools.sh
index 4d4daf0..1cb8804 100755
--- a/tools/ci/script_autotools.sh
+++ b/tools/ci/script_autotools.sh
@@ -6,7 +6,7 @@
#
# This is free software; you can redistribute and/or modify it under
# the terms of the GNU Lesser General Public Licence as published
-# by the Free Software Foundation.
+# by the Free Software Foundation.
# See the COPYING file for more information.
#
source ${TRAVIS_BUILD_DIR}/tools/ci/common.sh
@@ -16,4 +16,5 @@ cd ${TRAVIS_BUILD_DIR}
cd -
${TRAVIS_BUILD_DIR}/configure
run_make
-run_test
+make check
+make distcheck
diff --git a/tools/ci/script_cmake.sh b/tools/ci/script_cmake.sh
index 2400418..22e1eed 100755
--- a/tools/ci/script_cmake.sh
+++ b/tools/ci/script_cmake.sh
@@ -6,11 +6,11 @@
#
# This is free software; you can redistribute and/or modify it under
# the terms of the GNU Lesser General Public Licence as published
-# by the Free Software Foundation.
+# by the Free Software Foundation.
# See the COPYING file for more information.
#
source ${TRAVIS_BUILD_DIR}/tools/ci/common.sh
cmake ${TRAVIS_BUILD_DIR}
run_make
-run_test
+ctest --output-on-failure .
-----------------------------------------------------------------------
Summary of changes:
.travis.yml | 12 ++++++------
include/geos/operation/polygonize/Makefile.am | 10 +++++-----
include/geos/operation/valid/Makefile.am | 9 +++++----
tests/xmltester/Makefile.am | 4 ++--
tools/ci/common.sh | 7 -------
tools/ci/script_autotools.sh | 5 +++--
tools/ci/script_cmake.sh | 4 ++--
7 files changed, 23 insertions(+), 28 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list