-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Have doxygen run in the doxygen directory #1284
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Have doxygen run in the doxygen directory #1284
Conversation
When the Doxywizzard GUI is used and the doxyfile is loaded, the workind directory for doxygen is set to the location of the doxyfile. However the Make and CMake build systems expect doxygen to be ran from the top level directory. This commit unifies the build system and the Doxywizzard GUI so that all of them expect doxygen to be executed in the doxygen directory.
I ran "./tests/scripts/doxygen.sh", and ran into many warnings and failures. The development branch doesn't have any of these. @k-stachowiak Could you please investigate? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In the same vein as @Patater : run make apidoc
in development and after this change, and compare the outputs — they should be identical. Same with scripts/apidoc_full.sh
. With scripts/apidoc_full.sh
, they aren't, for example the files in configs
appear on the “Files” tab which is not desirable.
Makefile
Outdated
@@ -103,7 +103,7 @@ lcov: | |||
|
|||
apidoc: | |||
mkdir -p apidoc | |||
doxygen doxygen/mbedtls.doxyfile | |||
cd doxygen; doxygen mbedtls.doxyfile |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Change cd doxygen;
to cd doxygen &&
so that the second command is not executed if the first fails. This works both under Unix/Posix/Linux and under Windows
Thank you for insightful comments. @Patater I tried reproducing the errors you mentioned, but I failed. I hope it was a false positive, but I will investigate the possible cause. There are some warnings to be expected though regarding the commented defines in config.h, that will say there is a documentation for unknown defines. @gilles-peskine-arm I fixed yet unadjusted paths in the exclusion link, which prevents the header files from configs directory from being included in the output. It also fixes come diagrams including these headers. Now the text/binary diff presents no substantial differences. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good now, no regression when running on Linux.
I can confirm that I ran |
Mbedtls 2.28.9rc0 pr DO NOT MERGE
Description
When the Doxywizzard GUI is used and the doxyfile is loaded, the
workind directory for doxygen is set to the location of the doxyfile.
However the Make and CMake build systems expect doxygen to be ran
from the top level directory.
This commit unifies the build system and the Doxywizzard GUI so that
all of them expect doxygen to be executed in the doxygen directory.
Status
READY
Requires Backporting
This change may be considered backporting, but it's impact is limited to the user experience while generating documentation.
Migrations
NO
Additional comments
NONE
Todos
NONE
Steps to test or reproduce
Perform all of the following, deleting the apidoc directory in the top level directory after each step:
make apidoc
command in the top level directory; verify the documentation in the apidoc directory.The results should be identical in all the above steps.