Skip to content

Commit fba87f7

Browse files
volayavolaya
committed
Merge branch 'master' of https://github.com/qgis/QGIS into processing_parameters_refactoring
Conflicts: python/plugins/processing/gui/ExtentSelectionPanel.py
2 parents 9b75746 + 3b1dfa7 commit fba87f7

File tree

201 files changed

+2551
-850
lines changed

Some content is hidden

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

201 files changed

+2551
-850
lines changed

‎ci/travis/linux/install.sh

+2
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ cmake \
4242
-DCMAKE_PREFIX_PATH=/home/travis/osgeo4travis \
4343
-DWITH_STAGED_PLUGINS=ON \
4444
-DWITH_GRASS=ON \
45+
-DWITH_GRASS7=ON \
46+
-DGRASS_PREFIX7=/home/travis/osgeo4travis/grass-7.0.4 \
4547
-DSUPPRESS_QT_WARNINGS=ON \
4648
-DENABLE_MODELTEST=ON \
4749
-DENABLE_PGTEST=ON \

‎ci/travis/linux/script.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ export CCACHE_TEMPDIR=/tmp
2121

2222
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
2323

24-
xvfb-run ctest -V -E "qgis_openstreetmaptest|qgis_wcsprovidertest|PyQgsWFSProviderGUI|qgis_ziplayertest|qgis_ogcutilstest|$(cat ${DIR}/blacklist.txt | paste -sd '|' -)" -S ./qgis-test-travis.ctest --output-on-failure
24+
xvfb-run ctest -V -E "qgis_openstreetmaptest|qgis_wcsprovidertest|PyQgsWFSProviderGUI|qgis_ziplayertest|$(cat ${DIR}/blacklist.txt | paste -sd '|' -)" -S ./qgis-test-travis.ctest --output-on-failure
2525
# xvfb-run ctest -V -E "qgis_openstreetmaptest|qgis_wcsprovidertest" -S ./qgis-test-travis.ctest --output-on-failure

‎debian/changelog

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
qgis (2.99.0) UNRELEASED; urgency=medium
22

33
* New development version 2.999 after branch of 2.16
4-
* move to qt5/python3
4+
* move to qt5/python3/ninja
55

6-
-- Jürgen E. Fischer <jef@norbit.de> Fri, 08 Jul 2016 14:12:36 +0200
6+
-- Jürgen E. Fischer <jef@norbit.de> Thu, 06 Oct 2016 13:30:42 +0200
77

88
qgis (2.16.0) unstable; urgency=medium
99

‎debian/compat

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9

‎debian/compat.in

-2
This file was deleted.

‎debian/control

+51-43
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,41 @@ Priority: optional
66
Build-Depends:
77
bison,
88
cmake (>= 2.8),
9-
debhelper (>= 7),
9+
debhelper (>= 9),
10+
dh-python,
1011
flex,
1112
grass-dev,
1213
libexpat1-dev,
1314
libfcgi-dev,
14-
libgdal1-dev | libgdal-dev,
15+
libgdal-dev (>= 1.11),
16+
libgsl-dev,
1517
libgeos-dev (>= 3.0.0),
16-
libgsl0-dev,
1718
libpq-dev,
1819
libproj-dev,
19-
qtbase5-dev,
20-
libqca-qt5-2-dev,
21-
libqwt-qt5-dev,
2220
libspatialite-dev,
2321
libsqlite3-dev,
2422
libspatialindex-dev,
23+
qtbase5-dev, qttools5-dev-tools, qttools5-dev, qtscript5-dev, qtpositioning5-dev,
24+
libqt5svg5-dev, libqt5xmlpatterns5-dev, libqt5webkit5-dev, libqt5opengl5-dev, libqt5sql5-sqlite, libqt5scintilla2-dev,
25+
libqwt-qt5-dev, libqca-qt5-2-dev, libqca-qt5-2-plugins,
26+
python3-dev, python3-all-dev, python3-sip, python3-sip-dev,
27+
pyqt5-dev-tools, pyqt5-dev, pyqt5.qsci-dev,
28+
python3-pyqt5, python3-pyqt5.qsci, python3-pyqt5.qtsql, python3-pyqt5.qtsvg,
29+
python3-gdal,
30+
python3-nose2, python3-yaml, python3-mock, python3-psycopg2, python3-future, python3-termcolor,
2531
pkg-config,
26-
pyqt5-dev,
27-
python3-dev,
28-
python3-all-dev,
29-
python3-sip,
30-
python3-sip-dev,
31-
python3-pyqt5,
3232
git,
3333
txt2tags,
34-
doxygen
34+
doxygen,
35+
gdal-bin,
36+
spawn-fcgi, lighttpd, poppler-utils,
37+
graphviz,
38+
xvfb, xauth,
39+
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
40+
libosgearth-dev,
41+
locales, ca-certificates, ninja-build
3542
Build-Conflicts: libqgis-dev, qgis-dev
36-
Standards-Version: 3.8.4
37-
XS-Python-Version: current
43+
Standards-Version: 3.9.7
3844
Vcs-Browser: https://github.com/qgis/QGIS/
3945
Vcs-Git: https://github.com/qgis/QGIS.git
4046
Homepage: http://qgis.org/
@@ -64,28 +70,30 @@ Description: Geographic Information System (GIS)
6470
Package: qgis-common
6571
Architecture: all
6672
Depends:
67-
${misc:Depends}
73+
libjs-jquery,
74+
libjs-leaflet,
75+
${misc:Depends}
6876
Description: QGIS - architecture-independent data
6977
QGIS is a Geographic Information System (GIS) which manages, analyzes and
7078
display databases of geographic information.
7179
.
7280
This package contains architecture-independent supporting data files for use
7381
with QGIS.
7482

