Merge branch 'master' into master

Author: jnweiger

.github/workflows/github-build.yml

@@ -40,20 +40,20 @@ jobs:
           bash ../distribute/distribute-docker.sh ${{ matrix.target }}
 
       - name: Archive built files
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4.4.3
         with:
-          name: output binaries
+          name: output binaries ${{ matrix.target }}
           path: |
             output/*
 
   upload:
     name: Create release and upload artifacts
     needs:
       - distribute
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Download artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4.1.8
       - name: Inspect directory after downloading artifacts
         run: ls -alFR
       - name: Create release and upload artifacts
@@ -62,4 +62,4 @@ jobs:
         run: |
             wget https://github.com/TheAssassin/pyuploadtool/releases/download/20231223-1/pyuploadtool-x86_64.AppImage
             chmod +x pyuploadtool-x86_64.AppImage
-            ./pyuploadtool-x86_64.AppImage "output binaries"/*.*
+            ./pyuploadtool-x86_64.AppImage --appimage-extract-and-run "output binaries"*/*.*

.gitignore

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

LibLaserCut

@@ -16,6 +16,9 @@ help:
 splash:
 	./generatesplash.sh
 jar: splash libLaserCut
+	# Write version into properties file (used by Help-About screen).
+	./versionnumber.sh
+	echo "Version = $(shell ./versionnumber.sh)" > src/main/resources/de/thomas_oster/visicut/gui/resources/VisicutAppVersion.properties
 	mvn initialize
 	mvn package
 dist:
@@ -29,6 +32,7 @@ libLaserCut:
 	cd ..
 clean:
 	rm -f src/main/resources/de/thomas_oster/visicut/gui/resources/splash.png
+	rm -f src/main/resources/de/thomas_oster/visicut/gui/resources/VisicutAppVersion.properties
 	mvn clean
 install:
 	mkdir -p $(DESTDIR)$(PREFIX)/share/visicut

Makefile

@@ -1,6 +1,4 @@
-# makepkg is available in bullseye's backports (and newer distros) only
-# checkinstall is available in bullseye only, too
-FROM debian:bullseye-backports
+FROM debian:trixie
 
 SHELL ["bash", "-x", "-c"]
 
@@ -9,11 +7,10 @@ ENV DEBIAN_FRONTEND=noninteractive
 # workaround nsis bug: https://sourceforge.net/p/nsis/bugs/1180/
 ENV LANG C.UTF-8
 
-# note: don't build with OpenJDK > 16, as this is the runtime we ship
 RUN apt-get update && \
-    apt-get install -y openjdk-11-jdk git wget shellcheck bash make maven python3-minimal python3-pip \
-        nsis zip libfuse2 checkinstall makepkg fonts-noto-extra potrace sudo && \
-    python3 -m pip install git+https://github.com/TheAssassin/appimagecraft.git@6b36fda#egg=appimagecraft
+    apt-get install -y default-jdk git wget shellcheck bash make maven python3-minimal python3-pip \
+        nsis zip libfuse2 checkinstall makepkg fonts-noto-extra potrace sudo librsvg2-bin && \
+    python3 -m pip install --break-system-packages git+https://github.com/TheAssassin/appimagecraft.git@6b36fda#egg=appimagecraft
 
 # we don't have a defined $HOME, but we need Maven to write the libLaserCut artifact somewhere
 COPY docker/maven-settings.xml /usr/share/maven/conf/settings.xml

distribute/Dockerfile

