Use jpackage on Windows and Linux

Author: airsquared

.github/workflows/main.yml

@@ -19,13 +19,10 @@ jobs:
       - name: Install Linux dependencies
         run: sudo apt install libcurl4-openssl-dev libzip-dev && git clone --depth=1 https://github.com/tihmstar/libgeneral.git && cd libgeneral && ./autogen.sh && make && sudo make install && git clone --depth=1 https://github.com/tihmstar/libfragmentzip.git && cd libfragmentzip && sed -i '/LIBGENERAL_REQUIRES_STR/d' ./configure.ac && ./autogen.sh && make && sudo make install && sudo ln -s /usr/local/lib/libfragmentzip.so /usr/lib/
         if: runner.os == 'Linux'
-      - name: Fix macOS AppleScript permissions
-        run: sqlite3 ~/Library/Application\ Support/com.apple.TCC/TCC.db "insert into access (service, client, client_type, allowed, prompt_count, indirect_object_identifier_type, indirect_object_identifier) values ('kTCCServiceAppleEvents', '`which java`', 1, 1, 1, 0, 'com.apple.finder')"
-        if: runner.os == 'macOS'
       - name: gradle build
         uses: eskatos/gradle-command-action@v1
         with:
-          arguments: build
+          arguments: build --no-daemon
           wrapper-cache-enabled: true
           dependencies-cache-enabled: true
       - uses: actions/upload-artifact@v2

.idea/modules/blobsaver.main.iml

@@ -38,10 +38,7 @@ String appIdentifier = "airsquared.blobsaver.app"
 String copyright = "Copyright (c) 2020 airsquared"
 def os = DefaultNativePlatform.currentOperatingSystem
 
-startScripts.enabled = false
-distZip.enabled = false
-distTar.enabled = false
-assemble.dependsOn jpackage
+startScripts.enabled = distZip.enabled = distTar.enabled = false
 
 repositories {
     mavenCentral()
@@ -105,14 +102,21 @@ jlink {
         noConsole = true
     }
     jpackage {
+        icon = "${projectDir}/${icon}"
+        imageOptions = [ '--copyright', copyright, '--vendor', 'airsquared']
+
         if (os.isMacOsX()) {
             installerType = "dmg"
+            imageOptions.addAll '--mac-package-identifier', appIdentifier
             icon = "dist/macos/Contents/Resources/blob.icns"
-        } else if (os.isWindows()) icon = "dist/windows/blob.ico"
-        else icon = "src/main/resources/airsquared/blobsaver/app/blob_emoji.png"
-
-        icon = "${projectDir}/${icon}"
-        imageOptions = [ '--copyright', copyright]
+        } else if (os.isWindows()) {
+            installerOptions.addAll '--win-dir-chooser', '--win-menu', '--win-shortcut'
+            icon = "dist/windows/blob.ico"
+        } else {
+            installerOptions.addAll '--linux-shortcut', '--linux-menu-group', 'Utility;Archiving;Java',
+                    '--linux-rpm-license-type', 'GPLv3'
+            icon = "src/main/resources/airsquared/blobsaver/app/blob_emoji.png"
+        }
     }
     if (os.isMacOsX()) jpackageImage.doLast {
         copy {
@@ -125,44 +129,32 @@ jlink {
             from "${projectDir}/LICENSE", "${projectDir}/libraries_used.txt"
             into "${buildDir}/jpackage/blobsaver.app/Contents/Resources"
         }
-    }
-
-    /* Need to figure out how to exclude the following unnecessary files/directories: "about.fxml", "about.css",
-            "aix-ppc/*", "aix-ppc64/*", "linux-ppc/*", "linux-ppc64le/*", "linux-s390x/*", "linux-mips64el/*",
-            "darwin/*", "win32-x86/*", "win32-x86-64/*", "openbsd-x86/*", "openbsd-x86-64/*", "freebsd-x86/*",
-            "freebsd-x86-64/*", "sunos-sparc/*", "sunos-sparcv9/*", "sunos-x86/*", "sunos-x86-64/*"
-     */
-}
-
-// if your platform isn't Windows, wine is required to run this task
-task createWindowsInstaller() {
-    inputs.dir("${projectDir}/dist/windows/")
-    inputs.file("${buildDir}/launch4j/blobsaver.exe")
-    outputs.file("${buildDir}/distributions/blobsaver-windows.exe")
-
-    doFirst {
-        delete "${buildDir}/tmp/innosetup"
+    } else if (os.isWindows()) jpackageImage.doLast {
         copy {
-            from "${projectDir}/dist/windows" into "${buildDir}/tmp/innosetup"
+            from "${projectDir}/dist/windows/files" from "${buildDir}/jpackage/blobsaver/runtime/bin/zip.dll"
             rename "LICENSE_windows", "LICENSE"
             rename "libraries_used_windows.txt", "libraries_used.txt"
+            into "${buildDir}/jpackage/blobsaver"
         }
+    } else jpackageImage.doLast {
         copy {
-            from "${projectDir}/dist/windows/blobsaver.iss" into "${buildDir}/tmp/innosetup"
-            filter(ReplaceTokens, tokens: [AppName: project.name, AppVersion: version, AppCopyright: copyright, AppMutex: appIdentifier])
+            from "${projectDir}/dist/linux" into "${buildDir}/jpackage/blobsaver/lib"
         }
+    }
+
+}
+
+task windowsInstaller(dependsOn: jpackageImage) { // requires inno setup to be installed
+    doFirst {
         copy {
-            from "${buildDir}/launch4j/blobsaver.exe" into "${buildDir}/tmp/innosetup/files"
+            from "${projectDir}/dist/windows/blobsaver.iss" into "${buildDir}/jpackage"
+            filter(ReplaceTokens, tokens: [AppName: project.name, AppVersion: version, AppCopyright: copyright, AppMutex: appIdentifier])
         }
-        mkdir "${buildDir}/distributions/"
-        println "running Inno Setup Compiler"
         exec {
-            workingDir = projectDir
-            if (os.isWindows()) {
-                commandLine "gradle\\InnoSetup6\\ISCC.exe", "/Qp", "${buildDir}\\tmp\\innosetup\\blobsaver.iss"
-            } else {
-                commandLine "wine", "gradle/InnoSetup6/ISCC.exe", "/Qp", "${buildDir}/tmp/innosetup/blobsaver.iss"
-            }
+            commandLine "iscc", "/Qp", "${buildDir}\\jpackage\\blobsaver.iss"
         }
+        delete "${buildDir}/jpackage/blobsaver.iss"
     }
 }
