[geos-commits] [SCM] GEOS branch master updated. 1823362fd5574d3df1c257faeaa2308ec1f0a2e7

[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  1823362fd5574d3df1c257faeaa2308ec1f0a2e7 (commit)
      from  3973bc7ed00c9ad192de4f1fbf2bb3ee8903df7b (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 1823362fd5574d3df1c257faeaa2308ec1f0a2e7
Author: Regina Obe <lr at pcorp.us>
Date:   Thu Feb 4 14:15:18 2021 -0500

    Missed some more variables

diff --git a/tools/ci/winnie.sh b/tools/ci/winnie.sh
index fdc07c5..cc035d2 100644
--- a/tools/ci/winnie.sh
+++ b/tools/ci/winnie.sh
@@ -9,6 +9,7 @@
 # the terms of the GNU Lesser General Public Licence as published
 # by the Free Software Foundation.
 # See the COPYING file for more information.
+export PROJECTS=/projects
 if [[ "$GCC_TYPE" == "gcc45" ]] ; then #gcc 45 has no extension
   export GCC_TYPE=
 fi;
@@ -21,6 +22,15 @@ else
 fi;
 CMAKE_PATH=/cmake
 
+if [[ "${GEOS_VER}"  == *SVN* || "${GEOS_VER}"  == *dev* ]] ; then
+  export SRC_DIR=${PROJECTS}/geos/branches/${GEOS_MINOR_VER}${MAKE_TYPE}
+  export CMAKE_GEOS_VER=${GEOS_MINOR_VER}${MAKE_TYPE}
+else
+  #tagged version -- official release
+  export SRC_DIR=${PROJECTS}/geos/tags/${GEOS_VER}${MAKE_TYPE}
+  export CMAKE_GEOS_VER=${GEOS_VER}${MAKE_TYPE}
+fi;
+
 export PATH="${PATH}:${CMAKE_PATH}/bin:/bin:/include"
 
 cd ../
@@ -35,10 +45,10 @@ 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}
+  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}
+  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
 #make check

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

Summary of changes:
 tools/ci/winnie.sh | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GEOS