Merge branch 'master' of https://github.com/qgis/QGIS

qgis · Sep 3, 2017 · 471573d · 471573d
2 parents 8726146 + e30f704
commit 471573d
Show file tree

Hide file tree

Showing 1,614 changed files with 29,581 additions and 19,455 deletions.
diff --git a/.ci/travis/code_layout/install.sh b/.ci/travis/code_layout/install.sh
@@ -16,7 +16,8 @@
 export CORES=2
 
 mkdir build
-cd build
+pushd build
 
 cmake -DWITH_CORE=OFF -DWITH_APIDOC=ON -DWITH_ASTYLE=ON -DENABLE_TESTS=ON ..
-make -j${CORES}
+
+popd
diff --git a/.ci/travis/code_layout/script.sh b/.ci/travis/code_layout/script.sh
@@ -15,6 +15,10 @@
 set -e
 
 pushd build
+
 export CTEST_BUILD_COMMAND="/usr/bin/make -j3 -i -k"
-python ${TRAVIS_BUILD_DIR}/.ci/travis/scripts/ctest2travis.py xvfb-run ctest -V --output-on-failure -S ${TRAVIS_BUILD_DIR}/.ci/travis/travis.ctest
+python3 ${TRAVIS_BUILD_DIR}/.ci/travis/scripts/ctest2travis.py xvfb-run ctest -V --output-on-failure -S ${TRAVIS_BUILD_DIR}/.ci/travis/travis.ctest
+
+ctest -V -R PyQgsDocCoverage
+
 popd
diff --git a/.ci/travis/linux/blacklist.txt b/.ci/travis/linux/blacklist.txt
@@ -11,7 +11,6 @@ PyQgsAppStartup
 
 # temporary during processing refactoring
 ProcessingParametersTest
-ProcessingGdalAlgorithmsTest
 
 # code layout tests are run on separate build
 qgis_spelling

diff --git a/.ci/travis/linux/install.sh b/.ci/travis/linux/install.sh
@@ -52,7 +52,6 @@ CMAKE_FLAGS="
       -DWITH_QWTPOLAR=OFF
       -DWITH_APIDOC=OFF
       -DWITH_ASTYLE=OFF
-      -DWITH_INTERNAL_YAML=OFF
       -DDISABLE_DEPRECATED=ON
       -DCXX_EXTRA_FLAGS=${CLANG_WARNINGS}
       "

diff --git a/.ci/travis/linux/script.sh b/.ci/travis/linux/script.sh
@@ -29,5 +29,16 @@ export LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
 
 export CTEST_BUILD_COMMAND="/usr/bin/make -j3 -i -k"
 
+# This works around an issue where travis would timeout on master because
+# when make is run inside ctest no output is generated. At the current time
+# nobody know why, but at least this workaround gets travis results for master
+# back. Better approaches VERY welcome.
+if [[ ${TRAVIS_PULL_REQUEST} == "false" ]];
+then
+    pushd build
+    $CTEST_BUILD_COMMAND
+    popd
+fi
+
 python ${TRAVIS_BUILD_DIR}/.ci/travis/scripts/ctest2travis.py \
   xvfb-run ctest -V -E "$(cat ${DIR}/blacklist.txt | sed -r '/^(#.*?)?$/d' | paste -sd '|' -)" -S ${DIR}/../travis.ctest --output-on-failure
diff --git a/.ci/travis/macos/before_install.sh b/.ci/travis/macos/before_install.sh
@@ -52,12 +52,9 @@ brew install \
     spatialindex \
     fastcgi \
     qtkeychain \
-    gnu-sed
+    gnu-sed \
+    libzip
 
 
-# Fix qscintilla typo
-wget https://gist.githubusercontent.com/m-kuhn/f70e4b160dd7b18eb8d637ed2a75df6d/raw/6eb8a0c8601ec52ad9ad41c01d0fad68fe967aa1/qsci.patch
-patch -p1 /usr/local/share/sip/QSci/qscilexer.sip qsci.patch
-
 mkdir -p ${HOME}/Library/Python/3.6/lib/python/site-packages
 echo 'import site; site.addsitedir("/usr/local/opt/gdal2-python/lib/python3.6/site-packages")'  >> ${HOME}/Library/Python/3.6/lib/python/site-packages/gdal2.pth
