[postgis-tickets] [SCM] PostGIS Buildbots; Jenkins jobs and instructions for setting up winnie and debbie bots. branch master updated. 437a08ef394ffab011acf21fafb360ef9a0a449a
git at osgeo.org
git at osgeo.org
Fri May 24 14:57:58 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 437a08ef394ffab011acf21fafb360ef9a0a449a (commit)
via b59b781afa9720e609a6f57519adf61f6bf36373 (commit)
from ba699027bd39fe1477ccdfe6099c5c687cca7ed5 (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 437a08ef394ffab011acf21fafb360ef9a0a449a
Author: Regina Obe <lr at pcorp.us>
Date: Fri May 24 17:57:54 2019 -0400
Add in new DISABLE_GEOS_INLINE, but keep old GEOS_ENABLE_INLINE for < 3.8. Also mark build type as Release
diff --git a/windows/mingw64/scripts/build_check_geos.sh b/windows/mingw64/scripts/build_check_geos.sh
index eaf85a8..a55f0c4 100644
--- a/windows/mingw64/scripts/build_check_geos.sh
+++ b/windows/mingw64/scripts/build_check_geos.sh
@@ -42,9 +42,9 @@ export PATHOLD="/mingw/bin:/mingw/include:/mingw/lib:/c/Windows/system32:/c/Wind
cd build${OS_BUILD}${GEOS_VER}
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 -DGEOS_ENABLE_TESTS=ON - ../${GEOS_MINOR_VER}cmake
+ 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_BUILD_TYPE=Release -DGEOS_ENABLE_INLINE=NO -DDISABLE_GEOS_INLINE=ON -DGEOS_ENABLE_TESTS=ON - ../${GEOS_MINOR_VER}cmake
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 -DGEOS_ENABLE_TESTS=ON - ../${GEOS_MINOR_VER}cmake
+ 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 CMAKE_BUILD_TYPE=Release -DGEOS_ENABLE_TESTS=ON -DDISABLE_GEOS_INLINE=ON - ../${GEOS_MINOR_VER}cmake
fi
make && make install
make check
commit b59b781afa9720e609a6f57519adf61f6bf36373
Author: Regina Obe <lr at pcorp.us>
Date: Wed Mar 20 17:22:29 2019 -0400
replace apt-get with just apt and add instructions for installing logbt
diff --git a/debian/jenkins_setup.txt b/debian/jenkins_setup.txt
index d0a3315..5e565a1 100644
--- a/debian/jenkins_setup.txt
+++ b/debian/jenkins_setup.txt
@@ -1,8 +1,8 @@
Setup Jenkins on Debian
On 64-bit Debian 6
su root
-apt-get update
-apt-get upgrade #install latest patches
+apt update
+apt upgrade #install latest patches
wget -q -O - http://pkg.jenkins-ci.org/debian/jenkins-ci.org.key | apt-key add -
Add to: /etc/apt/sources.list
@@ -21,74 +21,74 @@ echo "deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu precise main" | t
#to get newer proj 4.9.1 needed to do this
echo "deb http://ftp.us.debian.org/debian sid main" | tee -a /etc/apt/sources.list
-apt-get update
-apt-get install libproj9 libproj-dev proj-bin proj-data
-apt-get install g++
+apt update
+apt install libproj9 libproj-dev proj-bin proj-data
+apt install g++
#for address_standardizer
-apt-get install libpcre3-dev
+apt install libpcre3-dev
-apt-get update
-apt-get install jenkins
+apt update
+apt install jenkins
##installing java if the above fails
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys EEA14886
-apt-get update
-apt-get install oracle-java7-installer
+apt update
+apt install oracle-java7-installer
## end installing java
#for building sfcgal
echo "deb-src http://debian.mirrors.ovh.net/debian/ sid main contrib non-free" | tee -a /etc/apt/sources.list
-sudo apt-get update
-apt-get build-dep sfcgal-bin
-apt-get -b source sfcgal-bin
-apt-get install libcgal-dev libboost-all-dev libmpfr-dev libgmp-dev libopenscenegraph-dev libopenthreads-dev libpq-dev libqt4-dev libqt4-opengl-dev pkg-kde-tools
+sudo apt update
+apt build-dep sfcgal-bin
+apt -b source sfcgal-bin
+apt install libcgal-dev libboost-all-dev libmpfr-dev libgmp-dev libopenscenegraph-dev libopenthreads-dev libpq-dev libqt4-dev libqt4-opengl-dev pkg-kde-tools
#for building gdal with odbc support
-apt-get install unixODBC
-apt-get install unixodbc-dev
+apt install unixODBC
+apt install unixodbc-dev
#make it the default
-sudo apt-get install oracle-java7-set-default
-apt-get install git
+sudo apt install oracle-java7-set-default
+apt install git
apt install git2cl #for building geos distributions
--to get autoconf etc --
-apt-get install autoconf libtool build-essential
+apt install autoconf libtool build-essential
#CUnit
-apt-get install libreadline6 libreadline6-dev zlib1g-dev
-apt-get install libcunit1-dev libcunit1-doc libcunit1
-apt-get install docbook
-apt-get install libxml2-dev n xsltproc docbook-xsl docbook-mathml gettext
+apt install libreadline6 libreadline6-dev zlib1g-dev
+apt install libcunit1-dev libcunit1-doc libcunit1
+apt install docbook
+apt install libxml2-dev n xsltproc docbook-xsl docbook-mathml gettext
apt-cache search json #see latest version
-apt-get install libjson-c-dev
-apt-get install dblatex
-apt-get install imagemagick
-apt-get install libxml2 libxml2-dev
-apt-get install bison
-apt-get install libiconv-hook1
-apt-get install subversion
+apt install libjson-c-dev
+apt install dblatex
+apt install imagemagick
+apt install libxml2 libxml2-dev
+apt install bison
+apt install libiconv-hook1
+apt install subversion
#(for future translation work)
-apt-get install poxml
-apt-get install curl
-apt-get install python-dev
+apt install poxml
+apt install curl
+apt install python-dev
#wget https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py -O - | sudo python
-apt-get install python-pip
+apt install python-pip
pip install transifex-client
#for doxygen build and graph generation
-apt-get install doxygen graphviz
-apt-get install apache2 #(for displaying docbook etc.)
-apt-get install flex (needed for 1.3)
-apt-get install dbtoepub (publish documentation in epub format)
+apt install doxygen graphviz
+apt install apache2 #(for displaying docbook etc.)
+apt install flex (needed for 1.3)
+apt install dbtoepub (publish documentation in epub format)
#for building sfcgal, pointcloud
-apt-get install cmake
+apt install cmake
#for building sfcgal
apt install libboost-dev
@@ -96,15 +96,21 @@ apt install libcgal-dev
apt install libsfcgal-dev
#for code coverage
-sudo apt-get install lcov
+sudo apt install lcov
+
+#for logbt testing
+curl -sSfL https://github.com/mapbox/logbt/archive/v2.0.3.tar.gz | tar --gunzip --extract --strip-components=1 --exclude="*md" --exclude="test*" --directory=/usr/local
+which logbt
+/usr/local/bin/logbt
+logbt --version
-apt-get install latex-cjk-xcjk #for Korean and Chinese doc PDF translations
+apt install latex-cjk-xcjk #for Korean and Chinese doc PDF translations
--if you need to update jenkins
aptitude update
-apt-get upgrade
+apt upgrade
apt install jenkins
apt --only-upgrade install docker-io
-----------------------------------------------------------------------
Summary of changes:
debian/jenkins_setup.txt | 90 +++++++++++++++--------------
windows/mingw64/scripts/build_check_geos.sh | 4 +-
2 files changed, 50 insertions(+), 44 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