Skip to content

Commit 281daee

Browse files
3nids3nids
committedJun 5, 2017
run Doxygen and doc coverage test on static Travis config
·
ltr-3_40final-3_0_0
1 parent 05d9f92 commit 281daee

File tree

12 files changed

+658
-600
lines changed

12 files changed

+658
-600
lines changed
 

‎.ci/travis/code_layout/CMakeLists.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.6)
44

55
SET(CMAKE_CXX_STANDARD 11)
66

7+
SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/../../../cmake ${CMAKE_MODULE_PATH})
8+
79
ADD_SUBDIRECTORY(../../../src/astyle qgisstyle)
810

911
ENABLE_TESTING()
@@ -12,3 +14,15 @@ ADD_TEST(qgis_indentation ${CMAKE_SOURCE_DIR}/../../../scripts/verify-indentatio
1214
ADD_TEST(qgis_spelling ${CMAKE_SOURCE_DIR}/../../../scripts/spell_check/spell_test.sh)
1315
ADD_TEST(qgis_sipify ${CMAKE_SOURCE_DIR}/../../../tests/scripts/test_sipify.sh)
1416
ADD_TEST(qgis_sip_uptodate ${CMAKE_SOURCE_DIR}/../../../tests/scripts/test_sipfiles_uptodate.sh)
17+
18+
IF (WITH_APIDOC)
19+
ADD_SUBDIRECTORY(../../../doc doc)
20+
21+
INCLUDE(CreateQgsVersion)
22+
CREATE_QGSVERSION()
23+
24+
set(QGIS_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/doc")
25+
26+
INCLUDE(UsePythonTest)
27+
ADD_PYTHON_TEST(PyQgsDocCoverage ${CMAKE_SOURCE_DIR}/../../../tests/src/python/test_qgsdoccoverage.py)
28+
ENDIF (WITH_APIDOC)

‎.ci/travis/code_layout/before_install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
# #
1414
###########################################################################
1515

16-
pip install autopep8
16+
pip install autopep8 nose2 mock termcolor

‎.ci/travis/code_layout/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ export CORES=2
1818
mkdir build
1919
cd build
2020

21-
cmake ../.ci/travis/code_layout
21+
cmake -DWITH_APIDOC=ON ../.ci/travis/code_layout
2222
make -j${CORES}

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
.pydevproject
2222
/CMakeLists.txt.user
2323
/CMakeLists.txt.user.*
24+
.ci/travis/code_layout/scripts/qgisstyle*
2425
api_doc
2526
build*
2627
debian/*.debhelper

‎.travis.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,27 @@ matrix:
2222
apt:
2323
sources:
2424
- llvm-toolchain-precise-3.8
25-
- george-edison55-precise-backports # doxygen 1.8.3
25+
- george-edison55-precise-backports # doxygen 1.8.3 # TODO: remove
2626
- ubuntu-toolchain-r-test
2727
packages:
28-
- doxygen
28+
- doxygen # TODO: remove
2929
- bison
3030
- flex
31-
- graphviz
31+
- graphviz # TODO: remove
3232
- libpq-dev
3333
- libfcgi-dev
3434
- libfftw3-3
3535
- libgsl0-dev
3636
- pkg-config
3737
- poppler-utils
38-
- txt2tags
38+
- txt2tags # TODO: remove
3939
- xvfb
4040
- clang-3.8
4141

4242

4343
- os: linux
4444
language: python
45+
python: "3.5"
4546
env:
4647
- TRAVIS_CONFIG=code_layout
4748
dist: trusty
@@ -51,8 +52,12 @@ matrix:
5152
addons:
5253
apt:
5354
sources:
55+
- george-edison55-precise-backports # doxygen 1.8.3
5456
- sourceline: 'ppa:jonathonf/backports' # silversearcher-ag backport
5557
packages:
58+
- doxygen
59+
- graphviz
60+
- txt2tags
5661
- pkg-config
5762
- xvfb
5863
- flip

‎CMakeLists.txt

Lines changed: 2 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -691,51 +691,8 @@ ENDIF(NOT CLANG_TIDY_EXE)
691691

692692
#############################################################
693693
# create qgsversion.h
694-
IF (EXISTS ${CMAKE_SOURCE_DIR}/.git/index)
695-
FIND_PROGRAM(GITCOMMAND git PATHS c:/cygwin/bin)
696-
IF(GITCOMMAND)
697-
IF(WIN32)
698-
IF(USING_NINJA)
699-
SET(ARG %a)
700-
ELSE(USING_NINJA)
701-
SET(ARG %%a)
702-
ENDIF(USING_NINJA)
703-
ADD_CUSTOM_COMMAND(
704-
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.inc
705-
COMMAND for /f \"usebackq tokens=1\" ${ARG} in "(`\"${GITCOMMAND}\" log -n1 --oneline`)" do echo \#define QGSVERSION \"${ARG}\" >${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h.temp
706-
COMMAND for /f \"usebackq tokens=1\" ${ARG} in "(`\"${GITCOMMAND}\" log -n1 --oneline`)" do echo PROJECT_NUMBER = \"${COMPLETE_VERSION}-${RELEASE_NAME} \(${ARG}\)\" >${CMAKE_CURRENT_BINARY_DIR}/qgsversion.inc
707-
COMMAND ${CMAKE_COMMAND} -DSRC=${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h.temp -DDST=${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h -P ${CMAKE_SOURCE_DIR}/cmake/CopyIfChanged.cmake
708-
MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/.git/index
709-
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
710-
)
711-
ELSE(WIN32)
712-
ADD_CUSTOM_COMMAND(
713-
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.inc
714-
COMMAND ${GITCOMMAND} log -n1 --pretty=\#define\\ QGSVERSION\\ \\"%h\\" >${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h.temp
715-
COMMAND ${GITCOMMAND} log -n1 --pretty='PROJECT_NUMBER = \"${COMPLETE_VERSION}-${RELEASE_NAME} \(%h\)\"' >${CMAKE_CURRENT_BINARY_DIR}/qgsversion.inc
716-
COMMAND ${GITCOMMAND} config remote.$$\(${GITCOMMAND} config branch.$$\(${GITCOMMAND} name-rev --name-only HEAD\).remote\).url | sed -e 's/^/\#define QGS_GIT_REMOTE_URL \"/' -e 's/$$/\"/' >>${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h.temp
717-
COMMAND ${CMAKE_COMMAND} -DSRC=${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h.temp -DDST=${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h -P ${CMAKE_SOURCE_DIR}/cmake/CopyIfChanged.cmake
718-
MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/.git/index
719-
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
720-
)
721-
ENDIF(WIN32)
722-
ELSE(GITCOMMAND)
723-
MESSAGE(STATUS "git marker, but no git found - version will be unknown")
724-
IF(NOT SHA)
725-
SET(SHA "unknown")
726-
ENDIF(NOT SHA)
727-
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h "#define QGSVERSION \"${SHA}\"\n")
728-
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.inc "PROJECT_NUMBER = \"${COMPLETE_VERSION}-${RELEASE_NAME} (${SHA})\"\n")
729-
ENDIF(GITCOMMAND)
730-
ELSE (EXISTS ${CMAKE_SOURCE_DIR}/.git/index)
731-
IF(NOT SHA)
732-
SET(SHA "exported")
733-
ENDIF(NOT SHA)
734-
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h "#define QGSVERSION \"${SHA}\"\n")
735-
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.inc "PROJECT_NUMBER = \"${COMPLETE_VERSION}-${RELEASE_NAME} (${SHA})\"\n")
736-
ENDIF (EXISTS ${CMAKE_SOURCE_DIR}/.git/index)
737-
738-
ADD_CUSTOM_TARGET(version ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h)
694+
INCLUDE(CreateQgsVersion)
695+
CREATE_QGSVERSION()
739696

740697
#############################################################
741698
# process subdirs

‎cmake/CreateQgsVersion.cmake

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
MACRO(CREATE_QGSVERSION)
2+
IF (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../.git/index)
3+
FIND_PROGRAM(GITCOMMAND git PATHS c:/cygwin/bin)
4+
IF(GITCOMMAND)
5+
IF(WIN32)
6+
IF(USING_NINJA)
7+
SET(ARG %a)
8+
ELSE(USING_NINJA)
9+
SET(ARG %%a)
10+
ENDIF(USING_NINJA)
11+
ADD_CUSTOM_COMMAND(
12+
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.inc
13+
COMMAND for /f \"usebackq tokens=1\" ${ARG} in "(`\"${GITCOMMAND}\" log -n1 --oneline`)" do echo \#define QGSVERSION \"${ARG}\" >${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h.temp
14+
COMMAND for /f \"usebackq tokens=1\" ${ARG} in "(`\"${GITCOMMAND}\" log -n1 --oneline`)" do echo PROJECT_NUMBER = \"${COMPLETE_VERSION}-${RELEASE_NAME} \(${ARG}\)\" >${CMAKE_CURRENT_BINARY_DIR}/qgsversion.inc
15+
COMMAND ${CMAKE_COMMAND} -DSRC=${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h.temp -DDST=${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h -P ${CMAKE_SOURCE_DIR}/cmake/CopyIfChanged.cmake
16+
MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/.git/index
17+
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
18+
)
19+
ELSE(WIN32)
20+
ADD_CUSTOM_COMMAND(
21+
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.inc
22+
COMMAND ${GITCOMMAND} log -n1 --pretty=\#define\\ QGSVERSION\\ \\"%h\\" >${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h.temp
23+
COMMAND ${GITCOMMAND} log -n1 --pretty='PROJECT_NUMBER = \"${COMPLETE_VERSION}-${RELEASE_NAME} \(%h\)\"' >${CMAKE_CURRENT_BINARY_DIR}/qgsversion.inc
24+
COMMAND ${GITCOMMAND} config remote.$$\(${GITCOMMAND} config branch.$$\(${GITCOMMAND} name-rev --name-only HEAD\).remote\).url | sed -e 's/^/\#define QGS_GIT_REMOTE_URL \"/' -e 's/$$/\"/' >>${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h.temp
25+
COMMAND ${CMAKE_COMMAND} -DSRC=${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h.temp -DDST=${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h -P ${CMAKE_SOURCE_DIR}/cmake/CopyIfChanged.cmake
26+
MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/.git/index
27+
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
28+
)
29+
ENDIF(WIN32)
30+
ELSE(GITCOMMAND)
31+
MESSAGE(STATUS "git marker, but no git found - version will be unknown")
32+
IF(NOT SHA)
33+
SET(SHA "unknown")
34+
ENDIF(NOT SHA)
35+
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h "#define QGSVERSION \"${SHA}\"\n")
36+
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.inc "PROJECT_NUMBER = \"${COMPLETE_VERSION}-${RELEASE_NAME} (${SHA})\"\n")
37+
ENDIF(GITCOMMAND)
38+
ELSE (EXISTS ${CMAKE_SOURCE_DIR}/.git/index)
39+
IF(NOT SHA)
40+
SET(SHA "exported")
41+
ENDIF(NOT SHA)
42+
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h "#define QGSVERSION \"${SHA}\"\n")
43+
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.inc "PROJECT_NUMBER = \"${COMPLETE_VERSION}-${RELEASE_NAME} (${SHA})\"\n")
44+
ENDIF (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../.git/index)
45+
46+
ADD_CUSTOM_TARGET(version ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h)
47+
ENDMACRO(CREATE_QGSVERSION)

‎cmake_templates/Doxyfile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1133,7 +1133,7 @@ HTML_STYLESHEET =
11331133
# list). For an example see the documentation.
11341134
# This tag requires that the tag GENERATE_HTML is set to YES.
11351135

1136-
HTML_EXTRA_STYLESHEET = @CMAKE_SOURCE_DIR@/doc/api_custom.css
1136+
HTML_EXTRA_STYLESHEET = @CMAKE_CURRENT_SOURCE_DIR@/api_custom.css
11371137

11381138
# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
11391139
# other source files which should be copied to the HTML output directory. Note

‎doc/CMakeLists.txt

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ IF(TXT2TAGS_EXECUTABLE)
1818
ADD_CUSTOM_TARGET (t2tdoc ALL DEPENDS ${QGIS_DOC_FILES})
1919
ELSE(TXT2TAGS_EXECUTABLE)
2020
SET(QGIS_DOC_FILES
21-
${CMAKE_SOURCE_DIR}/INSTALL
21+
${CMAKE_CURRENT_SOURCE_DIR}/../INSTALL
2222
)
2323
ENDIF(TXT2TAGS_EXECUTABLE)
2424

@@ -46,65 +46,65 @@ IF(WITH_APIDOC)
4646
ENDIF(GENERATE_QHP)
4747

4848
SET(DOXYGEN_INCLUDE_PATH
49-
${CMAKE_SOURCE_DIR}/src/core
49+
${CMAKE_CURRENT_SOURCE_DIR}/../src/core
5050
)
5151
STRING(REPLACE ";" " " DOXYGEN_INCLUDE_PATH "${DOXYGEN_INCLUDE_PATH}")
5252

5353
SET(DOXYGEN_INPUT
54-
${CMAKE_SOURCE_DIR}/doc
55-
${CMAKE_SOURCE_DIR}/src/core
56-
${CMAKE_SOURCE_DIR}/src/core/annotations
57-
${CMAKE_SOURCE_DIR}/src/core/auth
58-
${CMAKE_SOURCE_DIR}/src/core/composer
59-
${CMAKE_SOURCE_DIR}/src/core/diagram
60-
${CMAKE_SOURCE_DIR}/src/core/dxf
61-
${CMAKE_SOURCE_DIR}/src/core/effects
62-
${CMAKE_SOURCE_DIR}/src/core/fieldformatter
63-
${CMAKE_SOURCE_DIR}/src/core/geometry
64-
${CMAKE_SOURCE_DIR}/src/core/gps
65-
${CMAKE_SOURCE_DIR}/src/core/layertree
66-
${CMAKE_SOURCE_DIR}/src/core/metadata
67-
${CMAKE_SOURCE_DIR}/src/core/pal
68-
${CMAKE_SOURCE_DIR}/src/core/processing
69-
${CMAKE_SOURCE_DIR}/src/core/providers
70-
${CMAKE_SOURCE_DIR}/src/core/providers/memory
71-
${CMAKE_SOURCE_DIR}/src/core/raster
72-
${CMAKE_SOURCE_DIR}/src/core/scalebar
73-
${CMAKE_SOURCE_DIR}/src/core/symbology-ng
74-
${CMAKE_SOURCE_DIR}/src/gui
75-
${CMAKE_SOURCE_DIR}/src/gui/auth
76-
${CMAKE_SOURCE_DIR}/src/gui/attributetable
77-
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets
78-
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets/core
79-
${CMAKE_SOURCE_DIR}/src/gui/effects
80-
${CMAKE_SOURCE_DIR}/src/gui/layertree
81-
${CMAKE_SOURCE_DIR}/src/gui/locator
82-
${CMAKE_SOURCE_DIR}/src/gui/raster
83-
${CMAKE_SOURCE_DIR}/src/gui/symbology-ng
84-
${CMAKE_SOURCE_DIR}/src/analysis
85-
${CMAKE_SOURCE_DIR}/src/analysis/interpolation
86-
${CMAKE_SOURCE_DIR}/src/analysis/network
87-
${CMAKE_SOURCE_DIR}/src/analysis/openstreetmap
88-
${CMAKE_SOURCE_DIR}/src/analysis/raster
89-
${CMAKE_SOURCE_DIR}/src/analysis/vector
90-
${CMAKE_SOURCE_DIR}/src/plugins
54+
${CMAKE_CURRENT_SOURCE_DIR}/../doc
55+
${CMAKE_CURRENT_SOURCE_DIR}/../src/core
56+
${CMAKE_CURRENT_SOURCE_DIR}/../src/core/annotations
57+
${CMAKE_CURRENT_SOURCE_DIR}/../src/core/auth
58+
${CMAKE_CURRENT_SOURCE_DIR}/../src/core/composer
59+
${CMAKE_CURRENT_SOURCE_DIR}/../src/core/diagram
60+
${CMAKE_CURRENT_SOURCE_DIR}/../src/core/dxf
61+
${CMAKE_CURRENT_SOURCE_DIR}/../src/core/effects
62+
${CMAKE_CURRENT_SOURCE_DIR}/../src/core/fieldformatter
63+
${CMAKE_CURRENT_SOURCE_DIR}/../src/core/geometry
64+
${CMAKE_CURRENT_SOURCE_DIR}/../src/core/gps
65+
${CMAKE_CURRENT_SOURCE_DIR}/../src/core/layertree
66+
${CMAKE_CURRENT_SOURCE_DIR}/../src/core/metadata
67+
${CMAKE_CURRENT_SOURCE_DIR}/../src/core/pal
68+
${CMAKE_CURRENT_SOURCE_DIR}/../src/core/processing
69+
${CMAKE_CURRENT_SOURCE_DIR}/../src/core/providers
70+
${CMAKE_CURRENT_SOURCE_DIR}/../src/core/providers/memory
71+
${CMAKE_CURRENT_SOURCE_DIR}/../src/core/raster
72+
${CMAKE_CURRENT_SOURCE_DIR}/../src/core/scalebar
73+
${CMAKE_CURRENT_SOURCE_DIR}/../src/core/symbology-ng
74+
${CMAKE_CURRENT_SOURCE_DIR}/../src/gui
75+
${CMAKE_CURRENT_SOURCE_DIR}/../src/gui/auth
76+
${CMAKE_CURRENT_SOURCE_DIR}/../src/gui/attributetable
77+
${CMAKE_CURRENT_SOURCE_DIR}/../src/gui/editorwidgets
78+
${CMAKE_CURRENT_SOURCE_DIR}/../src/gui/editorwidgets/core
79+
${CMAKE_CURRENT_SOURCE_DIR}/../src/gui/effects
80+
${CMAKE_CURRENT_SOURCE_DIR}/../src/gui/layertree
81+
${CMAKE_CURRENT_SOURCE_DIR}/../src/gui/locator
82+
${CMAKE_CURRENT_SOURCE_DIR}/../src/gui/raster
83+
${CMAKE_CURRENT_SOURCE_DIR}/../src/gui/symbology-ng
84+
${CMAKE_CURRENT_SOURCE_DIR}/../src/analysis
85+
${CMAKE_CURRENT_SOURCE_DIR}/../src/analysis/interpolation
86+
${CMAKE_CURRENT_SOURCE_DIR}/../src/analysis/network
87+
${CMAKE_CURRENT_SOURCE_DIR}/../src/analysis/openstreetmap
88+
${CMAKE_CURRENT_SOURCE_DIR}/../src/analysis/raster
89+
${CMAKE_CURRENT_SOURCE_DIR}/../src/analysis/vector
90+
${CMAKE_CURRENT_SOURCE_DIR}/../src/plugins
9191
)
9292

9393
IF(WITH_SERVER_PLUGINS)
9494
SET(DOXYGEN_INPUT
9595
${DOXYGEN_INPUT}
96-
${CMAKE_SOURCE_DIR}/src/server/qgsserver.h
97-
${CMAKE_SOURCE_DIR}/src/server/qgscapabilitiescache.h
98-
${CMAKE_SOURCE_DIR}/src/server/qgsserverexception.h
99-
${CMAKE_SOURCE_DIR}/src/server/qgsrequesthandler.h
100-
${CMAKE_SOURCE_DIR}/src/server/qgsserverfilter.h
101-
${CMAKE_SOURCE_DIR}/src/server/qgsaccesscontrolfilter.h
102-
${CMAKE_SOURCE_DIR}/src/server/qgsserverinterface.h
103-
${CMAKE_SOURCE_DIR}/src/server/qgsserverrequest.h
104-
${CMAKE_SOURCE_DIR}/src/server/qgsserverresponse.h
105-
${CMAKE_SOURCE_DIR}/src/server/qgsserverrequest.h
106-
${CMAKE_SOURCE_DIR}/src/server/qgsservice.h
107-
${CMAKE_SOURCE_DIR}/src/server/qgsserviceregistry.h
96+
${CMAKE_CURRENT_SOURCE_DIR}/../src/server/qgsserver.h
97+
${CMAKE_CURRENT_SOURCE_DIR}/../src/server/qgscapabilitiescache.h
98+
${CMAKE_CURRENT_SOURCE_DIR}/../src/server/qgsserverexception.h
99+
${CMAKE_CURRENT_SOURCE_DIR}/../src/server/qgsrequesthandler.h
100+
${CMAKE_CURRENT_SOURCE_DIR}/../src/server/qgsserverfilter.h
101+
${CMAKE_CURRENT_SOURCE_DIR}/../src/server/qgsaccesscontrolfilter.h
102+
${CMAKE_CURRENT_SOURCE_DIR}/../src/server/qgsserverinterface.h
103+
${CMAKE_CURRENT_SOURCE_DIR}/../src/server/qgsserverrequest.h
104+
${CMAKE_CURRENT_SOURCE_DIR}/../src/server/qgsserverresponse.h
105+
${CMAKE_CURRENT_SOURCE_DIR}/../src/server/qgsserverrequest.h
106+
${CMAKE_CURRENT_SOURCE_DIR}/../src/server/qgsservice.h
107+
${CMAKE_CURRENT_SOURCE_DIR}/../src/server/qgsserviceregistry.h
108108
)
109109
ENDIF(WITH_SERVER_PLUGINS)
110110

@@ -120,7 +120,7 @@ IF(WITH_APIDOC)
120120

121121
STRING(REPLACE ";" " " DOXYGEN_INPUT "${DOXYGEN_INPUT}")
122122

123-
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake_templates/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
123+
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/../cmake_templates/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
124124

125125
SET (DOXYGEN_ON_DEMAND FALSE CACHE BOOL "Determines whether the QGIS API doxygen documentation should be build on demand only")
126126

‎tests/src/python/doxygen_parser.py

Lines changed: 523 additions & 0 deletions
Large diffs are not rendered by default.

‎tests/src/python/test_qgsdoccoverage.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,14 @@
1414

1515
import os
1616
import sys
17-
from qgis.testing import unittest
17+
try:
18+
from qgis.static_testing import unittest
19+
except ImportError:
20+
from nose2.compat import unittest
21+
1822
from termcolor import colored
1923

20-
from utilities import DoxygenParser
24+
from doxygen_parser import DoxygenParser
2125
from acceptable_missing_doc import ACCEPTABLE_MISSING_DOCS, ACCEPTABLE_MISSING_ADDED_NOTE, ACCEPTABLE_MISSING_BRIEF
2226

2327
# TO regenerate the list:

‎tests/src/python/utilities.py

Lines changed: 1 addition & 494 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.