diff --git a/.ci/travis/macos/install.sh b/.ci/travis/macos/install.sh
@@ -37,7 +37,8 @@ fcgi
 expat
 sqlite
 flex
-bison"
+bison
+libzip"
 
 full_prefixes=""
 for p in ${prefixes}; do

diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,2 @@
+/.*
+build*
diff --git a/.gitignore b/.gitignore
@@ -61,6 +61,7 @@ tests/testdata/grass/wgs84/test/.gislock
 tests/testdata/grass/wgs84/test6/.gislock
 tests/testdata/grass/wgs84/test7/.gislock
 tests/testdata/*.aux.xml
+tests/testdata/landsat-int16-b1.tif.aux.xml
 tests/testdata/raster/*.aux.xml
 tests/testdata/raster/band1_byte_noct_epsg4326.tif.aux.xml
 tests/testdata/raster/band1_float32_noct_epsg4326.tif.aux.xml

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,7 +21,7 @@ MESSAGE(STATUS "QGIS version: ${COMPLETE_VERSION} ${RELEASE_NAME} (${QGIS_VERSIO
 #############################################################
 # CMake settings
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.6)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0)
 
 SET(CMAKE_COLOR_MAKEFILE ON)
 
@@ -581,7 +581,6 @@ IF (WITH_CORE)
   #hoops to escape compiler directives then
   IF(COMMAND cmake_policy)
     cmake_policy(SET CMP0003 NEW)
-    cmake_policy(SET CMP0005 OLD)
     IF(NOT "${CMAKE_VERSION}" VERSION_LESS "3.3")
       cmake_policy(SET CMP0063 NEW)
     ENDIF(NOT "${CMAKE_VERSION}" VERSION_LESS "3.3")

diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,37 @@
+
+# CACHE_TAG is provided by Docker cloud
+# see https://docs.docker.com/docker-cloud/builds/advanced/
+# using ARG in FROM requires min v17.05.0-ce
+ARG  CACHE_TAG=latest
+
+FROM  qgis/qgis3-build-deps:${CACHE_TAG}
+MAINTAINER Denis Rouzaud <denis.rouzaud@gmail.com>
+
+ENV CC=/usr/lib/ccache/clang
+ENV CXX=/usr/lib/ccache/clang++
+ENV QT_SELECT=5
+
+COPY  . /usr/src/QGIS
+
+WORKDIR /usr/src/QGIS/build
+
+RUN cmake \
+ -GNinja \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DBINDINGS_GLOBAL_INSTALL=ON \
+ -DWITH_STAGED_PLUGINS=ON \
+ -DWITH_GRASS=ON \
+ -DSUPPRESS_QT_WARNINGS=ON \
+ -DENABLE_TESTS=OFF \
+ -DWITH_QSPATIALITE=ON \
+ -DWITH_QWTPOLAR=OFF \
+ -DWITH_APIDOC=OFF \
+ -DWITH_ASTYLE=OFF \
+ -DWITH_DESKTOP=ON \
+ -DWITH_BINDINGS=ON \
+ -DDISABLE_DEPRECATED=ON \
+ .. \
+ && ninja install \
+ && rm -rf /usr/src/QGIS
+
+WORKDIR /
diff --git a/INSTALL b/INSTALL
@@ -102,7 +102,7 @@ Required build dependencies:
 - Sqlite3 >= 3.0.0
 - SpatiaLite
 - libspatialindex
-- GDAL/OGR >= 2.0
+- GDAL/OGR >= 2.1
 - Qwt >= 5.0 & (< 6.1 with internal QwtPolar)
 - expat >= 1.95
 - QScintilla2