75-
Package: libqgis-app3.0.0
83+
Package: libqgis-app2.99.0
7684
Architecture: any
7785
Section: libs
7886
Depends:
7987
${shlibs:Depends},
8088
${misc:Depends}
81-
Replaces: libqgis{QGIS_ABI}
89+
Replaces: libqgis2.99.0
8290
Description: QGIS - shared app library
8391
QGIS is a Geographic Information System (GIS) which manages, analyzes and
8492
display databases of geographic information.
8593
.
8694
This package contains the shared app library.
8795

88-
Package: libqgis-core3.0.0
96+
Package: libqgis-core2.99.0
8997
Architecture: any
9098
Section: libs
9199
Depends:
@@ -97,7 +105,7 @@ Description: QGIS - shared core library
97105
.
98106
This package contains the shared core library.
99107

100-
Package: libqgis-gui3.0.0
108+
Package: libqgis-gui2.99.0
101109
Architecture: any
102110
Section: libs
103111
Depends:
@@ -109,7 +117,7 @@ Description: QGIS - shared gui library
109117
.
110118
This package contains the shared gui library.
111119

112-
Package: libqgis-analysis3.0.0
120+
Package: libqgis-analysis2.99.0
113121
Architecture: any
114122
Section: libs
115123
Depends:
@@ -121,7 +129,7 @@ Description: QGIS - shared analysis library
121129
.
122130
This package contains the shared analysis library.
123131

124-
Package: libqgis-networkanalysis3.0.0
132+
Package: libqgis-networkanalysis2.99.0
125133
Architecture: any
126134
Section: libs
127135
Depends:
@@ -133,7 +141,7 @@ Description: QGIS - shared network analysis library
133141
.
134142
This package contains the shared network analysis library.
135143

136-
Package: libqgisgrass3.0.0
144+
Package: libqgisgrass7-2.99.0
137145
Architecture: any
138146
Section: libs
139147
Depends:
@@ -145,13 +153,13 @@ Description: QGIS - shared grass library
145153
.
146154
This package contains the shared grass library.
147155

148-
Package: libqgispython3.0.0
156+
Package: libqgispython2.99.0
149157
Architecture: any
150158
Section: libs
151159
Depends:
152160
${shlibs:Depends},
153161
${misc:Depends}
154-
Replaces: libqgis3.0.0
162+
Replaces: libqgis2.99.0
155163
Description: QGIS - shared Python library
156164
QGIS is a Geographic Information System (GIS) which manages, analyzes and
157165
display databases of geographic information.
@@ -170,7 +178,7 @@ Description: QGIS custom widgets for Qt Designer
170178
.
171179
This package contains a library to use specific QGIS widgets in Qt Designer.
172180

