meso-web

commit 5d7a115a0d8e32e3e8e5438bd19fa2526fea14ae
parent 952c28a6c358d67464d195adf00ab975486f70c5
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Wed, 20 Oct 2021 10:23:38 +0200

Schiff: add a download page

Diffstat:
M
.gitignore
 | 
1
+
M
meso-menu.sh
 | 
11
++++++++++-
M
schiff/Makefile
 | 
2
+-
M
schiff/downloads/Schiff-0.4.2-GNU-Linux64.tar.gz
 | 
4
++--
D
schiff/downloads/Schiff-0.4.2-Source.tar.gz
 | 
2
--
A
schiff/downloads/Schiff-0.4.2-Sources.tar.gz
 | 
2
++
M
schiff/schiff.html.in
 | 
6
++----
M
schiff/schiff.sh
 | 
13
+++++++++++++

8 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@ ppart_lw.html
 ppart_sw.html
 kspectrum.html
 schiff.html
+schiff-downloads.html
 stardis.html
 stardis-downloads.html
 about-en.html
diff --git a/meso-menu.sh b/meso-menu.sh
@@ -203,6 +203,11 @@ print_schiff_sub_menu() {
     fi
   done
   echo '      </ul></li>'
+  if [ "$name" == "Downloads" ]; then
+    echo '      <li id=cur>Downloads</li>'
+  else
+    echo "      <li><a href=${root}schiff/schiff-downloads.html>Downloads</a></li>"
+  fi
   echo "      <li><a href=https://gitlab.com/meso-star/schiff>Git repository</a></li>"
   echo '    </ul>'
   echo '  </div>'
@@ -470,8 +475,12 @@ print_downloads() {
     fi
     if [ -f "downloads/${prefix}-${version}-Sources.zip" ]; then
       dl_files[${#dl_files[@]}]="downloads/${prefix}-${version}-Sources.zip"
-    else
+    elif [ -f "downloads/${prefix}-${version}-Source.zip" ]; then
+      dl_files[${#dl_files[@]}]="downloads/${prefix}-${version}-Source.zip"
+    elif [ -f "downloads/${prefix}-${version}-Sources.tar.gz" ]; then
       dl_files[${#dl_files[@]}]="downloads/${prefix}-${version}-Sources.tar.gz"
+    else 
+      dl_files[${#dl_files[@]}]="downloads/${prefix}-${version}-Source.tar.gz"
     fi
 
     echo "  <tr>"
diff --git a/schiff/Makefile b/schiff/Makefile
@@ -26,7 +26,7 @@ all: ${SRC}
 	@bash schiff.sh ${SCHIFF-VERSION} ${SCHIFF-SCRIPTS}
 
 publish:
-	rsync -avzr schiff.html ${IMG} downloads man ${REMOTE}/schiff/
+	rsync -avzr schiff.html schiff-downloads.html ${IMG} downloads man ${REMOTE}/schiff/
 
 clean:
 	rm -rf schiff.html downloads/*.sig man
diff --git a/schiff/downloads/Schiff-0.4.2-GNU-Linux64.tar.gz b/schiff/downloads/Schiff-0.4.2-GNU-Linux64.tar.gz
@@ -1 +1 @@
-#$# git-wad e1a4850e8f85de9a58551eedb84b89217672d265fb100d815a01a33ca86606b9 23856246
-\ No newline at end of file
+#$# git-wad 9af4f4e0f6885272463aeea0e75c6f29897f168d7d4564b71e5759a482b18a7f 23856239
+\ No newline at end of file
diff --git a/schiff/downloads/Schiff-0.4.2-Source.tar.gz b/schiff/downloads/Schiff-0.4.2-Source.tar.gz
@@ -1 +0,0 @@
-#$# git-wad b17062fccbfe7a707637d2835a2b9c701dd34a3ea0c09af8a63ccfeb8b214d3d 435758
-\ No newline at end of file
diff --git a/schiff/downloads/Schiff-0.4.2-Sources.tar.gz b/schiff/downloads/Schiff-0.4.2-Sources.tar.gz
@@ -0,0 +1 @@
+#$# git-wad d6a5e33282456a935daf629a986057241397bb76c73ea95799ea5542353466ed 435773
+\ 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}-Source.tar.gz">tarball</a> /
-        <a href="downloads/Schiff-${VERSION}-Source.tar.gz.sig">pgp</a></li>
+        <a href="downloads/Schiff-${VERSION}-Sources.tar.gz">tarball</a> /
+        <a href="downloads/Schiff-${VERSION}-Sources.tar.gz.sig">pgp</a></li>
   </ul>
 </div>
 
@@ -183,8 +183,6 @@ and <code>invcumul_&lt;WLEN&gt;.txt</code> that store for the wavelength
 <code>&lt;WLEN&gt;</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>Copyright &#169; 2020, 2021 <a href="mailto:contact@meso-star.com">
diff --git a/schiff/schiff.sh b/schiff/schiff.sh
@@ -102,6 +102,19 @@ echo "Write schiff.html"
   print_footer
 } > schiff.html
 
+# Generate the Downloads page
+################################################################################
+echo "Write schiff-downloads.html"
+{
+  print_header Schiff Downloads;
+  echo '<header><h1>Download Schiff</h1></header>';
+
+  print_downloads Schiff "Linux";
+  echo $release_notes
+  print_footer;
+} > schiff-downloads.html;
+
+
 ################################################################################
 # Generate the reference documentation
 ################################################################################