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

Fix the path of documentation examples #28664

Merged
merged 1 commit into from
Oct 18, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions docs/pom.xml
Original file line number Diff line number Diff line change
@@ -23,7 +23,8 @@
<quarkus-home-url>https://quarkus.io</quarkus-home-url>
<quarkus-base-url>https://github.com/quarkusio/quarkus</quarkus-base-url>
<quickstarts-base-url>https://github.com/quarkusio/quarkus-quickstarts</quickstarts-base-url>
<code-example-dir>${project.basedir}/../target/asciidoc/examples</code-example-dir>
<generated-dir>${project.basedir}/../target/asciidoc/generated</generated-dir>
<code-examples-dir>${generated-dir}/examples</code-examples-dir>
</properties>

<name>Quarkus - Documentation</name>
@@ -2858,7 +2859,7 @@
<skip>${skipDocs}</skip>
<mainClass>io.quarkus.docs.generation.QuarkusBuildItemDoc</mainClass>
<arguments>
<argument>${project.basedir}/../target/asciidoc/generated/config/quarkus-all-build-items.adoc</argument>
<argument>${generated-dir}/config/quarkus-all-build-items.adoc</argument>
<argument>${project.basedir}/../core/deployment</argument>
<argument>${project.basedir}/../extensions</argument>
</arguments>
@@ -2877,7 +2878,7 @@
<skip>${skipDocs}</skip>
<mainClass>io.quarkus.docs.generation.CopyExampleSource</mainClass>
<arguments>
<argument>${code-example-dir}</argument>
<argument>${code-examples-dir}</argument>
<argument>${project.basedir}/..</argument>
<argument>${project.basedir}/target/asciidoc/sources</argument>
</arguments>
@@ -2920,8 +2921,8 @@
<sourceDirectory>target/asciidoc/sources</sourceDirectory>
<preserveDirectories>true</preserveDirectories>
<attributes>
<generated-dir>${project.basedir}/../target/asciidoc/generated</generated-dir>
<code-examples>${code-example-dir}</code-examples>
<generated-dir>${generated-dir}</generated-dir>
<code-examples>${code-examples-dir}</code-examples>
<imagesdir>./images</imagesdir>
<icons>font</icons>
<sectanchors>true</sectanchors>
4 changes: 2 additions & 2 deletions docs/src/main/asciidoc/_attributes-local.adoc
Original file line number Diff line number Diff line change
@@ -4,10 +4,10 @@
:idprefix:
:idseparator: -
:icons: font
:code-examples: ../../../../target/asciidoc/examples
:generated-dir: ../../../../target/asciidoc/generated
:code-examples: {generated-dir}/examples
:doc-guides: ./
:doc-examples: ./_examples
:generated-dir: ../../../../target/asciidoc/generated
:imagesdir: ./images
:includes: ./_includes
:toc: preamble
2 changes: 1 addition & 1 deletion docs/src/main/asciidoc/_examples/_attributes.adoc
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
:idprefix:
:idseparator: -
:icons: font
:code-examples: ../../../../../target/asciidoc/examples
:code-examples: ../../../../../target/asciidoc/generated/examples
:doc-guides: ..
:doc-examples: .
:imagesdir: ./images
2 changes: 1 addition & 1 deletion docs/src/main/asciidoc/_templates/_attributes.adoc
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
:idprefix:
:idseparator: -
:icons: font
:code-examples: ../../../../../target/asciidoc/examples
:code-examples: ../../../../../target/asciidoc/generated/examples
:doc-guides: ..
:doc-examples: ../_examples
:imagesdir: ../images
4 changes: 2 additions & 2 deletions docs/sync-web-site.sh
Original file line number Diff line number Diff line change
@@ -37,10 +37,10 @@ fi

if [ $BRANCH == "main" ] && [ "$QUARKUS_RELEASE" == "true" ]; then
TARGET_GUIDES=${TARGET_DIR}/_guides
TARGET_CONFIG=${TARGET_DIR}/_generated-config/latest
TARGET_CONFIG=${TARGET_DIR}/_generated-doc/latest
else
TARGET_GUIDES=${TARGET_DIR}/_versions/${BRANCH}/guides
TARGET_CONFIG=${TARGET_DIR}/_generated-config/${BRANCH}
TARGET_CONFIG=${TARGET_DIR}/_generated-doc/${BRANCH}
fi

echo "Copying from target/asciidoc/sources/* to $TARGET_GUIDES"