From owner-dev-commits-doc-all@freebsd.org Sat Jun 5 17:31:16 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7E978647342 for ; Sat, 5 Jun 2021 17:31:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fy69w3CmQz3kQL; Sat, 5 Jun 2021 17:31:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 56BB114C09; Sat, 5 Jun 2021 17:31:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 155HVGXG085451; Sat, 5 Jun 2021 17:31:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 155HVGbi085450; Sat, 5 Jun 2021 17:31:16 GMT (envelope-from git) Date: Sat, 5 Jun 2021 17:31:16 GMT Message-Id: <202106051731.155HVGbi085450@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: "Danilo G. Baio" Subject: git: 163f29fb33 - main - Add support to Hugo arguments/flags MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dbaio X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 163f29fb33bf5cd8101635f5c7cddfcc04a0d28d Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Jun 2021 17:31:16 -0000 The branch main has been updated by dbaio: URL: https://cgit.FreeBSD.org/doc/commit/?id=163f29fb33bf5cd8101635f5c7cddfcc04a0d28d commit 163f29fb33bf5cd8101635f5c7cddfcc04a0d28d Author: Danilo G. Baio AuthorDate: 2021-06-05 17:25:34 +0000 Commit: Danilo G. Baio CommitDate: 2021-06-05 17:25:34 +0000 Add support to Hugo arguments/flags This also enables verbose output by default, same behavior we had in the doc tree before Hugo/Asciidoctor and add --minify to HUGO_ARGS variable to make it optional. Reviewed by: ceri, allanjude, imp Differential Revision: https://reviews.freebsd.org/D30652 --- documentation/Makefile | 5 +++-- website/Makefile | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/documentation/Makefile b/documentation/Makefile index a10461f4ae..606d79c30f 100644 --- a/documentation/Makefile +++ b/documentation/Makefile @@ -21,6 +21,7 @@ LOCALBASE?= /usr/local PYTHON_CMD = ${LOCALBASE}/bin/python3 RUBY_CMD = ${LOCALBASE}/bin/ruby HUGO_CMD = ${LOCALBASE}/bin/hugo +HUGO_ARGS?= --verbose --minify ASCIIDOCTORPDF_CMD= ${LOCALBASE}/bin/asciidoctor-pdf .if defined(DOC_LANG) && !empty(DOC_LANG) LANGUAGES = ${DOC_LANG} @@ -78,10 +79,10 @@ static/pgpkeys/pgpkeys.txt: static/pgpkeys/*key ${RUBY_CMD} ./tools/global-pgpkeys-creator.rb run-local: .PHONY - ${HUGO_CMD} server -D $(BIND:D--bind=$(BIND)) --baseURL="http://$(.HOST):1313" + ${HUGO_CMD} server ${HUGO_ARGS} -D $(BIND:D--bind=$(BIND)) --baseURL="http://$(.HOST):1313" build: .PHONY - ${HUGO_CMD} --minify + ${HUGO_CMD} ${HUGO_ARGS} # # PDF targets diff --git a/website/Makefile b/website/Makefile index 560c7b8d45..fbee771541 100644 --- a/website/Makefile +++ b/website/Makefile @@ -17,6 +17,7 @@ MAINTAINER=carlavilla@FreeBSD.org PYTHON_CMD = /usr/local/bin/python3 HUGO_CMD = /usr/local/bin/hugo +HUGO_ARGS?= --verbose RUBYLIB = ../shared/lib .export RUBYLIB @@ -51,10 +52,10 @@ generate-releases: .PHONY ${PYTHON_CMD} ./tools/releases-toml.py -p ./shared/releases.adoc run-local: .PHONY - ${HUGO_CMD} server -D $(BIND:D--bind=$(BIND)) --baseURL="http://$(.HOST):1313" + ${HUGO_CMD} server ${HUGO_ARGS} -D $(BIND:D--bind=$(BIND)) --baseURL="http://$(.HOST):1313" build: .PHONY - ${HUGO_CMD} + ${HUGO_CMD} ${HUGO_ARGS} post-build: cgi-permissions