173-
Package: libqgis-server{QGIS_ABI}
181+
Package: libqgis-server2.99.0
174182
Architecture: any
175183
Depends:
176184
${shlibs:Depends},
@@ -187,18 +195,18 @@ Section: libdevel
187195
Depends:
188196
grass-dev,
189197
libexpat1-dev,
190-
libgdal1-dev,
198+
libgdal-dev (>= 1.11),
191199
libgeos-dev (>= 3.0.0),
192-
libgsl0-dev,
200+
libgsl-dev,
193201
libpq-dev,
194202
libproj-dev,
195-
libqgis-app3.0.0 (= ${binary:Version}),
196-
libqgis-core3.0.0 (= ${binary:Version}),
197-
libqgis-gui3.0.0 (= ${binary:Version}),
198-
libqgis-analysis3.0.0 (= ${binary:Version}),
199-
libqgis-networkanalysis3.0.0 (= ${binary:Version}),
200-
libqgisgrass7.0.4-3.0.0 (= ${binary:Version}),
201-
libqgispython3.0.0 (= ${binary:Version}),
203+
libqgis-app2.99.0 (= ${binary:Version}),
204+
libqgis-core2.99.0 (= ${binary:Version}),
205+
libqgis-gui2.99.0 (= ${binary:Version}),
206+
libqgis-analysis2.99.0 (= ${binary:Version}),
207+
libqgis-networkanalysis2.99.0 (= ${binary:Version}),
208+
libqgisgrass7-2.99.0 (= ${binary:Version}),
209+
libqgispython2.99.0 (= ${binary:Version}),
202210
libsqlite3-dev,
203211
qtbase5-dev, python3-pyqt5, qttools5-dev,
204212
libqt5svg5-dev, pyqt5.qsci-dev,
@@ -229,13 +237,13 @@ Architecture: any
229237
Section: debug
230238
Priority: extra
231239
Depends:
232-
libqgis-app{QGIS_ABI} (= ${binary:Version}),
233-
libqgis-core{QGIS_ABI} (= ${binary:Version}),
234-
libqgis-gui{QGIS_ABI} (= ${binary:Version}),
235-
libqgis-analysis{QGIS_ABI} (= ${binary:Version}),
236-
libqgis-networkanalysis{QGIS_ABI} (= ${binary:Version}),
237-
libqgisgrass{GRASSVER}-{QGIS_ABI} (= ${binary:Version}),
238-
libqgispython{QGIS_ABI} (= ${binary:Version}),
240+
libqgis-app2.99.0 (= ${binary:Version}),
241+
libqgis-core2.99.0 (= ${binary:Version}),
242+
libqgis-gui2.99.0 (= ${binary:Version}),
243+
libqgis-analysis2.99.0 (= ${binary:Version}),
244+
libqgis-networkanalysis2.99.0 (= ${binary:Version}),
245+
libqgisgrass7-2.99.0 (= ${binary:Version}),
246+
libqgispython2.99.0 (= ${binary:Version}),
239247
${misc:Depends}
240248
Suggests: gdb
241249
Description: QGIS - debugging symbols
@@ -304,7 +312,7 @@ Depends:
304312
python3-six,
305313
python3-yaml,
306314
python3-future,
307-
libqgispython3.0.0,
315+
libqgispython2.99.0,
308316
${shlibs:Depends},
309317
${python:Depends},
310318
${misc:Depends},

‎debian/control.in

+7-9
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ Priority: optional
66
Build-Depends:
77
bison,
88
cmake (>= 2.8),
9-
#sid stretch jessie trusty xenial# debhelper (>= 9),
10-
#sid stretch jessie trusty xenial# dh-python,
9+
debhelper (>= 9),
10+
dh-python,
1111
flex,
1212
grass-dev,
1313
libexpat1-dev,
1414
libfcgi-dev,
15-
#sid stretch jessie trusty xenial# libgdal-dev (>= 1.10.1-0~),
16-
#jessie trusty# libgsl0-dev,
15+
libgdal-dev (>= 1.11),
16+
#trusty# libgsl0-dev,
1717
#sid stretch xenial# libgsl-dev,
1818
libgeos-dev (>= 3.0.0),
1919
libpq-dev,
@@ -40,12 +40,10 @@ Build-Depends:
4040
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
4141
#sid# libosgearth-dev,
4242
#oracle# oracle-instantclient12.1-devel,
43-
locales, ca-certificates
43+
locales, ca-certificates, ninja-build
4444
Build-Conflicts: libqgis-dev, qgis-dev
4545
#sid stretch xenial#Standards-Version: 3.9.7
46-
#jessie#Standards-Version: 3.9.6
4746
#trusty#Standards-Version: 3.8.4
48-
#sid stretch jessie#X-Python-Version: >= 2.7, << 2.8
4947
#trusty xenial#XS-Python-Version: current
5048
Vcs-Browser: https://github.com/qgis/QGIS/
5149
Vcs-Git: https://github.com/qgis/QGIS.git
@@ -202,9 +200,9 @@ Section: libdevel
202200
Depends:
203201
grass-dev,
204202
libexpat1-dev,
205-
#sid stretch jessie trusty xenial# libgdal-dev (>= 1.10.1-0~),
203+
libgdal-dev (>= 1.11),
206204
libgeos-dev (>= 3.0.0),
207-
#jessie trusty# libgsl0-dev,
205+
#trusty# libgsl0-dev,
208206
#sid stretch xenial# libgsl-dev,
209207
libpq-dev,
210208
libproj-dev,

‎debian/rules

+14-8
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ endif
3636

3737
QT_PLUGINS_DIR = usr/lib/$(DEB_BUILD_MULTIARCH)/qt5/plugins
3838

39-
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"stretch xenial"))
39+
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"trusty stretch xenial"))
4040
DISTRIBUTION := sid
4141
endif
4242

