distribute.sh: Show correct version when building without VisiCutBuilder

Before, when building with distribute.sh without VisiCutBuilder, the window title showed a fixed fallback string for the version, and the splash screen always showed "1.7".

Now, when building without VisiCutBuilder, the right version (determined from $VERSION or from git) is shown in the splash screen, and the window title simply doesn't show the version.

Nothing has changed when building *with* VisiCutBuilder, which writes the version into VisicutApp.properties.

Author: mgmax

.gitignore

@@ -13,6 +13,7 @@
 /distribute/visicut/
 /distribute/VisiCut.app/
 /settings/
+/src/main/resources/de/thomas_oster/visicut/gui/resources/splash.png
 /*-pak
 # Temporary files:
 /distribute/wintmp/

Makefile

@@ -12,6 +12,7 @@ help:
 	make run: compile and run \n\
 	make clean: remove all compiled files\n\
 	"
+# Note: If you override the splash screen version with $VERSION, you must run 'make clean' because 'make' doesn't understand the dependency on environment variables.
 src/main/resources/de/thomas_oster/visicut/gui/resources/splash.png: splashsource.svg src/main/resources/de/thomas_oster/visicut/gui/resources/VisicutApp.properties
 	./generatesplash.sh
 jar: src/main/resources/de/thomas_oster/visicut/gui/resources/splash.png libLaserCut
@@ -24,6 +25,7 @@ libLaserCut:
 	cd LibLaserCut && mvn install
 	cd ..
 clean:
+	rm -f src/main/resources/de/thomas_oster/visicut/gui/resources/splash.png
 	mvn clean
 install:
 	mkdir -p $(DESTDIR)$(PREFIX)/share/visicut

distribute/distribute.sh

@@ -10,16 +10,20 @@ else
    COMPILE=1
 fi
 echo "Determining Version (may be overriden with environment variable VERSION):"
+# VisiCutBuilder writes the setting in that file:
 VERSION=${VERSION:-$(cat ../src/main/resources/de/thomas_oster/visicut/gui/resources/VisicutApp.properties |grep Application.version)}
+# remove "Application.version =   " prefix which comes from the VisiCutApp.properties file
 VERSION=${VERSION#*=}
 VERSION=${VERSION// /}
+# normally running ./distribute.sh doesn't write the above file. Then, fall back to what git describe tells us
+VERSION=${VERSION:-$(git describe --tags)+devel}
 echo "Version is: \"$VERSION\""
 if [ "$COMPILE" == 1 ]
 then
 	echo "Building jar..."
 	cd ..
 	make clean > /dev/null
-	make > /dev/null || exit 1
+	VERSION="$VERSION" make > /dev/null || { echo "Compilation failed. Please run 'make' to see what failed."; exit 1; }
 	cd distribute
 fi
 
@@ -57,14 +61,13 @@ WINDOWS_JRE_SHA256=${WINDOWS_JRE_SHA256:-"be88c679fd24194bee71237f92f7a2a71c88f7
 
 if which makensis > /dev/null
 then
-	echo "Building Windows launcher and installer"
 	mkdir -p cache
 	echo "Downloading OpenJRE for Windows (may be overridden with WINDOWS_JRE_URL and WINDOWS_JRE_SHA256)"
 	# download JRE if not existing or wrong file contents
     check_sha256 cache/jre.zip $WINDOWS_JRE_SHA256 || wget "$WINDOWS_JRE_URL" -O cache/jre.zip
     # check if downloaded JRE is correct (to exclude incomplete download)
     check_sha256 cache/jre.zip $WINDOWS_JRE_SHA256 || exit 1
-    
+    echo "Building Windows launcher and installer"
 	# Copy files to wintmp/
 	rm -rf wintmp
 	mkdir wintmp

generatesplash.sh

@@ -2,13 +2,18 @@
 echo "Checking for rsvg..."
 if which rsvg-convert >/dev/null 2>&1
 then
-	echo "found."
+	echo "found rsvg-convert."
 else
-	echo "no rsvg-convert found. skipping generation of splash"
+	echo "no rsvg-convert found. skipping generation of splash" >&2
+	cp src/main/resources/de/thomas_oster/visicut/gui/resources/splash{-fallback,}.png
 	exit
 fi
-echo "Determining Version..."
-VERSION=$(cat src/main/resources/de/thomas_oster/visicut/gui/resources/VisicutApp.properties |grep Application.version|cut -d'=' -f2|tr -d ' ')
+echo "Determining Version (may be overridden with environment variable VERSION)"
+cd "$(dirname $0)"
+VERSION=${VERSION:-$(cat ./src/main/resources/de/thomas_oster/visicut/gui/resources/VisicutApp.properties |grep Application.version)}
+VERSION=${VERSION#*=}
+VERSION=${VERSION// /}
+echo "Version is: \"$VERSION\""
 echo "Version is: $VERSION"
 echo "Generating SVG"
 cat splashsource.svg|sed s#insert#$VERSION#g# > splash.svg

splashsource.svg

@@ -2,7 +2,7 @@
 
 Application.name = VisiCut
 Application.title = VisiCut
-Application.version = 1.9
+Application.version =
 Application.vendor = <html>Thomas Oster, Media Computing Group<br>RWTH Aachen University<br>thomas.oster@rwth-aachen.de</html>
 Application.homepage = <html><a href="https://visicut.org">https://visicut.org</a></html>
 Application.description = A Java Desktop Application for Lasercutting

src/main/resources/de/thomas_oster/visicut/gui/resources/VisicutApp.properties

@@ -2,7 +2,7 @@
 
 Application.name = VisiCut
 Application.title = VisiCut
-Application.version = 1.7
+Application.version =
 Application.vendor = <html>Thomas Oster, Media Computing Group<br>RWTH Aachen University<br>thomas.oster@rwth-aachen.de</html>
 Application.homepage = <html><a href="http://hci.rwth-aachen.de/visicut">http://hci.rwth-aachen.de/visicut</a></html>
 Application.description = Eine Java Arbeitsfl\u00e4chenanwendung zum Lasercutten

src/main/resources/de/thomas_oster/visicut/gui/resources/VisicutApp_de_DE.properties

@@ -2,7 +2,7 @@
 
 Application.name = VisiCut
 Application.title = VisiCut
-Application.version = 1.7
+Application.version =
 Application.vendor = <html>Thomas Oster, Media Computing Group<br>RWTH Aachen University<br>thomas.oster@rwth-aachen.de</html>
 Application.homepage = <html><a href="http://hci.rwth-aachen.de/visicut">http://hci.rwth-aachen.de/visicut</a></html>
 Application.description = Une Application Java de Bureau pour D\u00e9coupe Laser

src/main/resources/de/thomas_oster/visicut/gui/resources/VisicutApp_fr_FR.properties

@@ -2,7 +2,7 @@
 
 Application.name = VisiCut
 Application.title = VisiCut
-Application.version = 1.7
+Application.version =
 Application.vendor = <html>Thomas Oster, Media Computing Group<br>RWTH Aachen University<br>thomas.oster@rwth-aachen.de</html>
 Application.homepage = <html><a href="http://hci.rwth-aachen.de/visicut">http://hci.rwth-aachen.de/visicut</a></html>
 Application.description = A Java Desktop Application for Lasercutting