diff --git a/documentation/.gitignore b/documentation/.gitignore index d703e3c524..467867ca9e 100644 --- a/documentation/.gitignore +++ b/documentation/.gitignore @@ -1,19 +1,16 @@ # Hugo default output directory /public resources # Generated content toc-examples.adoc toc-figures.adoc toc-tables.adoc toc.adoc toc-1.adoc toc-2.adoc toc-3.adoc toc-4.adoc toc-5.adoc -# Shared folder -/shared - *.swp diff --git a/documentation/Makefile b/documentation/Makefile index f6192a459b..cdbed92057 100644 --- a/documentation/Makefile +++ b/documentation/Makefile @@ -1,41 +1,36 @@ # Generate the FreeBSD documentation # # Copyright (c) 2020-2021, The FreeBSD Documentation Project # Copyright (c) 2020-2021, Sergio Carlavilla # # Targets intended for use on the command line # # all (default) - generate the books TOC and compile all the documentation # generate - generate the books TOC and build all the documentation -# copy-shared - move the shared AsciiDoc entities to the folder project MAINTAINER=carlavilla@FreeBSD.org PYTHON_CMD = /usr/local/bin/python3.7 HUGO_CMD = /usr/local/bin/hugo LANGUAGES = en,es,pt-br,de,ja,zh-cn,zh-tw,ru,el,hu,it,mn,nl,pl,fr all: starting-message generate-books-toc run generate: starting-message generate-books-toc build -copy-shared: move-shared starting-message: @echo --------------------------------------------------------------- @echo Building the documentation @echo --------------------------------------------------------------- generate-books-toc: ${PYTHON_CMD} ./tools/books-toc-parts-creator.py -l ${LANGUAGES} ${PYTHON_CMD} ./tools/books-toc-creator.py -l ${LANGUAGES} ${PYTHON_CMD} ./tools/books-toc-figures-creator.py -l ${LANGUAGES} ${PYTHON_CMD} ./tools/books-toc-tables-creator.py -l ${LANGUAGES} ${PYTHON_CMD} ./tools/books-toc-examples-creator.py -l ${LANGUAGES} run: ${HUGO_CMD} server -D build: ${HUGO_CMD} --minify - -move-shared: - cp -R ../shared ./shared diff --git a/documentation/shared b/documentation/shared new file mode 120000 index 0000000000..8fba6b66ae --- /dev/null +++ b/documentation/shared @@ -0,0 +1 @@ +../shared \ No newline at end of file diff --git a/website/.gitignore b/website/.gitignore index 22591f65b4..0bba3cc84e 100644 --- a/website/.gitignore +++ b/website/.gitignore @@ -1,11 +1,8 @@ # Hugo default output directory /public resources -# Shared folder -/shared - # Autogenerated content /data/releases.toml *.swp diff --git a/website/Makefile b/website/Makefile index 71445c4f05..96d0070c5a 100644 --- a/website/Makefile +++ b/website/Makefile @@ -1,36 +1,31 @@ # Generate the FreeBSD website # # Copyright (c) 2020-2021, The FreeBSD Documentation Project # Copyright (c) 2020-2021, Sergio Carlavilla # # Targets intended for use on the command line # # all (default) - generate the releases.toml and compile all the website # generate - generate the releases.toml and build all the website -# copy-shared - move the shared AsciiDoc entities to the folder project MAINTAINER=carlavilla@FreeBSD.org PYTHON_CMD = /usr/local/bin/python3.7 HUGO_CMD = /usr/local/bin/hugo all: starting-message generate-releases run generate: starting-message generate-releases build -copy-shared: move-shared starting-message: @echo --------------------------------------------------------------- @echo Building the website @echo --------------------------------------------------------------- generate-releases: ${PYTHON_CMD} ./tools/releases-toml.py -p ./shared/releases.adoc run: ${HUGO_CMD} server -D build: ${HUGO_CMD} - -move-shared: - cp -R ../shared ./shared diff --git a/website/shared b/website/shared new file mode 120000 index 0000000000..8fba6b66ae --- /dev/null +++ b/website/shared @@ -0,0 +1 @@ +../shared \ No newline at end of file