+
+assemble.dependsOn os.isWindows() ? windowsInstaller : jpackage

build.gradle

@@ -1,12 +1,7 @@
-blobsaver has two required dependencies and two optional.
+blobsaver has one required dependency and two optional.
 Make sure to install these on your system before continuing.
 
 Required:
-  - Java 8 with JavaFX or OpenJFX
-    Please see https://github.com/airsquared/blobsaver/wiki/Installing-Java
-    and https://github.com/airsquared/blobsaver/wiki/Making-sure-you-have-the-right-Java-version
-    if you need help making sure you have the right Java version
-
   - libfragmentzip (https://github.com/tihmstar/libfragmentzip)
 
 Optional (for reading information from connected devices):

dist/linux/README-linux.txt

@@ -28,10 +28,9 @@ ArchitecturesInstallIn64BitMode=x64 arm64
 Uninstallable=not IsTaskSelected('portableMode')
 DefaultDirName={pf}\{#MyAppName}
 DisableProgramGroupPage=yes
-LicenseFile=files\LICENSE
-OutputDir=..\..\distributions
+OutputDir=.
 OutputBaseFilename=blobsaver-windows
-SetupIconFile=blob.ico
+SetupIconFile=blobsaver\blobsaver.ico
 Compression=lzma
 SolidCompression=yes
 
@@ -43,7 +42,7 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 Name: "portableMode"; Description: "Portable Installation Mode"; Flags: unchecked
 
 [Files]
-Source: "files\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "blobsaver\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]

dist/linux/blobsaver

@@ -28,6 +28,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 
 import static com.sun.jna.Platform.isMac;
 import static com.sun.jna.Platform.isWindows;
@@ -37,7 +38,15 @@ public class Main {
     static final String appVersion = "v3.0b0";
     static Stage primaryStage;
     // make sure to set system property before running (automatically set if running from gradle)
-    static final File jarDirectory = new File(System.getProperty("jar.directory")).getAbsoluteFile(); //TODO do correct parent file stuff
+    static final File jarDirectory;
+
+    static {
+        try {
+            jarDirectory = new File(System.getProperty("jar.directory")).getCanonicalFile();
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
 
     /**
      * Enables a menu item in the system tray to activate a breakpoint when in background and