commit 0b4a1032c08706fe1aa9aac8ae86d5cb754d1678
parent 963cf52e8e45db4a938a1273311e5e90afca50ea
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Tue, 28 Apr 2020 15:52:31 +0200
Publish Schiff 0.4 and upd the schiff page
Diffstat:
6 files changed, 46 insertions(+), 15 deletions(-)
diff --git a/meso-menu.sh b/meso-menu.sh
@@ -211,12 +211,6 @@ print_schiff_sub_menu() {
echo ' <ul>'
echo " <li><a href=https://gitlab.com/meso-star/schiff>Source code repository</a></li>"
echo ' </ul>'
- echo ' <div id="info">'
- echo ' <p>Schiff is developped by <a'
- echo ' href="https://www.meso-star.com">|Méso|Star></a> for the'
- echo ' National Center for Scientific Research (CNRS). Copyright ©'
- echo ' 2016-2017 <a href="http://www.cnrs.fr/index.php">CNRS</a>.</p>'
- echo ' </div>'
echo ' </div>'
}
diff --git a/schiff/Makefile b/schiff/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 |Meso|Star>
+# Copyright (C) 2019, 2020 |Meso|Star> (contact@meso-star.com)
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -13,7 +13,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-SCHIFF-VERSION=0.3.1
+SCHIFF-VERSION=0.4.0
SCHIFF-SCRIPTS=~/code/meso-star/schiff-scripts/src/
SRC = schiff.html.in schiff.sh
diff --git a/schiff/downloads/Schiff-0.4.0-GNU-Linux64.tar.gz b/schiff/downloads/Schiff-0.4.0-GNU-Linux64.tar.gz
@@ -0,0 +1 @@
+#$# git-wad 80a29e72c13d5c62051ccd8b1ef45a32379432aeae8c1b56fdf5184be1875059 25594017
+\ No newline at end of file
diff --git a/schiff/downloads/Schiff-0.4.0-Source.tar.gz b/schiff/downloads/Schiff-0.4.0-Source.tar.gz
@@ -0,0 +1 @@
+#$# git-wad 998ec137adba4367690553b8b56cd9c9e4bcbc6de425317c329868f8a41da059 411138
+\ No newline at end of file
diff --git a/schiff/schiff.html.in b/schiff/schiff.html.in
@@ -13,8 +13,8 @@
<a href="downloads/Schiff-${VERSION}-GNU-Linux64.tar.gz">tarball</a> /
<a href="downloads/Schiff-${VERSION}-GNU-Linux64.tar.gz.sig">pgp</a></li>
<li>Sources:
- <a href="downloads/Schiff-${VERSION}-Sources.tar.gz">tarball</a> /
- <a href="downloads/Schiff-${VERSION}-Sources.tar.gz.sig">pgp</a></li>
+ <a href="downloads/Schiff-${VERSION}-Source.tar.gz">tarball</a> /
+ <a href="downloads/Schiff-${VERSION}-Source.tar.gz.sig">pgp</a></li>
</ul>
</div>
@@ -131,10 +131,14 @@ and <code>invcumul_<WLEN>.txt</code> that store for the wavelength
<code><WLEN></code>, the value of its associated phase function as well
as its cumulative and its inverse cumulative, respectively.</p>
+${RELEASE_NOTES}
+
<h2>License</h2>
-<p>Schiff is free software release under the GPLv3+ license: GNU GPL version 3
-or later. You can freely study, modify or extend it. You are also welcome to
-redistribute it under certain conditions; refer to the <a
+<p>Copyright © 2020 <a href="mailto:contact@meso-star.com">
+|Méso|Star></a>. Copyright © 2015, 2016 National Center for
+Scientific Research (CNRS). Schiff is free software released under the GPLv3+
+license: GNU GPL version 3 or later. You are welcome to redistribute it under
+certain conditions; refer to the <a
href="https://www.gnu.org/licenses/gpl.html">license</a> for details.</p>
diff --git a/schiff/schiff.sh b/schiff/schiff.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (C) 2017-2019 |Meso|Star>
+# Copyright (C) 2017-2020 |Meso|Star>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -32,6 +32,17 @@ fi
dir_curr=$(pwd) # Current directory
dir_temp=$(mktemp -d) # Working directory
+set +e
+if hash markdown 2> /dev/null; then
+ markdown=markdown
+elif hash markdown2 2> /dev/null; then
+ markdown=markdown2
+else
+ echo "Cannot find the markdown[2] command"
+ exit 1
+fi
+set -e
+
################################################################################
# Sign the package
################################################################################
@@ -54,6 +65,24 @@ fi
echo ""
################################################################################
+# Extract the current archive
+################################################################################
+cd $dir_temp
+arch=Schiff-$1-GNU-Linux64
+cp "$dir_curr/downloads/$arch.tar.gz" .
+tar xzf $arch.tar.gz
+cd $dir_curr
+
+################################################################################
+# Generate the release note
+################################################################################
+cd $dir_temp
+release_notes=$($markdown $arch/share/doc/schiff/README.md \
+ | sed '/^<h2>Release notes<\/h2>/,$!d' \
+ | sed '/^<h2>License<\/h2>/,$d')
+cd $dir_curr
+
+################################################################################
# Copy the post-process script
################################################################################
tput bold; echo ">>> Schiff Post-Processes"; tput sgr0
@@ -80,7 +109,7 @@ tput bold; echo ">>> Schiff web pages"; tput sgr0
echo "Write schiff.html"
{
print_header Schiff Overview
- VERSION=$1 envsubst < schiff.html.in;
+ VERSION=$1 RELEASE_NOTES="$release_notes" envsubst < schiff.html.in;
print_footer
} > schiff.html
