commit afdf8f1692c9cf1c680492eea0911ce1e001063c
parent e10289d230aa0cc241269c3ded6d0e71c7f0f18e
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Mon, 12 Jul 2021 15:33:06 +0200
Publish htrdr 0.7 and the Atmosphere Starter Pack 0.6.1
Diffstat:
9 files changed, 88 insertions(+), 39 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,8 @@ legal-fr.html
htrdr.html
htrdr-docs.html
starter-pack.html
+htrdr-atmosphere-spk.html
+htrdr-combustion-spk.html
pgp_signatures.html
solstice.html
solstice-downloads.html
diff --git a/build_htaccess.sh b/build_htaccess.sh
@@ -21,8 +21,23 @@ if [ $# -lt 1 ]; then
fi
redirections=(
+ "index.html misc/about-fr.html"
"high_tune/high-tune.html htrdr/htrdr.html"
- "high_tune/starter-pack.html htrdr/starter-pack.html"
+ "high_tune/starter-pack.html htrdr/htrdr-atmosphere-spk.html"
+ "high_tune/downloads/gas_opt_prop_en.pdf htrdr/downloads/gas_opt_prop_en.pdf"
+ "high_tune/downloads/High-Tune-Starter-Pack-0.1.1.tar.gz htrdr/downloads/High-Tune-Starter-Pack-0.1.1.tar.gz"
+ "high_tune/downloads/High-Tune-Starter-Pack-0.1.1.tar.gz.sig htrdr/downloads/High-Tune-Starter-Pack-0.1.1.tar.gz.sig"
+ "high_tune/downloads/High-Tune-Starter-Pack-0.2.0.tar.gz htrdr/downloads/High-Tune-Starter-Pack-0.2.0.tar.gz"
+ "high_tune/downloads/High-Tune-Starter-Pack-0.2.0.tar.gz.sig htrdr/downloads/High-Tune-Starter-Pack-0.2.0.tar.gz.sig"
+ "high_tune/downloads/High-Tune-Starter-Pack-0.3.0.tar.gz htrdr/downloads/High-Tune-Starter-Pack-0.3.0.tar.gz"
+ "high_tune/downloads/High-Tune-Starter-Pack-0.3.0.tar.gz.sig htrdr/downloads/High-Tune-Starter-Pack-0.3.0.tar.gz.sig"
+ "high_tune/downloads/High-Tune-Starter-Pack-0.4.0.tar.gz htrdr/downloads/High-Tune-Starter-Pack-0.4.0.tar.gz"
+ "high_tune/downloads/High-Tune-Starter-Pack-0.4.0.tar.gz.sig htrdr/downloads/High-Tune-Starter-Pack-0.4.0.tar.gz.sig"
+ "high_tune/downloads/High-Tune-Starter-Pack-0.5.0.tar.gz htrdr/downloads/High-Tune-Starter-Pack-0.5.0.tar.gz"
+ "high_tune/downloads/High-Tune-Starter-Pack-0.5.0.tar.gz.sig htrdr/downloads/High-Tune-Starter-Pack-0.5.0.tar.gz.sig"
+ "high_tune/downloads/High-Tune-Starter-Pack-0.6.0.tar.gz htrdr/downloads/High-Tune-Starter-Pack-0.6.0.tar.gz"
+ "high_tune/downloads/High-Tune-Starter-Pack-0.6.0.tar.gz.sig htrdr/downloads/High-Tune-Starter-Pack-0.6.0.tar.gz.sig"
+ "high_tune/downloads/HRES_ARMCu.mp4 htrdr/downloads/HRES_ARMCu.mp4"
"high_tune/man/man1/htpp.1.html htrdr/man/man1/htpp.1.html"
"high_tune/man/man1/htrdr.1.html htrdr/man/man1/htrdr.1.html"
"high_tune/man/man1/htrdr-atmosphere.1.html htrdr/man/man1/htrdr-atmosphere.1.html"
@@ -37,7 +52,6 @@ redirections=(
"high_tune/man/man5/htrdr-obj.5.html htrdr/man/man5/htrdr-obj.5.html"
"high_tune/man/man5/mrumtl.5.html htrdr/man/man5/mrumtl.5.html"
"high_tune/man/man5/sth.5.html htrdr/man/man5/sth.5.html"
- "index.html misc/about-fr.html"
)
REMOTE_DIR=$1
diff --git a/htrdr/Makefile b/htrdr/Makefile
@@ -14,7 +14,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
HTRDR-VERSION=0.7.0
-HTRDR-STARTER-PACK-VERSION=0.6.0
+HTRDR-ATMOSPHERE-STARTER-PACK-VERSION=0.6.1
SRC = htrdr.html.in htrdr-docs.html.in htrdr.sh
IMG = \
@@ -33,7 +33,7 @@ IMG = \
default: all
all: ${SRC}
- @bash htrdr.sh ${HTRDR-VERSION} ${HTRDR-STARTER-PACK-VERSION}
+ @bash htrdr.sh ${HTRDR-VERSION} ${HTRDR-ATMOSPHERE-STARTER-PACK-VERSION}
publish:
rsync -avzr htrdr.html starter-pack.html ${IMG} downloads man ${REMOTE}/htrdr/
diff --git a/htrdr/downloads/htrdr-Atmosphere-Starter-Pack-0.6.1.tar.gz b/htrdr/downloads/htrdr-Atmosphere-Starter-Pack-0.6.1.tar.gz
@@ -0,0 +1 @@
+#$# git-wad e0211cab9de4611213bcd6807bb0dbd1e7a6a57bb37b20281b1021b27896c177 1801729478
+\ No newline at end of file
diff --git a/htrdr/htrdr-combustion-spk.html.in b/htrdr/htrdr-combustion-spk.html.in
@@ -0,0 +1,7 @@
+<header>
+ <h1>
+ Combustion Starter Pack
+ </h1>
+</header>
+
+<p>Under construction</p>
diff --git a/htrdr/htrdr-docs.html.in b/htrdr/htrdr-docs.html.in
@@ -15,7 +15,7 @@
<li><a href=man/man1/htrdr-combustion.1.html>htrdr-combustion</a></li>
</ul>
- <h3>Additionnal tools</h3>
+ <h3>Additional tools</h3>
<ul>
<li><a href=man/man1/htpp.1.html>htpp</a></li>
<li><a href=man/man1/les2htcp.1.html>les2htcp</a></li>
diff --git a/htrdr/htrdr.html.in b/htrdr/htrdr.html.in
@@ -10,7 +10,7 @@ function poptext(Id) {
<header>
<h1><code style="color: #000000">htrdr</code>
<span class=subtitle>
- the Monte-Carlo radiative transfert simulator
+ The Monte-Carlo radiative transfert simulator
</span>
</h1>
</header>
@@ -299,7 +299,7 @@ current shell.</p>
<pre class="code">
~ $ source ~/htrdr-${VERSION}/local/etc/htrdr.profile
-~ $ htrdr -h
+~ $ htrdr --help
</pre>
<p>If the AsciiDoc tool suite was installed on <code>make</code>
diff --git a/htrdr/htrdr.sh b/htrdr/htrdr.sh
@@ -20,7 +20,7 @@ set -e
source ../meso-menu.sh
if [ $# -lt 2 ]; then
- echo "Usage: $0 VERSION VERSION_PACK"
+ echo "Usage: $0 VERSION VERSION_ATMSPK"
exit 1
fi
@@ -36,7 +36,8 @@ dir_temp=$(mktemp -d) # Working directory
# Sign the package
################################################################################
tput bold; echo ">>> htrdr packages"; tput sgr0
-archs=$(find "./downloads" -regex "^.*/High-Tune-.*[0-9]+\.[0-9]+\.[0-9]+.*tar.gz")
+archs=$(find "./downloads" -regex "^.*/High-Tune-.*[0-9]+\.[0-9]+\.[0-9]+.*tar.gz" \
+ -o -regex "^.*/htrdr-.*[0-9]+\.[0-9]+\.[0-9]+.*tar.gz")
sign_something=0
for arch in $archs; do
@@ -60,8 +61,8 @@ cd $dir_temp
arch=htrdr-$1-GNU-Linux64
cp "$dir_curr/downloads/$arch.tar.gz" .
tar xzf $arch.tar.gz
-#htspk=High-Tune-Starter-Pack-$2
-#tar xzf $dir_curr/downloads/$htspk.tar.gz $htspk/README.md
+htrdr_atmspk=htrdr-Atmosphere-Starter-Pack-$2
+tar xzf $dir_curr/downloads/$htrdr_atmspk.tar.gz $htrdr_atmspk/README.md
cd $dir_curr
################################################################################
@@ -114,47 +115,52 @@ echo "Write htrdr-docs.html"
################################################################################
# Generate the starter pack
################################################################################
-echo "Write starter-pack.html"
+echo "Write htrdr-atmosphere-spk.html"
-$markdown $dir_temp/$htspk/README.md \
+$markdown $dir_temp/$htrdr_atmspk/README.md \
| sed 's/https:\/\/gitlab.com\/meso-star\/htgop.git/downloads\/gas_opt_prop_en.pdf/g' \
+ | sed 's/https:\/\/www.meso-star.com\/projects\/htrdr\/man\//man\//g' \
+ | sed 's/https:\/\/www.meso-star.com\/projects\/htrdr\/downloads\/gas_opt_prop_en.pdf/downloads\/gas_opt_prop_en.pdf/g' \
| sed 's/https:\/\/gitlab.com\/meso-star\/htcp.git/man\/man5\/htcp.5.html/g' \
| sed 's/https:\/\/gitlab.com\/meso-star\/htmie.git/man\/man5\/htmie.5.html/g' \
| sed 's/https:\/\/gitlab.com\/meso-star\/htpp.git/man\/man1\/htpp.1.html/g' \
| sed 's/https:\/\/gitlab.com\/meso-star\/htrdr.git/man\/man1\/htrdr.1.html/g' \
- > $dir_temp/$htspk/README.html
+ > $dir_temp/$htrdr_atmspk/README.html
-intro=$(cat $dir_temp/$htspk/README.html \
+intro=$(cat $dir_temp/$htrdr_atmspk/README.html \
| sed 1d \
| sed '/^<h2>Content<\/h2>/,$d')
-content=$(cat $dir_temp/$htspk/README.html \
+content=$(cat $dir_temp/$htrdr_atmspk/README.html \
| sed '/^<h2>Content<\/h2>/,$!d' \
| sed 1d \
| sed '/^<h2>Quick start<\/h2>/,$d')
-release_notes=$(cat $dir_temp/$htspk/README.html \
+release_notes=$(cat $dir_temp/$htrdr_atmspk/README.html \
| sed '/^<h2>Release notes<\/h2>/,$!d' \
| sed 1d \
| sed 's/ gemetry / geometry /' \
| sed '/^<h2>Copyright notice<\/h2>/,$d')
-copying=$(cat $dir_temp/$htspk/README.html \
+copying=$(cat $dir_temp/$htrdr_atmspk/README.html \
| sed '/^<h2>Copyright notice<\/h2>/,$!d' \
| sed 's/from/from the/' \
| sed 's/opyright (C)/opyright \©/g')
+archs=$(find downloads -regex ".*/htrdr-Atmosphere-Starter-Pack.*\.tar.gz" | sort -r )
+archs+=" $(find downloads -regex ".*/High-Tune-Starter-Pack.*\.tar.gz" | sort -r )"
+
{
- print_header htrdr Starter-Pack
+ print_header htrdr Atmosphere-Starter-Pack
echo "<header>"
- echo " <h1>High-Tune: Starter Pack</h1>"
+ echo " <h1>Atmosphere Starter Pack</h1>"
echo "</header>"
echo "<div class="news">"
- echo " <p><b>High-Tune: Starter Pack $2</b></p>"
+ echo " <p><b>Atmosphere Starter Pack $2</b></p>"
echo " <ul>"
- echo " <li><a href=\"downloads/High-Tune-Starter-Pack-$2.tar.gz\">tarball</a> /"
- echo " <a href=\"downloads/High-Tune-Starter-Pack-$2.tar.gz.sig\">pgp</a></li>"
+ echo " <li><a href=\"downloads/htrdr-Atmosphere-Starter-Pack-$2.tar.gz\">tarball</a> /"
+ echo " <a href=\"downloads/htrdr-Atmosphere-Starter-Pack-$2.tar.gz.sig\">pgp</a></li>"
echo " </ul>"
echo "</div>"
@@ -169,7 +175,7 @@ copying=$(cat $dir_temp/$htspk/README.html \
echo " <a href=\"city.jpg\"><img src=\"city.jpg\" alt=\"city\"></a>"
echo " <div class=\"caption\">"
echo " Images of the DZVAR, DZVAR2, L12km_BOMEX, L25_Fire and city scenes"
- echo " rendered with <code>htrdr</code>."
+ echo " rendered with <code>htrdr-atmosphere</code>."
echo " </div>"
echo "</div>"
@@ -177,17 +183,18 @@ copying=$(cat $dir_temp/$htspk/README.html \
echo "<h2>Install and run</h2>"
echo ""
- echo "<p>Download the High-Tune: Starter-Pack archive and verify its integrity"
- echo "against its <a href=\"../misc/pgp_signatures.html\">PGP signature</a>. Then"
- echo "extract it. Assuming that <code>htrdr</code> is installed and registered in the"
- echo "current shell, one can invoke a <code>htrdr</code> rendering as bellow:"
+ echo "<p>Download the Atmosphere Starter-Pack archive and verify"
+ echo "its integrity against its <a href=\"../misc/pgp_signatures.html\">PGP"
+ echo "signature</a>. Then extract it. Assuming that <code>htrdr-atmosphere</code> is"
+ echo "installed and registered in the current shell, one can invoke a"
+ echo "<code>htrdr-atmosphere</code> rendering as bellow:"
echo ""
echo "<pre class=\"code\">"
- echo "$ cd ~/High-Tune-Starter-Pack-$2"
- echo "~/High-Tune-Starter-Pack-$2 $ bash ht-run.sh scenes/DZVAR2"
+ echo "$ cd ~/htrdr-Atmosphere-Starter-Pack-$2"
+ echo "~/htrdr-Atmosphere-Starter-Pack-$2 $ bash ht-run.sh scenes/DZVAR2"
echo "</pre>"
echo ""
- echo "<p>With <code>~/High-Tune-Starter-Pack-$2</code> the directory"
+ echo "<p>With <code>~/htrdr-Atmosphere-Starter-Pack-$2</code> the directory"
echo "where the Starter Pack is installed. The resulting image"
echo "<code>DZVAR2_1280x720x256.txt</code> is stored in the <a"
echo "href=\"man/man5/htrdr-image.5.html\">htrdr-image</a> file format. Use the <a"
@@ -195,19 +202,18 @@ copying=$(cat $dir_temp/$htspk/README.html \
echo "file that can be then displayed with a regular image viewer."
echo ""
echo "<pre class=\"code\">"
- echo "~/High-Tune-Starter-Pack-$2 $ htpp -o DZVAR2.ppm DZVAR2_1280x720x256.txt"
+ echo "~/htrdr-Atmosphere-Starter-Pack-$2 $ htpp -o DZVAR2.ppm DZVAR2_1280x720x256.txt"
echo "</pre>"
echo "<h2>Donwloads</h2>"
- archs=$(find downloads -regex ".*/High-Tune-Starter-Pack.*\.tar.gz" | sort -r )
echo "<table>"
echo " <tr>"
echo " <th>Version</th>"
echo " <th>Archive</th>"
echo " </tr>"
for i in $archs; do
- version=$(echo $i | sed "s/.*High-Tune-Starter-Pack-\(.*\)\.tar.gz/\1/g")
+ version=$(echo $i | sed "s/.*Starter-Pack-\(.*\)\.tar.gz/\1/g")
echo " <tr>"
echo " <td>${version}</td>"
echo " <td>"
@@ -225,7 +231,18 @@ copying=$(cat $dir_temp/$htspk/README.html \
print_footer
-} > starter-pack.html
+} > htrdr-atmosphere-spk.html
+
+################################################################################
+# Generate the reference documentation
+################################################################################
+echo "Write htrdr-combustion-spk.html"
+
+{
+ print_header htrdr Combustion-Starter-Pack
+ cat htrdr-combustion-spk.html.in
+ print_footer
+} > htrdr-combustion-spk.html
################################################################################
# Generate the reference documentation
diff --git a/meso-menu.sh b/meso-menu.sh
@@ -147,12 +147,19 @@ print_htrdr_sub_menu() {
else
echo " <li><a href=${root}htrdr/htrdr-docs.html>Reference documentation</a></li>"
fi
- echo ' </ul></li>'
- if [ "$name" == "Starter-Pack" ]; then
- echo " <li id=cur>Starter Pack</li>"
+ echo " <li>Starter Pack</li>"
+ echo " <li><ul class=lvl2>"
+ if [ "$name" == "Atmosphere-Starter-Pack" ]; then
+ echo " <li id=cur>Atmosphere</li>"
+ else
+ echo " <li><a href=${root}htrdr/htrdr-atmosphere-spk.html>Atmosphere</a></li>"
+ fi
+ if [ "$name" == "Combustion-Starter-Pack" ]; then
+ echo " <li id=cur>Combustion</li>"
else
- echo " <li><a href=${root}htrdr/starter-pack.html>Starter Pack</a></li>"
+ echo " <li><a href=${root}htrdr/htrdr-combustion-spk.html>Combustion</a></li>"
fi
+ echo " </ul></li>"
echo " <li><a href=https://gitlab.com/meso-star/htrdr>Git repository</a></li>"
echo ' </ul>'
echo ' <div id="info">'
