From 6b4b553d49d73691fbb990f4139bbcd5f7c81d55 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Sun, 19 May 2024 13:12:53 +0200 Subject: [PATCH] website-build: targets: rename targets to use build, serve and publish. Since we're migrating to haunt, and that 'haunt build' builds the website, 'haunt serve' serve the website locally, and that 'haunt publish' takes care of publishing the website, using the same target names will make remembering the targets easier. Signed-off-by: Denis 'GNUtoo' Carikli Acked-by: Adrien 'neox' Bourmault --- website-build/Makefile.am | 17 +++++++++-------- website-build/README | 4 ++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/website-build/Makefile.am b/website-build/Makefile.am index 5c3e15c..a023826 100644 --- a/website-build/Makefile.am +++ b/website-build/Makefile.am @@ -12,7 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . -.PHONY: all build check help deploy website.tar.gz +.PHONY: all build check help publish serve website.tar.gz all: website.tar.gz @@ -67,16 +67,17 @@ check: website.tar.gz endif help: - @printf "%s\n\t%s\n\t%s\n\t%s\n\t%s\n\t%s\n" \ + @printf "%s\n\t%s\n\t%s\n\t%s\n\t%s\n\t%s\n\t%s\n" \ "Available commands:" \ "help # Print this help" \ - "test # run lighttpd on localhost:$(LIGHTTPD_PORT)" \ + "build # Build the website" \ + "serve # run lighttpd on localhost:$(LIGHTTPD_PORT)" \ + "publish # Publish the website to https://gnu.org/software/gnuboot" \ "check # Run automatic tests" \ - "deploy # Deploy the website to https://gnu.org/software/gnuboot" \ "website.tar.gz # Create a tarball of the website" if WANT_GUIX -test: website.tar.gz +serve: website.tar.gz guix shell \ --container \ --network \ @@ -91,10 +92,10 @@ test: website.tar.gz ./serve.sh website.tar.gz $(LIGHTTPD_PORT) else if WANT_LIGHTTPD -test: website.tar.gz +serve: website.tar.gz ./serve.sh website.tar.gz $(LIGHTTPD_PORT) else -test: +serve: @printf "%s %s\n" \ "The test target is disabled." \ "To enable it, run './configure --enable-lighttpd'." @@ -107,7 +108,7 @@ endif # note that it's possible to rsync some files to gnu.org but not from # gnu.org. RSYNC_OPTIONS := -av --progress -deploy: website.tar.gz +publish: website.tar.gz rm -rf deploy mkdir -p deploy tar xf website.tar.gz -C deploy diff --git a/website-build/README b/website-build/README index c916683..eab2928 100644 --- a/website-build/README +++ b/website-build/README @@ -11,7 +11,7 @@ different git repositories and/or revisions. Here's how to deploy the website in a local webserver: $ ./autogen.sh $ ./configure -$ make test +$ make serve Then you can point a browser to http://localhost:8086/software/gnuboot/web/ or to http://localhost:PORT/software/gnuboot/web/ if you changed the port through @@ -66,7 +66,7 @@ To deploy the website, use the following commands from the website-build directory: $ ./autogen.sh $ ./configure - $ make deploy + $ make publish Then you can point a browser to https://gnu.org/software/gnuboot/web/