-
Notifications
You must be signed in to change notification settings - Fork 972
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
Fix documentation issues when upgrading Doxygen to 1.9.8 #1564
Conversation
As of Doxygen 1.8.19 (specifically, doxygen/doxygen@327423e), the first line of a comment is no longer automatically extracted as a brief description unless we enable the JAVADOC_AUTOBRIEF setting. See https://www.doxygen.nl/manual/config.html#cfg_javadoc_autobrief: > If the `JAVADOC_AUTOBRIEF` tag is set to `YES` then doxygen will > interpret the first line (until the first dot) of a Javadoc-style > comment as the brief description. If set to `NO`, the Javadoc-style > will behave just like regular Qt-style comments (thus requiring an > explicit @brief command for a brief description.) Fixes #1563.
Between Doxygen 1.8.17 and Doxygen 1.9.8, the top-level "modules" tab type in the Doxygen layout has changed such that our "API Documentation" section is no longer generated and is instead considered of the type "topics". Update our layout XML to reflect this change and restore this critical section of the documentation. Fixes #1563.
@@ -3,7 +3,8 @@ | |||
<!-- Navigation index tabs for HTML output --> | |||
<navindex> | |||
<tab type="mainpage" visible="yes" title="Introduction"></tab> | |||
<tab type="modules" visible="yes" title="API Documentation" intro="These are the libraries supplied in the Raspberry Pi Pico SDK"/> | |||
<tab type="topics" visible="yes" title="API Documentation" intro="These are the libraries supplied in the Raspberry Pi Pico SDK"/> |
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.
Frustratingly, this change will break building the docs on Doxygen 1.8.17 as this seems to be a breaking change in Doxygen itself.
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.
Joy. Is there a requirements file we can specify the minimum version needed?
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.
I believe Doxygen is being used a system dependency here (i.e. we expect the doxygen
command to be available when running the build) rather than something being managed by Bundler or PIP so there is no existing place to specify a version constraint.
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.
Ah it's a README thing then. 'kay.
This no longer seems to work as expected with the very latest version of Doxygen (1.10.0) and I've discovered more subtle bugs with brief description extraction even without relying on pico-sdk/src/rp2_common/hardware_spi/include/hardware/spi.h Lines 100 to 103 in 6a7db34
Note the first line of the detailed description being included here, presumably because there is no blank line after the |
Yes, I'll close this one though the |
@nelliemckesson Do we still need the |
@aallan @mudge we don't use doxygen's generated nav data in the web documentation toolchain, and as far as I can tell, it also isn't used in the |
I think the only place that's still relevant is Appendix E of https://datasheets.raspberrypi.com/pico/raspberry-pi-pico-c-sdk.pdf ? But if this is going to become dependent on the version of Doxygen the user has installed, maybe the Doxygen-version also needs to be mentioned in that Appendix? |
@nathan-contino Can you throw a quick NOTE block into Appendix E of the Pico C SDK book ahead of the documentation release (which looks to be next week at this point). Thanks! |
See #1563
Between Doxygen 1.8.17 and Doxygen 1.9.8, the top-level "modules" tab type in the Doxygen layout has changed such that our "API Documentation" section is no longer generated and is instead considered of the type "topics". Update our layout XML to reflect this change and restore this critical section of the documentation.
As of Doxygen 1.8.19 (specifically, doxygen/doxygen@327423e), the first line of a comment is no longer automatically extracted as a brief description unless we enable the JAVADOC_AUTOBRIEF setting. See https://www.doxygen.nl/manual/config.html#cfg_javadoc_autobrief: