diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2023-03-23 17:56:59 -0400 |
|---|---|---|
| committer | Eli Schwartz <eschwartz@archlinux.org> | 2023-03-26 00:37:39 -0400 |
| commit | b3b57342ef1a9127b7a69ede3c7844f76c6d0c72 (patch) | |
| tree | bcc06ed5d2026a52456473bd18a3c563737eacd0 | |
| parent | 3ca56dc778978dc591c83ea5d10c597bdbf5d746 (diff) | |
| download | meson-b3b57342ef1a9127b7a69ede3c7844f76c6d0c72.zip meson-b3b57342ef1a9127b7a69ede3c7844f76c6d0c72.tar.gz meson-b3b57342ef1a9127b7a69ede3c7844f76c6d0c72.tar.bz2 | |
tests: fix critical existence failure of doxygen test
It was totally subproject-unsafe, and setting a super bad example. This
is bad, because doxygen is annoying to get right and we occasionally
tell people to go use our example test case.
There is a fun nuance here, that makes doxygen unpredictably work on
some versions, and fail on others. Specifically, values must be quoted
in doxygen 1.8, but not in doxygen 1.9, or they break -- but only if the
output directory contains spaces. This was "fixed" in commit
https://github.com/doxygen/doxygen/commit/ef91bacb7a69bbf7bccb4a864698cc003aabac66
which actually caused it to act like an unquoted OUTPUT_DIRECTORY is not
provided at all, and then fixed for real in commit
https://github.com/doxygen/doxygen/commit/eb3d1eb5ad85c94d6f2c32934fce2b8630331d6c
For portability, it is necessary to quote this just to be on the safe
side.
Fixes #11579
| -rw-r--r-- | test cases/frameworks/14 doxygen/doc/Doxyfile.in | 2 | ||||
| -rw-r--r-- | test cases/frameworks/14 doxygen/doc/meson.build | 4 | ||||
| -rw-r--r-- | test cases/frameworks/14 doxygen/meson.build | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/test cases/frameworks/14 doxygen/doc/Doxyfile.in b/test cases/frameworks/14 doxygen/doc/Doxyfile.in index 69fb4aa..d1ad3a1 100644 --- a/test cases/frameworks/14 doxygen/doc/Doxyfile.in +++ b/test cases/frameworks/14 doxygen/doc/Doxyfile.in @@ -58,7 +58,7 @@ PROJECT_LOGO = # entered, it will be relative to the location where doxygen was started. If # left blank the current directory will be used. -OUTPUT_DIRECTORY = doc +OUTPUT_DIRECTORY = "@TOP_BUILDDIR@/doc" # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- # directories (in 2 levels) under the output directory of each output format and diff --git a/test cases/frameworks/14 doxygen/doc/meson.build b/test cases/frameworks/14 doxygen/doc/meson.build index bde2d7c..626b8ce 100644 --- a/test cases/frameworks/14 doxygen/doc/meson.build +++ b/test cases/frameworks/14 doxygen/doc/meson.build @@ -1,5 +1,5 @@ -cdata.set('TOP_SRCDIR', meson.source_root()) -cdata.set('TOP_BUILDDIR', meson.build_root()) +cdata.set('TOP_SRCDIR', meson.project_source_root()) +cdata.set('TOP_BUILDDIR', meson.project_build_root()) doxyfile = configure_file(input: 'Doxyfile.in', output: 'Doxyfile', diff --git a/test cases/frameworks/14 doxygen/meson.build b/test cases/frameworks/14 doxygen/meson.build index 517cef2..9a323fa 100644 --- a/test cases/frameworks/14 doxygen/meson.build +++ b/test cases/frameworks/14 doxygen/meson.build @@ -1,4 +1,4 @@ -project('doxygen test', 'cpp', version : '0.1.0') +project('doxygen test', 'cpp', version : '0.1.0', meson_version: '>=0.56') spede_inc = include_directories('include') |