[geos-commits] [SCM] GEOS branch master updated. 3973bc7ed00c9ad192de4f1fbf2bb3ee8903df7b

[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  3973bc7ed00c9ad192de4f1fbf2bb3ee8903df7b (commit)
      from  09acd0813a89c66dfd75411b8c35b952172a2866 (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 3973bc7ed00c9ad192de4f1fbf2bb3ee8903df7b
Author: Regina Obe <lr at pcorp.us>
Date:   Thu Feb 4 12:55:27 2021 -0500

    Forgot to include cmake_path

diff --git a/tools/ci/winnie.sh b/tools/ci/winnie.sh
index e3288a3..fdc07c5 100644
--- a/tools/ci/winnie.sh
+++ b/tools/ci/winnie.sh
@@ -9,12 +9,37 @@
 # the terms of the GNU Lesser General Public Licence as published
 # by the Free Software Foundation.
 # See the COPYING file for more information.
+if [[ "$GCC_TYPE" == "gcc45" ]] ; then #gcc 45 has no extension
+  export GCC_TYPE=
+fi;
+## end variables passed in by jenkins
 
-rm -rf build
-mkdir -p build
-cd build
-cmake -DCMAKE_INSTALL_PREFIX:PATH=../rel-${GEOS_VER}w${OS_BUILD} ../
+if [ "$OS_BUILD" == "64" ] ; then
+	export MINGHOST=x86_64-w64-mingw32
+else
+	export MINGHOST=i686-w64-mingw32
+fi;
+CMAKE_PATH=/cmake
+
+export PATH="${PATH}:${CMAKE_PATH}/bin:/bin:/include"
+
+cd ../
+rm -rf build${OS_BUILD}${MAKE_TYPE}${GEOS_VER}
+mkdir -p build${OS_BUILD}${MAKE_TYPE}${GEOS_VER}
+cd build${OS_BUILD}${MAKE_TYPE}${GEOS_VER}
+export GEOS_ENABLE_INLINE=ON #for older geos
+if [[ "${DISABLE_GEOS_INLINE}" == "" ]] ; then
+  export DISABLE_GEOS_INLINE=ON
+fi
+echo "Disable geos inline ${DISABLE_GEOS_INLINE}"
+
+if [[ "${OS_BUILD}" == "64" ]] ; then
+  #cmake -G "MSYS Makefiles" DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE} -DHAVE_STD_ISNAN=1 -DHAVE_LONG_LONG_INT_64=1 -DGEOS_ENABLE_INLINE=NO -DDISABLE_GEOS_INLINE=ON   -  ../${CMAKE_GEOS_VER}
+  cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE} -DHAVE_STD_ISNAN=1 -DHAVE_LONG_LONG_INT_64=1 -DGEOS_ENABLE_INLINE=${GEOS_ENABLE_INLINE} -DDISABLE_GEOS_INLINE=${DISABLE_GEOS_INLINE}  -  ../${CMAKE_GEOS_VER}
+else
+  #cmake -G "MSYS Makefiles" DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE} -DHAVE_STD_ISNAN=1 -DGEOS_ENABLE_INLINE=NO -DDISABLE_GEOS_INLINE=ON   -  ../${CMAKE_GEOS_VER}
+  cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE} -DHAVE_STD_ISNAN=1 -DGEOS_ENABLE_INLINE=${GEOS_ENABLE_INLINE} -DDISABLE_GEOS_INLINE=${DISABLE_GEOS_INLINE}  -  ../${CMAKE_GEOS_VER}
+fi
 make && make install
-[ -f CMakeCache.txt ] && \
-ctest --output-on-failure . || \
-make check
+#make check
+ctest --output-on-failure

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

Summary of changes:
 tools/ci/winnie.sh | 39 ++++++++++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GEOS