[postgis-tickets] [SCM] PostGIS Buildbots; Jenkins jobs and instructions for setting up winnie and debbie bots. branch master updated. 846301959476eb31cf19dd70d06dddcbdfb3ba56
git at osgeo.org
git at osgeo.org
Tue Oct 8 17:50:40 PDT 2019
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 846301959476eb31cf19dd70d06dddcbdfb3ba56 (commit)
from aa8861d05e1e1b62b1ea26e2a9434ce503df589a (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 846301959476eb31cf19dd70d06dddcbdfb3ba56
Author: Regina Obe <lr at pcorp.us>
Date: Tue Oct 8 20:50:35 2019 -0400
Take off disabling of inlining, also remove redundant make check in cmake builds
diff --git a/windows/mingw64/scripts/geos_make_install_check_branch.sh b/windows/mingw64/scripts/geos_make_install_check_branch.sh
index 74ab162..6b9eb39 100644
--- a/windows/mingw64/scripts/geos_make_install_check_branch.sh
+++ b/windows/mingw64/scripts/geos_make_install_check_branch.sh
@@ -51,9 +51,11 @@ if [[ "$MAKE_TYPE" == *cmake* ]] ; then
cd build${OS_BUILD}${MAKE_TYPE}
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=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 -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
make && make install
#make check
@@ -67,9 +69,11 @@ else
#mkdir -p build${OS_BUILD}${MAKE_TYPE}
#cd build${OS_BUILD}${MAKE_TYPE}
configure --build=${MINGHOST} --prefix=${SH_WORKSPACE}/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}
+ make && make install
+ make check
fi;
-make && make install
+
strip ${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll
-make check
+
-----------------------------------------------------------------------
Summary of changes:
windows/mingw64/scripts/geos_make_install_check_branch.sh | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
hooks/post-receive
--
PostGIS Buildbots; Jenkins jobs and instructions for setting up winnie and debbie bots.
More information about the postgis-tickets
mailing list