Skip to content

Commit 6836cae

Browse files
committed
docs: Integrate Doxygen documentation in Sphinx documentation
There is no perfect integration, unfortunately. But this should get the API documentation hosted and readable in its best form. The doxygen-awesome-css theme is used to bring the theme more in line with the rest of the Cloe documentation.
1 parent 69926be commit 6836cae

20 files changed

+3490
-134
lines changed

.github/workflows/build-api-docs.yaml

-20
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,28 @@
1-
name: Build User Documentation
1+
name: Build Documentation
22

33
on:
44
pull_request:
55
paths:
66
- "docs/**"
7+
- "*.hpp"
78

89
jobs:
910
sphinx:
1011
runs-on: ubuntu-latest
1112
steps:
1213
- name: Checkout repository
1314
uses: actions/checkout@v3
14-
- run: mkdir build
15-
- run: sudo apt-get update && sudo apt-get install -y git
16-
- name: Build documentation
15+
- name: Build Doxygen documentation
16+
uses: mattnotmitt/[email protected]
17+
with:
18+
working-directory: docs
19+
- name: Build Sphinx documentation
1720
uses: ammaraskar/sphinx-action@master
1821
with:
19-
docs-folder: docs/
22+
docs-folder: docs
2023
build-command: make html
2124
- name: Upload documentation
2225
uses: actions/upload-artifact@v3
2326
with:
24-
name: user-documentation
25-
path: build/sphinx/html/
27+
name: documentation
28+
path: docs/_build/html/

.gitignore

+5-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ setup.sh
77
# Standard out-of-source build
88
build/
99

10+
# Documentation
11+
docs/_build/
12+
docs/_extra/
13+
1014
# Files generated by Conan:
1115
conan_options.txt
1216
conan.lock
@@ -33,7 +37,7 @@ compile_commands.json
3337
# Python object/temporary files
3438
__pycache__
3539
*.pyc
36-
.mypy_cache
40+
.mypy_cache/
3741

3842
# C/C++ object/temporary files
3943
*.a

Makefile

+5-11
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ help::
4242
$(call print_help_target, status, "show status of each of the Conan packages")
4343
$(call print_help_target, smoketest-deps, "build system test pre-requisites")
4444
$(call print_help_target, smoketest, "run system tests")
45-
$(call print_help_target, sphinx, "generate Sphinx documentation")
46-
$(call print_help_target, doxygen, "generate Doxygen documentation")
45+
$(call print_help_target, docs, "generate documentation")
4746
$(call print_help_target, deploy, "deploy Cloe to INSTALL_DIR [=${INSTALL_DIR}]")
4847
$(call print_help_target, deploy-cli, "install ${_yel}cloe-launch${_rst} with ${_dim}${PIPX}${_rst}")
4948
$(call print_help_target, export-cli, "export ${_yel}cloe-launch-profile${_rst} Conan recipe")
@@ -78,18 +77,13 @@ deploy-cli:
7877
export-cli:
7978
${MAKE} -C cli conan-profile
8079

81-
.PHONY: sphinx
82-
sphinx:
80+
.PHONY: docs
81+
docs:
82+
$(call print_header, "Generating Doxygen documentation...")
83+
${MAKE} -C docs doxygen
8384
$(call print_header, "Generating Sphinx documentation...")
84-
mkdir -p ${BUILD_DIR}/sphinx
8585
${MAKE} -C docs html
8686

87-
.PHONY: doxygen
88-
doxygen:
89-
$(call print_header, "Generating Doxygen documentation...")
90-
mkdir -p ${BUILD_DIR}/doxygen
91-
doxygen Doxyfile
92-
9387
.PHONY: smoketest-deps
9488
smoketest-deps: export-cli smoketest-deps-select
9589

NOTICE.md

+6
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ The following third-party libraries are included in the Cloe repository:
4040
- Website: http://getbootstrap.com
4141
- Source: engine/webui/bootstrap.min.css
4242

43+
- Doxygen-Awesome-CSS
44+
- License: MIT
45+
- License-Source: docs/_vendor/doxygen-awesome/LICENSE
46+
- Website: https://jothepro.github.io/doxygen-awesome-css
47+
- Source: docs/_vendor/doxygen-awesome
48+
4349
The following third-party libraries are used by this project (these are usually
4450
installed with the help of Conan):
4551

0 commit comments

Comments
 (0)