Skip to content

Commit 9ae68e8

Browse files
lbartolettilbartoletti
authored
Merge branch 'master' into regularShape_gui
2 parents 7e01602 + f610ffa commit 9ae68e8

File tree

1,115 files changed

+37547
-26989
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,115 files changed

+37547
-26989
lines changed

‎.ci/travis/code_layout/install.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
export CORES=2
1717

1818
mkdir build
19-
cd build
19+
pushd build
2020

2121
cmake -DWITH_CORE=OFF -DWITH_APIDOC=ON -DWITH_ASTYLE=ON -DENABLE_TESTS=ON ..
22-
make -j${CORES}
22+
23+
popd

‎.ci/travis/code_layout/script.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
set -e
1616

1717
pushd build
18+
1819
export CTEST_BUILD_COMMAND="/usr/bin/make -j3 -i -k"
19-
python ${TRAVIS_BUILD_DIR}/.ci/travis/scripts/ctest2travis.py xvfb-run ctest -V -E "sip_uptodate|spelling" --output-on-failure -S ${TRAVIS_BUILD_DIR}/.ci/travis/travis.ctest
20+
python3 ${TRAVIS_BUILD_DIR}/.ci/travis/scripts/ctest2travis.py xvfb-run ctest -V --output-on-failure -S ${TRAVIS_BUILD_DIR}/.ci/travis/travis.ctest
21+
22+
ctest -V -R PyQgsDocCoverage
23+
2024
popd

‎.ci/travis/linux/blacklist.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ PyQgsAppStartup
1111

1212
# temporary during processing refactoring
1313
ProcessingParametersTest
14-
ProcessingGdalAlgorithmsTest
1514

1615
# code layout tests are run on separate build
1716
qgis_spelling

‎.ci/travis/linux/install.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ CMAKE_FLAGS="
5252
-DWITH_QWTPOLAR=OFF
5353
-DWITH_APIDOC=OFF
5454
-DWITH_ASTYLE=OFF
55-
-DWITH_INTERNAL_YAML=OFF
5655
-DDISABLE_DEPRECATED=ON
5756
-DCXX_EXTRA_FLAGS=${CLANG_WARNINGS}
5857
"

‎.ci/travis/linux/script.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,16 @@ export LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
2929

3030
export CTEST_BUILD_COMMAND="/usr/bin/make -j3 -i -k"
3131

32+
# This works around an issue where travis would timeout on master because
33+
# when make is run inside ctest no output is generated. At the current time
34+
# nobody know why, but at least this workaround gets travis results for master
35+
# back. Better approaches VERY welcome.
36+
if [[ ${TRAVIS_PULL_REQUEST} == "false" ]];
37+
then
38+
pushd build
39+
$CTEST_BUILD_COMMAND
40+
popd
41+
fi
42+
3243
python ${TRAVIS_BUILD_DIR}/.ci/travis/scripts/ctest2travis.py \
3344
xvfb-run ctest -V -E "$(cat ${DIR}/blacklist.txt | sed -r '/^(#.*?)?$/d' | paste -sd '|' -)" -S ${DIR}/../travis.ctest --output-on-failure

‎.ci/travis/macos/before_install.sh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,9 @@ brew install \
5252
spatialindex \
5353
fastcgi \
5454
qtkeychain \
55-
gnu-sed
55+
gnu-sed \
56+
libzip
5657

5758

58-
# Fix qscintilla typo
59-
wget https://gist.githubusercontent.com/m-kuhn/f70e4b160dd7b18eb8d637ed2a75df6d/raw/6eb8a0c8601ec52ad9ad41c01d0fad68fe967aa1/qsci.patch
60-
patch -p1 /usr/local/share/sip/QSci/qscilexer.sip qsci.patch
61-
6259
mkdir -p ${HOME}/Library/Python/3.6/lib/python/site-packages
6360
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

‎.ci/travis/macos/install.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ fcgi
3737
expat
3838
sqlite
3939
flex
40-
bison"
40+
bison
41+
libzip"
4142

4243
full_prefixes=""
4344
for p in ${prefixes}; do

‎.ci/travis/travis.ctest

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ ELSE()
1313
SET (CTEST_BUILD_NAME "PR: $ENV{TRAVIS_PULL_REQUEST} / $ENV{TRAVIS_BRANCH} ($ENV{BUILD}) ($ENV{TRAVIS_COMMIT})")
1414
ENDIF()
1515
SET (CTEST_BUILD_CONFIGURATION "Release")
16-
SET (CTEST_TEST_TIMEOUT 60) # 60 seconds
16+
IF ($ENV{TRAVIS_CONFIG} STREQUAL "code_layout")
17+
SET (CTEST_TEST_TIMEOUT 600) # 600 seconds, spelling test might take some time
18+
ELSE()
19+
SET (CTEST_TEST_TIMEOUT 60) # 60 seconds
20+
ENDIF()
1721
IF(DEFINED ENV{CTEST_PARALLEL_LEVEL})
1822
SET(PARALLEL_LEVEL $ENV{CTEST_PARALLEL_LEVEL})
1923
ELSE(DEFINED ENV{CTEST_PARALLEL_LEVEL})

‎.dockerignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/.*
2+
build*

‎.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ matrix:
3535
- poppler-utils
3636
- xvfb
3737
- clang-3.8
38+
- libzip-dev
3839

3940

4041
- os: linux

‎CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ MESSAGE(STATUS "QGIS version: ${COMPLETE_VERSION} ${RELEASE_NAME} (${QGIS_VERSIO
2121
#############################################################
2222
# CMake settings
2323

24-
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.6)
24+
CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0)
2525

2626
SET(CMAKE_COLOR_MAKEFILE ON)
2727

@@ -210,6 +210,7 @@ IF(WITH_CORE)
210210
IF (WITH_GUI)
211211
FIND_PACKAGE(Qwt REQUIRED)
212212
ENDIF (WITH_GUI)
213+
FIND_PACKAGE(LibZip REQUIRED)
213214

214215
IF (WITH_INTERNAL_QEXTSERIALPORT)
215216
SET(QEXTSERIALPORT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/core/gps/qextserialport)
@@ -376,11 +377,15 @@ IF (PEDANTIC)
376377
SET(_warnings "${_warnings} /wd4244 ") # conversion from '...' to '...' possible loss of data
377378
SET(_warnings "${_warnings} /wd4251 ") # needs to have dll-interface to be used by clients of class (occurs in Qt template classes)
378379
SET(_warnings "${_warnings} /wd4275 ") # non dll-interface class '...' used as base for dll-interface class '...'
380+
SET(_warnings "${_warnings} /wd4456 ") # declaration of '...' hides previous local declaration
381+
SET(_warnings "${_warnings} /wd4457 ") # declaration of '...' hides a function parameter
382+
SET(_warnings "${_warnings} /wd4458 ") # declaration of '...' hides class member
379383
SET(_warnings "${_warnings} /wd4505 ") # unreferenced local function has been removed (QgsRasterDataProvider::extent)
380384
SET(_warnings "${_warnings} /wd4510 ") # default constructor could not be generated (sqlite3_index_info, QMap)
381385
SET(_warnings "${_warnings} /wd4512 ") # assignment operator could not be generated (sqlite3_index_info)
382386
SET(_warnings "${_warnings} /wd4610 ") # user defined constructor required (sqlite3_index_info)
383387
SET(_warnings "${_warnings} /wd4706 ") # assignment within conditional expression (pal)
388+
SET(_warnings "${_warnings} /wd4714 ") # function '...' marked as __forceinline not inlined (QString::toLower/toUpper/trimmed)
384389
SET(_warnings "${_warnings} /wd4800 ") # 'int' : forcing value to bool 'true' or 'false' (performance warning)
385390
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_warnings}")
386391
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_warnings}")

‎Dockerfile

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
2+
ARG CACHE_TAG=latest
3+
4+
FROM qgis/qgis3-build-deps:${CACHE_TAG}
5+
MAINTAINER Denis Rouzaud <denis.rouzaud@gmail.com>
6+
7+
ENV CC=/usr/lib/ccache/clang
8+
ENV CXX=/usr/lib/ccache/clang++
9+
ENV QT_SELECT=5
10+
11+
COPY . /usr/src/QGIS
12+
13+
WORKDIR /usr/src/QGIS/build
14+
15+
RUN cmake \
16+
-GNinja \
17+
-DWITH_STAGED_PLUGINS=ON \
18+
-DWITH_GRASS=ON \
19+
-DSUPPRESS_QT_WARNINGS=ON \
20+
-DENABLE_TESTS=OFF \
21+
-DWITH_QSPATIALITE=ON \
22+
-DWITH_QWTPOLAR=OFF \
23+
-DWITH_APIDOC=OFF \
24+
-DWITH_ASTYLE=OFF \
25+
-DWITH_DESKTOP=ON \
26+
-DWITH_BINDINGS=ON \
27+
-DDISABLE_DEPRECATED=ON \
28+
.. \
29+
&& ninja install \
30+
&& rm -rf /usr/src/QGIS/build/*

‎INSTALL

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
QGIS
22
Building QGIS from source - step by step
3-
Friday July 28, 2017
3+
Saturday August 05, 2017
44

55

6-
Last Updated: Friday July 28, 2017
7-
Last Change : Friday July 28, 2017
6+
Last Updated: Saturday August 05, 2017
7+
Last Change : Saturday August 05, 2017
88

99

1010
1. Introduction
@@ -178,14 +178,18 @@ Now update your local sources database:
178178
===============================
179179

180180
|| Distribution | install command for packages |
181-
| stretch | ``apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qt5keychain-dev qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui expect`` |
182-
| xenial | ``apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qt5keychain-dev qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui expect`` |
183-
| yakkety | ``apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qt5keychain-dev qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui expect`` |
184-
| zesty | ``apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qt5keychain-dev qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui expect`` |
185-
| sid | ``apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libosgearth-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qt5keychain-dev qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui expect`` |
181+
| stretch | ``apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libzip-dev lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qt5keychain-dev qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui expect`` |
182+
| xenial | ``apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libzip-dev lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qt5keychain-dev qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui expect`` |
183+
| yakkety | ``apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libzip-dev lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qt5keychain-dev qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui expect`` |
184+
| zesty | ``apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libzip-dev lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qt5keychain-dev qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui expect`` |
185+
| sid | ``apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libosgearth-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite libzip-dev lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qt5keychain-dev qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui expect`` |
186186

187187
(extracted from the control.in file in debian/)
188188

189+
See http://qgis.org/en/site/forusers/alldownloads.html#debian-ubuntu for
190+
currently supported distributions (plain xenial's GDAL for instance is to old
191+
and we build with GDAL2 from ubuntugis).
192+
189193

190194
3.4. Setup ccache (Optional)
191195
============================
@@ -454,6 +458,7 @@ and from OSGeo4W (select Advanced Installation):
454458
- grass
455459
- gsl-devel
456460
- iconv
461+
- libzip-devel
457462
- libspatialindex-devel
458463
- pyqt5
459464
- python3-devel
@@ -472,6 +477,9 @@ and from OSGeo4W (select Advanced Installation):
472477
- qwt-devel-qt5
473478
- sip-qt5
474479
- spatialite
480+
- oci
481+
- qtkeychain
482+
- libzip
475483

476484
This will also select packages the above packages depend on.
477485

@@ -498,20 +506,26 @@ variables create the following batch file (assuming the above packages were
498506
installed in the default locations):
499507

500508
@echo off
501-
set VS90COMNTOOLS=%PROGRAMFILES%\Microsoft Visual Studio 9.0\Common7\Tools\
502-
call "%PROGRAMFILES%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86
503-
504-
set INCLUDE=%INCLUDE%;%PROGRAMFILES%\Microsoft SDKs\Windows\v7.1\include
505-
set LIB=%LIB%;%PROGRAMFILES%\Microsoft SDKs\Windows\v7.1\lib
506-
507509
set OSGEO4W_ROOT=C:\OSGeo4W
508510
call "%OSGEO4W_ROOT%\bin\o4w_env.bat"
509-
path %PATH%;%PROGRAMFILES%\CMake\bin;c:\cygwin\bin
511+
call "%OSGEO4W_ROOT%\bin\py3_env.bat"
512+
call "%OSGEO4W_ROOT%\bin\qt5_env.bat"
513+
514+
set O4W_ROOT=%OSGEO4W_ROOT:\=/%
515+
set LIB_DIR=%O4W_ROOT%
510516

511-
@set GRASS_PREFIX=c:/OSGeo4W/apps/grass/grass-6.4.4
517+
call "C:\Program Files\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
518+
path %path%;C:\Program Files\Microsoft Visual Studio 14.0\VC\bin
519+
520+
path %PATH%;C:\Program Files\CMake\bin;c:\cygwin\bin
521+
522+
@set GRASS_PREFIX=c:/OSGeo4W/apps/grass/grass-7.2.1
512523
@set INCLUDE=%INCLUDE%;%OSGEO4W_ROOT%\include
513524
@set LIB=%LIB%;%OSGEO4W_ROOT%\lib;%OSGEO4W_ROOT%\lib
514525

526+
set LIB=%LIB%;%OSGEO4W_ROOT%\apps\Qt5\lib;%OSGEO4W_ROOT%\lib
527+
set INCLUDE=%INCLUDE%;%OSGEO4W_ROOT%\apps\Qt5\include;%OSGEO4W_ROOT%\include
528+
515529
@cmd
516530

517531
Start the batch file and on the command prompt checkout the QGIS source from

0 commit comments

Comments
 (0)