Cleanup: Move docs/html to docs/resources

This commit is contained in:
Simon Hausmann 2021-07-07 20:08:15 +02:00 committed by Simon Hausmann
parent 6d964b9ee7
commit be47f708d9
7 changed files with 6 additions and 6 deletions

View file

@ -305,7 +305,7 @@ jobs:
# allow deprecated warning because we are using nightly and some things might be deprecated in nightly
# for which the stable alternative is not yet available
RUSTFLAGS: -D warnings -W deprecated
RUSTDOCFLAGS: --html-in-header=/home/runner/work/sixtyfps/sixtyfps/docs/html/sixtyfps-docs-preview.html --html-in-header=/home/runner/work/sixtyfps/sixtyfps/docs/html/sixtyfps-docs-highlight.html -D warnings -W deprecated
RUSTDOCFLAGS: --html-in-header=/home/runner/work/sixtyfps/sixtyfps/docs/resources/sixtyfps-docs-preview.html --html-in-header=/home/runner/work/sixtyfps/sixtyfps/docs/resources/sixtyfps-docs-highlight.html -D warnings -W deprecated
SIXTYFPS_NO_QT: 1
CARGO_INCREMENTAL: false
MDBOOK_VERSION: 0.4.10

View file

@ -1,6 +1,6 @@
{% extends "!layout.html" %}
{% block scripts %}
{{ super() }}
{% include "../../../../docs/html/sixtyfps-docs-preview.html" %}
{% include "../../../../docs/html/sixtyfps-docs-highlight.html" %}
{% include "../../../../docs/resources/sixtyfps-docs-preview.html" %}
{% include "../../../../docs/resources/sixtyfps-docs-highlight.html" %}
{% endblock %}

View file

@ -31,4 +31,4 @@ pin-weak = "1"
rustc_version = "0.4"
[package.metadata.docs.rs]
rustdoc-args = [ "--html-in-header", "docs/html/sixtyfps-docs-preview.html", "--html-in-header", "docs/html/sixtyfps-docs-highlight.html" ]
rustdoc-args = [ "--html-in-header", "docs/resources/sixtyfps-docs-preview.html", "--html-in-header", "docs/resources/sixtyfps-docs-highlight.html" ]

View file

@ -125,7 +125,7 @@ html to the documentation with the `--html-in-header` rustdoc flag.
Here is how to build the documentation to include preview of the .60 files.
```sh
RUSTDOCFLAGS="--html-in-header=$PWD/docs/html/sixtyfps-docs-preview.html --html-in-header=$PWD/docs/html/sixtyfps-docs-highlight.html" cargo +nightly doc --no-deps
RUSTDOCFLAGS="--html-in-header=$PWD/docs/resources/sixtyfps-docs-preview.html --html-in-header=$PWD/docs/resources/sixtyfps-docs-highlight.html" cargo +nightly doc --no-deps
```
### C++ doc

View file

@ -1 +1 @@
../../html/sixtyfps-docs-highlight.html
../../resources/sixtyfps-docs-highlight.html