[geos-commits] [SCM] GEOS branch master updated. 8642d9def6d1df4a14769a74f85b8501f18c527d

[git at osgeo.org]

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  8642d9def6d1df4a14769a74f85b8501f18c527d (commit)
      from  f6b2a42e683e73bd718dd8d0626b534b9115080d (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 8642d9def6d1df4a14769a74f85b8501f18c527d
Author: Regina Obe <lr at pcorp.us>
Date:   Sun Oct 21 09:09:44 2018 -0400

    Flip bessies to cmake build test. Closes #939.  Exclude exes from commit.

diff --git a/.gitignore b/.gitignore
index 72b9d1b..40bf331 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ geos_revision.h
 *.la
 *.log
 *.trs
+*.exe
 macros/libtool.m4
 macros/ltoptions.m4
 macros/ltsugar.m4
diff --git a/tools/ci/bessie.sh b/tools/ci/bessie.sh
index a0dc348..2ffe8cb 100644
--- a/tools/ci/bessie.sh
+++ b/tools/ci/bessie.sh
@@ -9,7 +9,23 @@
 # by the Free Software Foundation.
 # See the COPYING file for more information.
 #
-sh autogen.sh
-./configure
-make
-make check
+# auto tools
+if false; then
+    sh autogen.sh
+    ./configure
+    make
+    make check
+fi
+
+
+# cmake
+if true; then
+    rm -rf build
+    mkdir -p build
+    cd build
+    cmake ../
+    make
+    [ -f CMakeCache.txt ] && \
+        ctest --output-on-failure . || \
+        make check
+fi
diff --git a/tools/ci/bessie32.sh b/tools/ci/bessie32.sh
index a0dc348..de70378 100644
--- a/tools/ci/bessie32.sh
+++ b/tools/ci/bessie32.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# FreeBSD 64 (bessie) CI script runner for GEOS
+# FreeBSD 32 (bessie32) CI script runner for GEOS
 #
 # Copyright (c) 2018 Regina Obe <lr at pcorp.us>
 #
@@ -9,7 +9,23 @@
 # by the Free Software Foundation.
 # See the COPYING file for more information.
 #
-sh autogen.sh
-./configure
-make
-make check
+# auto tools
+if false; then
+    sh autogen.sh
+    ./configure
+    make
+    make check
+fi
+
+
+# cmake
+if true; then
+    rm -rf build
+    mkdir -p build
+    cd build
+    cmake ../
+    make
+    [ -f CMakeCache.txt ] && \
+        ctest --output-on-failure . || \
+        make check
+fi

-----------------------------------------------------------------------

Summary of changes:
 .gitignore           |  1 +
 tools/ci/bessie.sh   | 24 ++++++++++++++++++++----
 tools/ci/bessie32.sh | 26 +++++++++++++++++++++-----
 3 files changed, 42 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
GEOS