encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tint: Re-enable doxygen 

Remove the default override for TINT_BUILD_DOCS.
Update the Doxyfile to only consider Tint.
Re-enable Kokoro checks.

Fixed: tint:1498
Bug: dawn:1339
Change-Id: I8bf5d7085452b42a6ed564c0f86ed7cbd85128b0
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/86381
Kokoro-Run: Ben Clayton <bclayton@google.com>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Ben Clayton <bclayton@google.com>
This commit is contained in:
Ben Clayton 2022-04-11 22:27:34 +00:00 committed by Dawn LUCI CQ
parent 7170b727c9
commit 1ed28fbdfd
3 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -258,9 +258,6 @@ else()
set(TINT_BUILD_TESTS_DEFAULT ON) set(TINT_BUILD_TESTS_DEFAULT ON)
endif() endif()
# Forcing building docs off right now, since currently this will try to build docs for both Tint & Dawn, and Dawn isn't annotated yet.
set(TINT_BUILD_DOCS_DEFAULT OFF)
option_if_not_defined(TINT_BUILD_SAMPLES "Build samples" ON) option_if_not_defined(TINT_BUILD_SAMPLES "Build samples" ON)
option_if_not_defined(TINT_BUILD_DOCS "Build documentation" ${TINT_BUILD_DOCS_DEFAULT}) option_if_not_defined(TINT_BUILD_DOCS "Build documentation" ${TINT_BUILD_DOCS_DEFAULT})
option_if_not_defined(TINT_DOCS_WARN_AS_ERROR "When building documentation, treat warnings as errors" OFF) option_if_not_defined(TINT_DOCS_WARN_AS_ERROR "When building documentation, treat warnings as errors" OFF)

7
Doxyfile
View File

@ -786,11 +786,8 @@ WARN_LOGFILE =
# Note: If this tag is empty the current directory is searched. # Note: If this tag is empty the current directory is searched.
INPUT = CODE_OF_CONDUCT.md \ INPUT = CODE_OF_CONDUCT.md \
src/tint/fuzzers/tint_spirv_tools_fuzzer \ src/tint \
src \ tools/src
tools/src \
src/tint/fuzzers/tint_spirv_tools_fuzzer \
src/tint/fuzzers/tint_ast_fuzzer
# This tag can be used to specify the character encoding of the source files # This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

22
infra/kokoro/linux/docker.sh
View File

@ -139,18 +139,16 @@ if [ "$BUILD_SYSTEM" == "cmake" ]; then
cd ${BUILD_DIR} cd ${BUILD_DIR}
# TODO(crbug.com/tint/1498): Doxygen is currently disabled. status "Running Doxygen"
# echo "NOTE: This will fail on first warning. Run with -DTINT_DOCS_WARN_AS_ERROR=OFF to see all warnings".
# status "Running Doxygen" echo ""
# echo "NOTE: This will fail on first warning. Run with -DTINT_DOCS_WARN_AS_ERROR=OFF to see all warnings". show_cmds
# echo "" # NOTE: If we upgrade Doxygen to a more recent version, we can set DOXYGEN_WARN_AS_ERROR to
# show_cmds # "FAIL_ON_WARNINGS" instead of "YES" in our CMakeLists.txt so see all warnings, and then
# # NOTE: If we upgrade Doxygen to a more recent version, we can set DOXYGEN_WARN_AS_ERROR to # fail. See https://www.doxygen.nl/manual/config.html#cfg_warn_as_error
# # "FAIL_ON_WARNINGS" instead of "YES" in our CMakeLists.txt so see all warnings, and then cmake ${SRC_DIR} ${CMAKE_FLAGS} ${COMMON_CMAKE_FLAGS}
# # fail. See https://www.doxygen.nl/manual/config.html#cfg_warn_as_error cmake --build . --target tint-docs
# cmake ${SRC_DIR} ${CMAKE_FLAGS} ${COMMON_CMAKE_FLAGS} hide_cmds
# cmake --build . --target tint-docs
# hide_cmds
status "Building dawn in '${BUILD_DIR}'" status "Building dawn in '${BUILD_DIR}'"
show_cmds show_cmds