Skip to content
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

doc: add RIOT root doxygen example path #17572

Merged
merged 2 commits into from
Feb 28, 2022

Conversation

kfessel
Copy link
Contributor

@kfessel kfessel commented Jan 25, 2022

Contribution description

add RIOT root to Doxygen example path
and include some Readme.md with their respective doc.txt

sadly we can't use @includedoc or @include{doc} until Doxygen 1.9.2
see doxygen/doxygen#8395

Testing procedure

read
and
check circleci: doc-build artifact

eg
https://15379-7370241-gh.circle-artifacts.com/0/doc/group__pkg__u8g2.html
vs
https://doc.riot-os.org/group__pkg__u8g2.html

Issues/PRs references

#10815

@github-actions github-actions bot added Area: doc Area: Documentation Area: pkg Area: External package ports labels Jan 25, 2022
@benpicco benpicco requested a review from gschorcht January 25, 2022 18:06
@chrysn
Copy link
Member

chrysn commented Jan 26, 2022

I generally appreciate rendering more and more of what we have in documentation to where we advertise that our documentation is.

The linked output currently has the markdown included as preformatted text rather than inlined and parsed.

Why the split of doc.txt and README.md for the uwb? I think this would perfectly well as one file, given suitable markup.

Similarly for the others: Why is this split into two files in the first place?

@kfessel
Copy link
Contributor Author

kfessel commented Jan 26, 2022

As you can see with the UBW it previously was part of the doc.txt (empty README.md should be considered an achievement) (at the same time it was unrenderd) - (and the writer did not care or he like how it was more readable)

.md files are much easier to write and to read that these .txt (personal opinion)

README.MD further have the advantage that they are automaticaly render by github

with doxygen 1.9.2 @include{doc} should work as it should (sandly with 1.9.1 it does not parse markdown -> generates an utter mess)

https://doc.riot-os.org/group__pkg__uwb__dw1000.html
https://15379-7370241-gh.circle-artifacts.com/0/doc/group__pkg__uwb__dw1000.html
https://github.com/kfessel/RIOT/tree/p-set-doxygen-example-path/pkg/uwb-dw1000

@chrysn
Copy link
Member

chrysn commented Jan 26, 2022 via email

@kfessel
Copy link
Contributor Author

kfessel commented Jan 26, 2022

at least a *.md wild card in doc/doxygen/riot.doxyfile:794 FILE_PATTERNS
creates a very messy doc
maybe including doc.md and rewriting (remove that c-comment decoration would be a good solution)

just remembering i also tested that it generated a smaller mess (but may be i used the doxygen grouping tags wrong)
see #17575 circle-ci build artefakt: https://15407-7370241-gh.circle-artifacts.com/0/doc/index.html

@kfessel
Copy link
Contributor Author

kfessel commented Jan 27, 2022

with doc.md
image

there isn't anything in that doc
https://15407-7370241-gh.circle-artifacts.com/0/doc/md_pkg_uwb-dw1000_doc.html
-> grouping works
https://15407-7370241-gh.circle-artifacts.com/0/doc/group__pkg__uwb__dw1000.html
(same behavior for current 191 doxygen)

@kfessel kfessel closed this Jan 27, 2022
@kfessel kfessel reopened this Jan 27, 2022
@kfessel kfessel added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR CI: skip compile test If set, CI server will run only non-compile jobs, but no compile jobs or their dependent jobs labels Feb 11, 2022
@kfessel kfessel requested review from chrysn and OlegHahm February 11, 2022 18:59
@OlegHahm
Copy link
Member

Is there an estimated release date for doxygen 1.9.2? Would it make sense to wait a little bit?

@OlegHahm
Copy link
Member

And wouldn't #17575 be the preferred solution?

@waehlisch
Copy link
Member

Is there an estimated release date for doxygen 1.9.2?

?? "The latest version of doxygen is 1.9.3 (release date 31 december 2021, updated 3th of January 2022)." https://www.doxygen.nl/download.html#srcbin

@kfessel
Copy link
Contributor Author

kfessel commented Feb 11, 2022

#17575 would be nice but it does not work as expected see #17572 (comment) , i am not sure if there is a doxygen version where that is fixed

1.9.2 (even 1.9.3) is already released but neither in our circleci nor is it used to build doc.riot-os.org

@OlegHahm
Copy link
Member

Sorry for the late response: apparently I've disabled too many of the GitHub notifications.

Regarding the doxygen version: I was referring to the release of 1.9.2 as part of Debian. Even unstable still contains doxygen 1.9.1.

Given the problem with #17575 I would agree with merging this PR for now and give #17575 another try once a newer doxygen version is available.

@kfessel kfessel merged commit 52116e1 into RIOT-OS:master Feb 28, 2022
@OlegHahm OlegHahm added this to the Release 2022.04 milestone Apr 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area: doc Area: Documentation Area: pkg Area: External package ports CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR CI: skip compile test If set, CI server will run only non-compile jobs, but no compile jobs or their dependent jobs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants