meso-web

commit 1831b351039ff4d0c8fde93fbd9b1c7a43ec0f72
parent 4845435490dd70da80618fb535d3c9c32945ea0e
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Tue, 20 May 2025 15:53:33 +0200

htrdr: release the htrdr-planets Starter-Pack

Diffstat:
M
htrdr/.gitignore
 | 
2
+-
M
htrdr/Makefile
 | 
33
++++++++++-----------------------
M
meso-menu.sh
 | 
12
++++++------

3 files changed, 17 insertions(+), 30 deletions(-)
diff --git a/htrdr/.gitignore b/htrdr/.gitignore
@@ -3,7 +3,7 @@ htrdr-docs.html
 htrdr-mods.html
 htrdr-atmosphere-spk.html
 htrdr-combustion-spk.html
-htrdr-planeto-spk.html
+htrdr-planets-spk.html
 htrdr-*-GNU-Linux64/
 htrdr_*_doc/
 htrdr-*-Starter-Pack-*/
diff --git a/htrdr/Makefile b/htrdr/Makefile
@@ -50,16 +50,9 @@ PLANETSSPK_VERSION=0.1.0
 PLANETSSPK_DIR=htrdr-Planets-Starter-Pack-$(PLANETSSPK_VERSION)
 PLANETSSPK_ARCH=downloads/$(PLANETSSPK_DIR).tar.gz
 PLANETSSPK_README=$(PLANETSSPK_DIR)/README.md.in
-#PLANETSSPK_PKG=\
-# downloads/htrdr-Planets-Starter-Pack-0.0.0.tar.gz
-#PLANETSSPK_SIG=$(PLANETSSPK_PKG:=.sig)
-
-# Make the planets starter-pack private. The prefix is actually the sha256
-# digest of the public archive
-PLANETSSPK_PRIV_PREFIX=98190c985935c7677a43f15724e3212d100eb58da4afaa5efc87a0ffdfe2127a
-PLANETSSPK_PRIV_HTML=$(PLANETSSPK_PRIV_PREFIX).html
-PLANETSSPK_PRIV_ARCH=downloads/$(PLANETSSPK_PRIV_PREFIX).tar.gz
-PLANETSSPK_PRIV_SIG=$(PLANETSSPK_PRIV_ARCH:=.sig)
+PLANETSSPK_PKG=\
+ downloads/htrdr-Planets-Starter-Pack-0.1.0.tar.gz
+PLANETSSPK_SIG=$(PLANETSSPK_PKG:=.sig)
 
 MAN=\
  $(HTRDR_DIR)/share/man/man1/htpp.1\
@@ -127,7 +120,7 @@ HTML=\
  htrdr.html\
  htrdr-atmosphere-spk.html\
  htrdr-combustion-spk.html\
- $(PLANETSSPK_PRIV_HTML)\
+ htrdr-planets-spk.html\
  htrdr-docs.html\
  htrdr-mods.html
 
@@ -150,8 +143,6 @@ distclean: clean
 		$(COMSPK_README)\
 		$(PLANETSSPK_SIG)\
 		$(PLANETSSPK_README)\
-		$(PLANETSSPK_PRIV_ARCH)\
-		$(PLANETSSPK_PRIV_SIG)\
 		$(HTRDR_README)\
 		$(MAN)
 
@@ -165,8 +156,8 @@ install: build
 		$(ATMSPK_SIG)\
 		$(COMSPK_PKG)\
 		$(COMSPK_SIG)\
-		$(PLANETSSPK_PRIV_ARCH)\
-		$(PLANETSSPK_PRIV_SIG)\
+		$(PLANETSSPK_PKG)\
+		$(PLANETSSPK_SIG)\
 		$(PREFIX)/htrdr/
 
 htrdr_build.sh: ../meso-menu.sh
@@ -228,18 +219,14 @@ $(COMSPK_README):
 ################################################################################
 # Planets Starter-Pack
 ################################################################################
-$(PLANETSSPK_PRIV_HTML):\
+htrdr-planets-spk.html:\
 		$(PLANETSSPK_IMG) \
-		$(PLANETSSPK_PRIV_SIG) \
+		$(PLANETSSPK_SIG) \
 		$(PLANETSSPK_README) \
 		htrdr_build.sh
 	@echo "Building $@"
 	@$(SHELL) htrdr_build.sh planetsspk $(PLANETSSPK_README) $(PLANETSSPK_VERSION) \
-			 $(PLANETSSPK_PRIV_ARCH) > $@
-
-$(PLANETSSPK_PRIV_ARCH): $(PLANETSSPK_ARCH)
-	@echo "Make $(PLANETSSPK_ARCH) private (copy to $(PLANETSSPK_PRIV_ARCH))"
-	@cp $(PLANETSSPK_ARCH) $(PLANETSSPK_PRIV_ARCH)
+	  $(PLANETSSPK_ARCH) > $@
 
 $(PLANETSSPK_README):
 	@echo "Extracting data from $(PLANETSSPK_ARCH)"
@@ -269,7 +256,7 @@ lint_shells:
 .sig: Makefile  ../configure_targets.sh
 	@echo "Setup .sig"
 	@$(SHELL) ../configure_targets.sh sig \
-		$(ATMSPK_PKG) $(COMSPK_PKG) $(PLANETSSPK_PRIV_ARCH) > .sig
+		$(ATMSPK_PKG) $(COMSPK_PKG) $(PLANETSSPK_PKG) > .sig
 
 .lint: Makefile ../configure_targets.sh
 	@echo "Setup .lint"
diff --git a/meso-menu.sh b/meso-menu.sh
@@ -165,12 +165,12 @@ print_htrdr_sub_menu()
   else
     echo "  <a href=\"${root}htrdr/htrdr-combustion-spk.html\">Combustion</a>"
   fi
-  #echo "  &emsp13;.&emsp13;"
-  #if [ "${name}" = "Planeto-Starter-Pack" ]; then
-  #  echo "  <span class=\"cur\">Planeto</span>"
-  #else
-  #  echo "  <a href=\"${root}htrdr/98190c985935c7677a43f15724e3212d100eb58da4afaa5efc87a0ffdfe2127a.html\">Planeto</a>"
-  #fi
+  echo "  &emsp13;.&emsp13;"
+  if [ "${name}" = "Planets-Starter-Pack" ]; then
+    echo "  <span class=\"cur\">Planets</span>"
+  else
+    echo "  <a href=\"${root}htrdr/htrdr-planets-spk.html\">Planets</a>"
+  fi
   echo "  &emsp13;.&emsp13;"
   echo "  <a href=\"https://gitlab.com/meso-star/htrdr\">Git</a>"
   echo "</div>"