meso-web

commit ad73953ce502f4b1aee31dfa85256256221491ec
parent 8405674609558cb2c5598eb201f5d29df83d7e66
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Mon, 21 Feb 2022 18:17:13 +0100

solstice: update solstice_build.sh

Build routines do not create files but print their contents on stdout.

Diffstat:
M
solstice/Makefile
 | 
21
+++++++++++----------
M
solstice/solstice_build.sh
 | 
38
++++++++++++++++----------------------

2 files changed, 27 insertions(+), 32 deletions(-)
diff --git a/solstice/Makefile b/solstice/Makefile
@@ -102,22 +102,24 @@ distclean: clean
 		$(SOLPP_README) \
 		$(SOLSTICE_README) \
 
+solstice_build.sh: ../meso-menu.sh
+	@touch $@
+
 ################################################################################
 # Overview web page
 ################################################################################
-solstice.html: solstice.html.in themis.png solstice_build.sh ../meso-menu.sh Makefile
+solstice.html: solstice.html.in themis.png solstice_build.sh Makefile
 	@echo "Building $@"
-	@sh solstice_build.sh overview $(SOLSTICE_VERSION)
+	@sh solstice_build.sh overview $(SOLSTICE_VERSION) > $@
 
 ################################################################################
 # Downloads web page
 ################################################################################
 solstice-downloads.html: $(SOLSTICE_SIG) \
 		solstice-release-notes.html.in \
-		solstice_build.sh \
-		../meso-menu.sh
+		solstice_build.sh
 	@echo "Building $@"
-	@sh solstice_build.sh downloads
+	@sh solstice_build.sh downloads > $@
 
 solstice-release-notes.html.in: $(SOLSTICE_README)
 	@$(MARKDOWN) $(SOLSTICE_README) \
@@ -134,10 +136,9 @@ solstice-resources.html: $(SOLPP_SIG) \
 		solstice-abg.html.in \
 		solstice-pp.html.in \
 		solstice-pp-release-notes.html.in \
-		solstice_build.sh \
-		../meso-menu.sh
+		solstice_build.sh
 	@echo "Building $@"
-	@sh solstice_build.sh resources $(SOLPP_VERSION)
+	@sh solstice_build.sh resources $(SOLPP_VERSION) > $@
 
 solstice-pp-release-notes.html.in: $(SOLPP_README)
 	@$(MARKDOWN) $(SOLPP_README) \
@@ -151,8 +152,8 @@ $(SOLPP_README):
 ################################################################################
 # Check files
 ################################################################################
-check: build .chk .sig .man
-	@$(MAKE) -fMakefile -f .chk -f .sig -f .man check_all
+check: build .chk .sig
+	@$(MAKE) -fMakefile -f .chk -f .sig check_all
 
 check_all: check_shells $(HTML:=.chk)
 
diff --git a/solstice/solstice_build.sh b/solstice/solstice_build.sh
@@ -25,23 +25,19 @@ overview()
     exit 1
   fi
 
-  {
-    print_header Solstice Overview
-    VERSION=$1 envsubst < solstice.html.in
-    print_footer
-  } > solstice.html
+  print_header Solstice Overview
+  VERSION=$1 envsubst < solstice.html.in
+  print_footer
 }
 
 # Build the downloads page
 downloads()
 {
-  {
-    print_header Solstice Downloads
-    echo "<header><h1>Download Solstice</h1></header>"
-    print_downloads Solstice
-    cat solstice-release-notes.html.in
-    print_footer
-  } > solstice-downloads.html
+  print_header Solstice Downloads
+  echo "<header><h1>Download Solstice</h1></header>"
+  print_downloads Solstice
+  cat solstice-release-notes.html.in
+  print_footer
 }
 
 print_pp_downloads()
@@ -78,16 +74,14 @@ resources()
     exit 1
   fi
 
-  {
-    print_header Solstice Resources
-    echo "<header><h1>Additional resources</h1></header>"
-    cat solstice-abg.html.in
-    VERSION=$1 envsubst < solstice-pp.html.in
-    echo "<h3>Download Post-Processes</h3>"
-    print_pp_downloads
-    cat solstice-pp-release-notes.html.in
-    print_footer
-  } > solstice-resources.html
+  print_header Solstice Resources
+  echo "<header><h1>Additional resources</h1></header>"
+  cat solstice-abg.html.in
+  VERSION=$1 envsubst < solstice-pp.html.in
+  echo "<h3>Download Post-Processes</h3>"
+  print_pp_downloads
+  cat solstice-pp-release-notes.html.in
+  print_footer
 }
 
 "$@"