4343
DEB_BUILD_NAME ?= $(DISTRIBUTION)-$(DEB_BUILD_ARCH)
4444

4545
ifeq (,$(DISPLAY))
46-
TESTMAKE=xvfb-run -a -n 1 -s "-screen 0 1280x1024x24 -dpi 96" $(MAKE)
46+
TESTMAKE=xvfb-run -a -n 1 -s "-screen 0 1280x1024x24 -dpi 96" ninja
4747
else
48-
TESTMAKE=$(MAKE)
48+
TESTMAKE=ninja
4949
endif
5050

5151
QGIS_MAJOR=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_MAJOR "\([0-9]*\)")/\1/p' CMakeLists.txt)
@@ -56,6 +56,7 @@ GRASS=grass$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2))
5656
GRASSVER=$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1))
5757

5858
CMAKE_OPTS := \
59+
-G Ninja \
5960
-DBUILDNAME=$(DEB_BUILD_NAME) \
6061
-DCMAKE_VERBOSE_MAKEFILE=1 \
6162
-DCMAKE_INSTALL_PREFIX=/usr \
@@ -84,7 +85,8 @@ CMAKE_OPTS := \
8485
-DWITH_QSPATIALITE=TRUE \
8586
-DWITH_PYSPATIALITE=TRUE \
8687
-DQT_PLUGINS_DIR=$(QT_PLUGINS_DIR) \
87-
-DPYTHON_LIBRARY=$(shell python3-config --ldflags | sed -e 's\#-L\(.*\) -L/usr/lib -l\([^ ]*\) .*$$\#\1/lib\2.so\#')
88+
-DPYTHON_LIBRARY=$(shell python3-config --ldflags | sed -e 's\#-L\(.*\) -L/usr/lib -l\([^ ]*\) .*$$\#\1/lib\2.so\#') \
89+
-DDOXYGEN_ON_DEMAND=TRUE
8890

8991
ifneq ($(SHA),)
9092
CMAKE_OPTS += -DSHA=$(SHA)
@@ -136,7 +138,7 @@ endif
136138
-DORACLE_INCLUDEDIR=$(ORACLE_INCLUDEDIR)
137139
endif
138140

139-
ifneq (,$(findstring $(DISTRIBUTION),"sid stretch jessie"))
141+
ifneq (,$(findstring $(DISTRIBUTION),"sid stretch"))
140142
CMAKE_OPTS += -DSPATIALINDEX_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libspatialindex.so
141143
endif
142144

@@ -154,12 +156,10 @@ else
154156
CMAKE_OPTS += -DENABLE_TESTS=TRUE
155157
endif
156158

157-
ifneq (,$(findstring $(DISTRIBUTION),"jessie stretch trusty sid"))
158159
CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
159160
CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
160161
CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
161162
LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
162-
endif
163163

164164
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
165165
INSTALL_PROGRAM += -s
@@ -236,6 +236,12 @@ override_dh_clean: cleantemplates
236236
override_dh_auto_configure:
237237
dh_auto_configure -- $(CMAKE_OPTS)
238238

239+
override_dh_auto_build-arch:
240+
ninja -C $(QGIS_BUILDDIR)
241+
242+
override_dh_auto_build-indep:
243+
ninja -C $(QGIS_BUILDDIR) apidoc
244+
239245
override_dh_auto_test: test-stamp
240246

241247
test-stamp:
@@ -254,7 +260,7 @@ endif
254260
touch test-stamp
255261

256262
override_dh_auto_install:
257-
dh_auto_install
263+
DESTDIR=$(CURDIR)/debian/tmp ninja -C $(QGIS_BUILDDIR) install
258264

259265
# remove unwanted files
260266
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/installdox

‎doc/CMakeLists.txt

+8-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,14 @@ IF(WITH_APIDOC)
103103
STRING(REPLACE ";" " " DOXYGEN_INPUT "${DOXYGEN_INPUT}")
104104

105105
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake_templates/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
106-
ADD_CUSTOM_TARGET(apidoc ALL DEPENDS ${QHP_FILES})
106+
107+
SET (DOXYGEN_ON_DEMAND FALSE CACHE BOOL "Determines whether the QGIS API doxygen documentation should be build on demand only")
108+
109+
IF(DOXYGEN_ON_DEMAND)
110+
ADD_CUSTOM_TARGET(apidoc DEPENDS ${QHP_FILES})
111+
ELSE(DOXYGEN_ON_DEMAND)
112+
ADD_CUSTOM_TARGET(apidoc ALL DEPENDS ${QHP_FILES})
113+
ENDIF(DOXYGEN_ON_DEMAND)
107114
ADD_CUSTOM_COMMAND(
108115
OUTPUT ${QHP_FILES}
109116
DEPENDS ${DOXYGEN_FILES}

0 commit comments

Comments
 (0)