Fix #7 and fix #8

README.md

@@ -15,7 +15,7 @@ This subfolder contains the frontend Vue website. The frontend runs independentl
 
 #### frontend/src-tauri
 
-This subfolder contains the experimental tauri application for a local Linkie experience. (Currently only Windows, with plans for other platforms)
+This subfolder contains the experimental tauri application for a local Linkie experience.
 
 The application fires a JRE process of the backend and connects to it, the frontend is the Vue website.
 
@@ -55,21 +55,19 @@ npm run build
 First, we need to build a custom JRE to bundle along: (Use Java 17)
 
 ```bash
-# Unix-Like
-java/bin/jlink --add-modules java.base,java.xml,jdk.unsupported,java.net.http,jdk.crypto.ec --output jdk-17-minjre --strip-debug --no-man-pages --no-header-files --compress=2
-```
-
-```powershell
-# Windows
-java\bin\jlink.exe --add-modules java.base,java.xml,jdk.unsupported,java.net.http,jdk.crypto.ec --output jdk-17-minjre --strip-debug --no-man-pages --no-header-files --compress=2
+cd backend
+./gradlew customJre
 ```
 
-Place the generated `jdk-17-minjre` at `/backend/build/libs`, and also compile the `backend`. (Instructions above)
+The custom jre is in `build/libs/`.
+Now, also compile the `backend`. (Instructions above)
 
 Build the tauri project: (Requires Rust)
 
 ```bash
+npm install
 npm run tauri build
 ```
 
-Compiled file is at `/frontend/src-tauri/target/release/bundle`.
+Compiled file is at `/frontend/src-tauri/target/release/`.<br>
+Bundled installer/app is at `/frontend/src-tauri/target/release/bundle`.

backend/build.gradle

@@ -63,3 +63,30 @@ build.finalizedBy shadowJar
 compileKotlin {
     kotlinOptions.jvmTarget = "1.8"
 }
+
+def launcher = javaToolchains.launcherFor {
+    languageVersion.set(JavaLanguageVersion.of(17))
+    vendor.set(JvmVendorSpec.matching("adoptium"))
+}
+
+tasks.register("customJre", Exec) {
+    doFirst {
+        file("build/libs/jdk-17-minjre").deleteDir()
+    }
+    def tmp = File.createTempDir("jdk-17-minjre")
+    tmp.deleteOnExit()
+    workingDir = tmp
+    def exe = new File(launcher.get().executablePath.asFile.parentFile, "jlink.exe")
+    def obj = new File(launcher.get().executablePath.asFile.parentFile, "jlink")
+    def cmd = [(exe.exists() ? exe : obj).absolutePath, "--add-modules", "java.base,java.xml,jdk.unsupported,java.net.http,jdk.crypto.ec,jdk.zipfs",
+               "--output", "jdk-17-minjre", "--strip-debug", "--no-man-pages", "--no-header-files", "--compress=2"]
+    commandLine(cmd)
+    println(String.join(" ", cmd))
+    doLast {
+        copy {
+            from(tmp)
+            into("build/libs")
+        }
+        tmp.deleteDir()
+    }
+}

frontend/src-tauri/src/main.rs

@@ -188,6 +188,8 @@ pub fn start_backend<R: Runtime>(app: &AppHandle<R>, process: &mut ChildProcess)
                 return Err(("Could not find backend jar ".to_owned() + backend_jar.to_str().unwrap()).into());
             }
             let working_dir: PathBuf = app.path_resolver().app_cache_dir().unwrap();
+            send_console(&app, "Working dir at ".to_owned() + working_dir.to_str().unwrap());
+            fs::create_dir_all(working_dir.clone()).expected(&app, "Failed to create working dir");
             fs::copy(backend_jar, working_dir.join("linkie-web-backend.jar"))
                 .expected(&app, "Failed to copy backend jar");
             // java_path can start with \\?\, which is not supported by Command::new

frontend/src-tauri/tauri.conf.json

@@ -18,7 +18,7 @@
         "bundle": {
             "active": true,
             "category": "DeveloperTool",
-            "copyright": "",
+            "copyright": "Copyright Linkie & shedaniel© 2020 - 2023. All right reserved.",
             "deb": {
                 "depends": []
             },
@@ -29,10 +29,11 @@
                 "icons/128x128.png",
                 "icons/128x128@2x.png",
                 "icons/icon.icns",
-                "icons/icon.ico"
+                "icons/icon.ico",
+                "icons/icon.png"
             ],
             "identifier": "me.shedaniel.linkie.linkie-tauri",
-            "longDescription": "",
+            "longDescription": "View mod dependencies; Search up mappings; All in one place!",
             "macOS": {
                 "entitlements": null,
                 "exceptionDomain": "",
@@ -45,7 +46,12 @@
                 "../../backend/build/libs/jdk-17-minjre/*"
             ],
             "shortDescription": "",
-            "targets": "all",
+            "targets": [
+                "appimage",
+                "msi",
+                "dmg",
+                "app"
+            ],
             "windows": {
                 "certificateThumbprint": null,
                 "digestAlgorithm": "sha256",

frontend/src/main.ts

@@ -18,6 +18,7 @@ import enGB from "./locales/en_GB.json"
 import zhCN from "./locales/zh_CN.json"
 // @ts-ignore
 import zhTW from "./locales/zh_TW.json"
+import {isTauri} from "./app/tauri/tauri";
 // @ts-ignore
 
 Prism.manual = true;
@@ -29,15 +30,19 @@ NProgress.configure({
 const app = createApp(App)
 
 HTTP.interceptors.request.use(config => {
-    NProgress.start()
+    if (!isTauri()) {
+        NProgress.start()
+    }
     return config
 }, error => {
     console.log(error)
     return Promise.reject(error)
 })
 
 HTTP.interceptors.response.use(response => {
-    NProgress.done()
+    if (!isTauri()) {
+        NProgress.done()
+    }
     return response
 }, error => {
     if (!axios.isCancel(error)) {