sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-11-27 00:07:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert 13f4081 and 2b7c5c1

Browse Source 
Ensures that Travis is testing the same documentation coverage as
the actual docs are built using.
This commit is contained in:
Nyall Dawson 2016-01-14 11:47:19 +11:00
parent d97a5e3a83
commit 45eeb95d83
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ci/travis/linux/install.sh
View File

@ -15,7 +15,6 @@ cmake -DWITH_SERVER=ON \
-DENABLE_PGTEST=ON \ -DENABLE_PGTEST=ON \
-DWITH_QWTPOLAR=OFF \ -DWITH_QWTPOLAR=OFF \
-DWITH_APIDOC=ON \ -DWITH_APIDOC=ON \
-DDOXYGEN_FILE_PATTERNS="*.h" \
-DWITH_ASTYLE=ON \ -DWITH_ASTYLE=ON \
-DWITH_PYSPATIALITE=ON \ -DWITH_PYSPATIALITE=ON \
-DGRASS_PREFIX7=/usr/lib/grass70 \ -DGRASS_PREFIX7=/usr/lib/grass70 \

4
cmake_templates/Doxyfile.in
View File

@ -622,7 +622,9 @@ INPUT_ENCODING = UTF-8
# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx # *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 # *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
FILE_PATTERNS = @DOXYGEN_FILE_PATTERNS@ FILE_PATTERNS = *.h \
*.cpp \
*.dox
# The RECURSIVE tag can be used to turn specify whether or not subdirectories # The RECURSIVE tag can be used to turn specify whether or not subdirectories
# should be searched for input files as well. Possible values are YES and NO. # should be searched for input files as well. Possible values are YES and NO.

1
doc/CMakeLists.txt
View File

@ -40,7 +40,6 @@ IF(WITH_APIDOC)
SET(DOXYGEN_TAGS ${QT_TAG_FILE}=${QT_DOC_URL}) SET(DOXYGEN_TAGS ${QT_TAG_FILE}=${QT_DOC_URL})
ENDIF(QT_TAG_FILE) ENDIF(QT_TAG_FILE)
SET (DOXYGEN_FILE_PATTERNS "*.cpp *.h *.dox" CACHE STRING "File patterns to be parsed by doxygen.")
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake_templates/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY) CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake_templates/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
ADD_CUSTOM_TARGET(apidoc ALL ADD_CUSTOM_TARGET(apidoc ALL
COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile

2
tests/src/python/test_qgsdoccoverage.py
View File

@ -27,7 +27,7 @@ from PyQt4.QtCore import qDebug
# DON'T RAISE THIS THRESHOLD!!! # DON'T RAISE THIS THRESHOLD!!!
# (changes which lower this threshold are welcomed though!) # (changes which lower this threshold are welcomed though!)
ACCEPTABLE_MISSING_DOCS = 3754 ACCEPTABLE_MISSING_DOCS = 3764
class TestQgsDocCoverage(TestCase): class TestQgsDocCoverage(TestCase):