[geos-commits] [SCM] GEOS branch master updated. caa54c38e85d5393d7f045f4f3253fff61de72a9

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

    Okay this one paths should be right now

diff --git a/tools/ci/winnie.sh b/tools/ci/winnie.sh
index cc035d2..1011fc1 100644
--- a/tools/ci/winnie.sh
+++ b/tools/ci/winnie.sh
@@ -10,6 +10,7 @@
 # by the Free Software Foundation.
 # See the COPYING file for more information.
 export PROJECTS=/projects
+cd ${WORKSPACE}
 if [[ "$GCC_TYPE" == "gcc45" ]] ; then #gcc 45 has no extension
   export GCC_TYPE=
 fi;
@@ -23,12 +24,10 @@ 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}
+  export SRC_DIR=${WORKSPACE}
 else
   #tagged version -- official release
-  export SRC_DIR=${PROJECTS}/geos/tags/${GEOS_VER}${MAKE_TYPE}
-  export CMAKE_GEOS_VER=${GEOS_VER}${MAKE_TYPE}
+  export SRC_DIR=${WORKSPACE}
 fi;
 
 export PATH="${PATH}:${CMAKE_PATH}/bin:/bin:/include"
@@ -45,10 +44,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}  ${SRC_DIR}
 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} ${SRC_DIR}
 fi
 make && make install
 #make check

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

Summary of changes:
 tools/ci/winnie.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GEOS