@@ -23,7 +23,7 @@ log() {
 # targets to be built need to be passed on the commandline
 # if no targets are provided, we display a help text
 if [[ "${1:-}" == "" ]]; then
-    log "Usage: [env NO_BUILD=1] $0 <targets>"
+    log "Usage: [env NO_BUILD=1 VERSION=1.2.3-mystuff] $0 <targets>"
     echo
     log "Available targets:"
     log "    - zip"
@@ -34,6 +34,7 @@ if [[ "${1:-}" == "" ]]; then
     echo
     log "Available environment variables:"
     log "    - \$NO_BUILD=[...]: if set to any string, $0 won't build a JAR (saves build time if the script ran already)"
+    log "    - \$VERSION=[...]: if set to any string, will overwrite the version number"
     exit 2
 fi
 
@@ -46,25 +47,13 @@ distribute_dir="$(readlink -f "$(dirname "${BASH_SOURCE[0]}")")"
 # we assume the distribute directory is a direct subdirectory of the project root directory (i.e., the Git repository)
 project_root_dir="$(readlink -f "$distribute_dir"/..)"
 
-if [[ "${VERSION:-}" != "" ]]; then
-    log "Using user-provided version \$VERSION=$VERSION"
-else
-    pushd "$project_root_dir"
-
-    properties=src/main/resources/de/thomas_oster/visicut/gui/resources/VisicutApp.properties
-    VERSION="$(grep Application.version < "$properties" | cut -d= -f2 | tr -d ' ')"
-
-    # usually, distribute.sh doesn't create the properties file, so we implement a Git based fallback
-    if [[ "$VERSION" != "" ]]; then
-        log "Using properties-provided version $VERSION"
-    else
-        VERSION="$(git describe --tags || echo unknown)+devel"
-    fi
-
-    popd
-fi
+pushd "$project_root_dir"
+VERSION="$(./versionnumber.sh)"
+popd
 
 export VERSION
+log "Determined version: $VERSION"
+
 
 if [ "${NO_BUILD:-}" == "" ]; then
     log "Building VisiCut JAR"
@@ -198,7 +187,7 @@ EOF
             popd
 
             filename_prefix="VisiCut-$VERSION-Windows-Installer"
-            mv "$build_dir"/setup.exe "$filename_prefix".exe
+            mv "$build_dir"/vcsetup.exe "$filename_prefix".exe
             echo "Success: Built Windows EXE Installer in $(pwd)/${filename_prefix}.exe"
             ;;
 

distribute/distribute.sh

@@ -68,11 +68,6 @@
     <key>JVMRuntimePath</key>
     <string></string>
     -->
-    <key>LSEnvironment</key>
-    <dict>
-        <key>JAVA_HOME</key>
-        <string>Contents/Plugins/JRE/Contents/Home/</string>
-    </dict>
     <key>JVMMainClassName</key>
     <string>de.thomas_oster.visicut.gui.VisicutApp</string>
     <key>JVMClassPaths</key>

distribute/mac/VisiCut.app/Contents/Info.plist

@@ -18,7 +18,7 @@
 
   ;General
   Name "${AppName}"
-  OutFile "setup.exe"
+  OutFile "vcsetup.exe"
 
   ;Folder selection page
   InstallDir "$PROGRAMFILES\${SHORTNAME}"
@@ -40,8 +40,6 @@
   !define MUI_PAGE_HEADER_SUBTEXT "Please wait while ${AppName} is being installed."
 ; Uncomment the next line if you want optional components to be selectable
 ;  !insertmacro MUI_PAGE_COMPONENTS
-  !define MUI_PAGE_CUSTOMFUNCTION_PRE myPreInstfiles
-  !define MUI_PAGE_CUSTOMFUNCTION_LEAVE RestoreSections
   !insertmacro MUI_PAGE_DIRECTORY
   !insertmacro MUI_PAGE_INSTFILES
   !insertmacro MUI_PAGE_FINISH
@@ -170,29 +168,8 @@ SectionEnd
 ;Installer Functions
 
 Function .onInit
- 
-  ;Extract InstallOptions INI Files
-  Call SetupSections
- 
-FunctionEnd
- 
-Function myPreInstfiles
- 
-  Call RestoreSections
-  SetAutoClose true
- 
-FunctionEnd
- 
-Function RestoreSections
-  !insertmacro SelectSection ${SecAppFiles}
-  !insertmacro SelectSection ${SecCreateShortcut}
- 
-FunctionEnd
- 
-Function SetupSections
-  !insertmacro UnselectSection ${SecAppFiles}
-  !insertmacro UnselectSection ${SecCreateShortcut}
 FunctionEnd
+
 
 ;--------------------------------
 ;Uninstaller Section

distribute/windows/installer.nsi

@@ -9,13 +9,9 @@ else
 	rm -f src/main/resources/de/thomas_oster/visicut/gui/resources/splash@{2,3}x.png
 	exit
 fi
-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"
+VERSION=$(./versionnumber.sh)
+echo "Version is: \"$VERSION\" (override with VERSION environment variable)"
 echo "Generating SVG"
 cat splashsource.svg|sed s#insert#$VERSION#g# > splash.svg
 echo "Converting to png"

generatesplash.sh

@@ -50,9 +50,9 @@
             <version>2.1.6.RELEASE</version>
         </dependency>
         <dependency>
-            <groupId>guru.nidi.com.kitfox</groupId>
+            <groupId>com.formdev</groupId>
             <artifactId>svgSalamander</artifactId>
-            <version>1.1.2</version>
+            <version>1.1.4</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -84,7 +84,7 @@
         <dependency>
             <groupId>com.thoughtworks.xstream</groupId>
             <artifactId>xstream</artifactId>
-            <version>1.4.19</version>
+            <version>1.4.21</version>
             <type>jar</type>
         </dependency>
         <dependency>