[postgis-tickets] [SCM] PostGIS Buildbots; Jenkins jobs and instructions for setting up winnie and debbie bots. branch master updated. 19202c260ca9d5440899a3c0215f8c233845f350

[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 "PostGIS Buildbots; Jenkins jobs and instructions for setting up winnie and debbie bots.".

The branch, master has been updated
       via  19202c260ca9d5440899a3c0215f8c233845f350 (commit)
      from  846301959476eb31cf19dd70d06dddcbdfb3ba56 (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 19202c260ca9d5440899a3c0215f8c233845f350
Author: Regina Obe <lr at pcorp.us>
Date:   Thu Oct 10 14:58:53 2019 -0400

    Revise to allow inlining to be overridden

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..266f020
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "terminal.explorerKind": "external"
+}
\ No newline at end of file
diff --git a/windows/mingw64/scripts/geos_make_install_check_branch.sh b/windows/mingw64/scripts/geos_make_install_check_branch.sh
index 6b9eb39..b279125 100644
--- a/windows/mingw64/scripts/geos_make_install_check_branch.sh
+++ b/windows/mingw64/scripts/geos_make_install_check_branch.sh
@@ -49,14 +49,18 @@ if [[ "$MAKE_TYPE"  == *cmake*  ]] ; then
     rm -rf build${OS_BUILD}${MAKE_TYPE}
     mkdir -p build${OS_BUILD}${MAKE_TYPE}
     cd build${OS_BUILD}${MAKE_TYPE}
+    export GEOS_ENABLE_INLINE=ON #for older geos
+    if [["${DISABLE_GEOS_INLINE}"]]; then
+      export DISABLE_GEOS_INLINE=ON
+    fi 
   
-  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  -  ../${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  -  ../${CMAKE_GEOS_VER}
-  fi
+    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
   #make check
   ctest --output-on-failure

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

Summary of changes:
 .vscode/settings.json                                  |  3 +++
 .../mingw64/scripts/geos_make_install_check_branch.sh  | 18 +++++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 .vscode/settings.json


hooks/post-receive
-- 
PostGIS Buildbots; Jenkins jobs and instructions for setting up winnie and debbie bots.