commit 2772e92c0503e0dcc08e48c48af2a112c5090941
parent e1a45f19de7afdb3920cf932b29dfb79fd82d17f
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Tue, 3 Oct 2017 18:28:44 +0200
Updates the Bash script and fix some typos
Diffstat:
3 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
@@ -27,9 +27,6 @@ all: solstice
.PHONY: solstice
solstice:
- @tput bold
- @echo -e ">>> Generate Solstice web pages. Version: '$(SOLSTICE-VERSION)'"
- @tput sgr0
@sh ./solstice.sh $(SOLSTICE-VERSION) $(SOLSTICE-ABG) $(SOLSTICE-PP)
.PHONY: clean
diff --git a/solstice-resources.html.in b/solstice-resources.html.in
@@ -46,7 +46,7 @@ sources and a GNU/Makefile to simplify the build process on GNU/Linux and on
Windows through <a href="http://www.mingw.org/">MinGW</a>; then, extract it and
run <code>make</code> to build the programs. Note that even though this archive
targets GNU-compliant systems, the provided sources can be compiled by any C
-compiler that conforms to the C89 standard.</p>
+compiler that conforms to the C99 standard.</p>
<pre>
$ wget www.meso-star.com/solstice/downloads/Solstice-PP-Sources.tar.gz
@@ -119,7 +119,7 @@ stores the geometry of the receivers and their simulation results as its
incoming flux or its efficiency. Finally, the third written file is an <a
HREF="http://www.martinreddy.net/gfx/3d/OBJ.spec">OBJ</a> that stores the
meshes of the miscellaneous geometries, i.e. the geometries that are neither
-receivers nor a primary geometries. These files can then be visualised and
+receivers nor primary geometries. These files can then be visualised and
analyse into Paraview.</p>
<p>In the following example, <code>solstice</code> is invoked to simulate two
diff --git a/solstice.sh b/solstice.sh
@@ -58,7 +58,10 @@ set -e
################################################################################
# Generate the Solstice-ABG
################################################################################
-if [ ! -f downloads/Solstice-ABG.pdf ]; then
+tput bold; echo ">>> Solstice Absolute Beginner's Guide"; tput sgr0
+if [ -f downloads/Solstice-ABG.pdf ]; then
+ echo "Nothing to do"
+else
ABG=guide0.6
echo "Generate the Solstice Absolute Beginner's Guide"
cd $2
@@ -76,17 +79,21 @@ if [ ! -f downloads/Solstice-ABG-rsrc.zip ]; then
echo "Archve the resources of the Solstice Absolute Beginner's Guide"
zip -r downloads/Solstice-ABG-rsrc.zip $2/source_files/*
fi
+echo ""
################################################################################
# Generate the Solstice-PP archive
################################################################################
-if [ ! -f downloads/Solstice-PP-Sources.tar.gz ]; then
- echo "Archive the Solstice-PP sources"
+tput bold; echo ">>> Solstice Post-Processes"; tput sgr0
+if [ -f downloads/Solstice-PP-Sources.tar.gz ]; then
+ echo "Nothing to do"
+else
cd $dir_temp
mkdir Solstice-PP-Sources
cd Solstice-PP-Sources
cp $3/sol*.c $3/solpp.h .
+ echo "Generate the Solstice PP Makefile"
{
echo 'PROG = solpp solppraw solpaths'
echo ''
@@ -95,16 +102,23 @@ if [ ! -f downloads/Solstice-PP-Sources.tar.gz ]; then
echo ''
echo '$(PROG): %: %.c solpp.h'
echo -e '\t@echo -e " CC $<"; $(CC) -o $@ -O2 -std=c99 -pedantic -Wall $<'
+ echo ''
+ echo '.PHONY: clean'
+ echo 'clean:'
+ echo -e '\t@rm $(PROG)'
} > Makefile
cd ..
- tar czvf Solstice-PP-Sources.tar.gz Solstice-PP-Sources
+ echo "Archive the Solstice-PP sources"
+ tar czf Solstice-PP-Sources.tar.gz Solstice-PP-Sources
cp Solstice-PP-Sources.tar.gz $dir_curr/downloads/
cd $dir_curr
fi
+echo ""
################################################################################
# Sign the package
################################################################################
+tput bold; echo ">>> Solstice packages"; tput sgr0
archs=$(find downloads -regex "^.*/Solstice-[0-9]+\.[0-9]+\.[0-9]+-.*zip" \
-o -regex "^.*/Solstice-[0-9]+\.[0-9]+\.[0-9]+-.*tar.gz")
for arch in $archs; do
@@ -113,10 +127,12 @@ for arch in $archs; do
gpg -a -o $arch.sig --detach-sign $arch
fi
done
+echo ""
################################################################################
# Generate the HTML code of the solstice release notes
################################################################################
+tput bold; echo ">>> Solstice web pages"; tput sgr0
echo "Generate the release notes"
cd $dir_temp
arch=Solstice-$1-GNU-Linux64
