Skip to content

Commit

Permalink
docs: conform to consistency
Browse files Browse the repository at this point in the history
Signed-off-by: msclock <msclock@qq.com>
  • Loading branch information
msclock committed Mar 6, 2024
1 parent dd1d3fd commit fbdff6e
Show file tree
Hide file tree
Showing 16 changed files with 30 additions and 54 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ A development-focused Cpp project template.
[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit)
[![SS Cpp](https://img.shields.io/badge/Serious%20Scaffold-c++-blue)](https://github.com/serious-scaffold/ss-cpp)

## Features
## 🛠️ Features

- Project setup and template update with [copier](https://github.com/copier-org/copier/).
- Customizable container development environment(vscode dev container).
Expand Down
2 changes: 1 addition & 1 deletion cmake/ConfigureDocs.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ if(DOXYGEN_FOUND)
set(DOXYGEN_REFERENCES_LINK_SOURCE YES)
set(DOXYGEN_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})

set(doxygen_docs ${CMAKE_PROJECT_NAME}_doxygen)
set(doxygen_docs ${CMAKE_PROJECT_NAME}-doxygen)
# cmake-format: off
doxygen_add_docs(
${doxygen_docs}
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# -- Project information -----------------------------------------------------

project = "Serious Scaffold Cpp"
copyright = "2022-2023 Serious Scaffold"
copyright = "2022-2024 Serious Scaffold"
author = "msclock"

# -- General configuration ---------------------------------------------------
Expand Down
1 change: 0 additions & 1 deletion docs/development.md

This file was deleted.

File renamed without changes.
7 changes: 7 additions & 0 deletions docs/development/index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Development

```{toctree}
:maxdepth: 1
cmake_workflow
```
9 changes: 3 additions & 6 deletions docs/index.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
# Welcome to Serious Scaffold Cpp's documentation

```{toctree}
:hidden:
```

<!-- Extract content from start line 1 of README.md -->

```{include} ../README.md
Expand All @@ -19,16 +15,17 @@
:glob:
Overview <self>
cmake_workflow
development/index
contributing
```

```{toctree}
:maxdepth: 1
:titlesonly:
:caption: References
api
changelog
api
```

## 🔖 Indices and tables
Expand Down
3 changes: 2 additions & 1 deletion template/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"cmake.useCMakePresets": "always",
"cmake.options.statusBarVisibility": "visible",
"files.exclude": {
"**/.clangd/**": true
},
Expand Down Expand Up @@ -97,5 +98,5 @@
"memory_resource": "cpp",
"numbers": "cpp",
"semaphore": "cpp"
},
}
}
5 changes: 4 additions & 1 deletion template/CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
"generator": "Ninja",
"hidden": true,
"binaryDir": "${sourceDir}/out/build/${presetName}",
"installDir": "${sourceDir}/out/install/${presetName}"
"installDir": "${sourceDir}/out/install/${presetName}",
"cacheVariables": {
"CMAKE_VERBOSE_MAKEFILE": "FALSE"
}
},
{
"name": "x64",
Expand Down
4 changes: 2 additions & 2 deletions template/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Commit messages must follow our convention based on the
[Angular style](https://gist.github.com/stephenparish/9941e89d80e2bc58a153#format-of-the-commit-message)
or the [Karma convention](https://karma-runner.github.io/4.0/dev/git-commit-msg.html):

```txt
```tex
<type>[(scope)]: Subject
[Body]
Expand Down Expand Up @@ -65,7 +65,7 @@ If you write a body, please add trailers at the end
(for example issues and PR references, or co-authors),
without relying on GitHub's flavored Markdown:

```txt
```tex
Body.
Issue #10: https://github.com/namespace/project/issues/10
Expand Down
2 changes: 1 addition & 1 deletion template/README.md.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
[![SS Cpp](https://img.shields.io/badge/Serious%20Scaffold-c++-blue)](https://github.com/serious-scaffold/ss-cpp)

[% if repo_name == 'ss-cpp' -%]
## Features
## 🛠️ Features

- Project setup and template update with [copier](https://github.com/copier-org/copier/).
- Customizable container development environment(vscode dev container).
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
# Welcome to {{ project_name }}'s documentation

```{toctree}
:hidden:
```

<!-- Extract content from start line 1 of README.md -->

```{include} ../README.md
Expand All @@ -19,8 +15,9 @@
:glob:

Overview <self>
development/index
[% if repo_name == 'ss-cpp' -%]
cmake_workflow
contributing
[% endif -%]
```

Expand All @@ -29,8 +26,8 @@ cmake_workflow
:titlesonly:
:caption: References

api
changelog
api
```

## 🔖 Indices and tables
Expand Down
2 changes: 1 addition & 1 deletion template/cmake/ConfigureDocs.cmake.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ if(DOXYGEN_FOUND)
set(DOXYGEN_REFERENCES_LINK_SOURCE YES)
set(DOXYGEN_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})

set(doxygen_docs ${CMAKE_PROJECT_NAME}_doxygen)
set(doxygen_docs ${CMAKE_PROJECT_NAME}-doxygen)
# cmake-format: off
doxygen_add_docs(
${doxygen_docs}
Expand Down
4 changes: 2 additions & 2 deletions template/vcpkg.json.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
[%- endif %]
{
"name": "cmake-modules",
"version": "1.3.6"
"version": "1.3.7"
},
{
"name": "robotology-cmake-ycm",
Expand All @@ -57,7 +57,7 @@
"registries": [
{
"kind": "git",
"baseline": "8166fd34bde37098afa04b82b0ec7f2a2f467fe3",
"baseline": "d21738a465c8d163a84e93c58672a38f69804c36",
"repository": "https://github.com/msclock/cmake-registry",
"packages": [
[%- if use_conan == true %]
Expand Down
4 changes: 2 additions & 2 deletions vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
{
"name": "cmake-modules",
"version": "1.3.6"
"version": "1.3.7"
},
{
"name": "robotology-cmake-ycm",
Expand All @@ -31,7 +31,7 @@
"registries": [
{
"kind": "git",
"baseline": "8166fd34bde37098afa04b82b0ec7f2a2f467fe3",
"baseline": "d21738a465c8d163a84e93c58672a38f69804c36",
"repository": "https://github.com/msclock/cmake-registry",
"packages": [
"cmake-modules",
Expand Down

0 comments on commit fbdff6e

Please sign in to comment.