diff --git a/plugins/com.amansprojects.starterpack.sdPlugin/files/icons/deviceBrightness.png b/plugins/com.amansprojects.starterpack.sdPlugin/assets/icons/deviceBrightness.png similarity index 100% rename from plugins/com.amansprojects.starterpack.sdPlugin/files/icons/deviceBrightness.png rename to plugins/com.amansprojects.starterpack.sdPlugin/assets/icons/deviceBrightness.png diff --git a/plugins/com.amansprojects.starterpack.sdPlugin/files/icons/inputSimulation.png b/plugins/com.amansprojects.starterpack.sdPlugin/assets/icons/inputSimulation.png similarity index 100% rename from plugins/com.amansprojects.starterpack.sdPlugin/files/icons/inputSimulation.png rename to plugins/com.amansprojects.starterpack.sdPlugin/assets/icons/inputSimulation.png diff --git a/plugins/com.amansprojects.starterpack.sdPlugin/files/icons/plugin.png b/plugins/com.amansprojects.starterpack.sdPlugin/assets/icons/plugin.png similarity index 100% rename from plugins/com.amansprojects.starterpack.sdPlugin/files/icons/plugin.png rename to plugins/com.amansprojects.starterpack.sdPlugin/assets/icons/plugin.png diff --git a/plugins/com.amansprojects.starterpack.sdPlugin/files/icons/runCommand.png b/plugins/com.amansprojects.starterpack.sdPlugin/assets/icons/runCommand.png similarity index 100% rename from plugins/com.amansprojects.starterpack.sdPlugin/files/icons/runCommand.png rename to plugins/com.amansprojects.starterpack.sdPlugin/assets/icons/runCommand.png diff --git a/plugins/com.amansprojects.starterpack.sdPlugin/files/icons/switchProfile.png b/plugins/com.amansprojects.starterpack.sdPlugin/assets/icons/switchProfile.png similarity index 100% rename from plugins/com.amansprojects.starterpack.sdPlugin/files/icons/switchProfile.png rename to plugins/com.amansprojects.starterpack.sdPlugin/assets/icons/switchProfile.png diff --git a/plugins/com.amansprojects.starterpack.sdPlugin/files/manifest.json b/plugins/com.amansprojects.starterpack.sdPlugin/assets/manifest.json similarity index 92% rename from plugins/com.amansprojects.starterpack.sdPlugin/files/manifest.json rename to plugins/com.amansprojects.starterpack.sdPlugin/assets/manifest.json index aab0ddc..c2322ec 100644 --- a/plugins/com.amansprojects.starterpack.sdPlugin/files/manifest.json +++ b/plugins/com.amansprojects.starterpack.sdPlugin/assets/manifest.json @@ -3,9 +3,9 @@ "Description": "OpenDeck starter pack plugin", "Author": "Aman Khanna (nekename)", "Version": "2.5.1", - "CodePathWin": "opendeck-starterpack.exe", - "CodePathMac": "opendeck-starterpack-mac", - "CodePathLin": "opendeck-starterpack", + "CodePathWin": "windows/bin/opendeck-starterpack.exe", + "CodePathMac": "darwin/bin/opendeck-starterpack", + "CodePathLin": "linux/bin/opendeck-starterpack", "Icon": "icons/plugin", "Category": "OpenDeck", "OS": [ diff --git a/plugins/com.amansprojects.starterpack.sdPlugin/files/propertyInspector/check.svg b/plugins/com.amansprojects.starterpack.sdPlugin/assets/propertyInspector/check.svg similarity index 100% rename from plugins/com.amansprojects.starterpack.sdPlugin/files/propertyInspector/check.svg rename to plugins/com.amansprojects.starterpack.sdPlugin/assets/propertyInspector/check.svg diff --git a/plugins/com.amansprojects.starterpack.sdPlugin/files/propertyInspector/deviceBrightness.html b/plugins/com.amansprojects.starterpack.sdPlugin/assets/propertyInspector/deviceBrightness.html similarity index 100% rename from plugins/com.amansprojects.starterpack.sdPlugin/files/propertyInspector/deviceBrightness.html rename to plugins/com.amansprojects.starterpack.sdPlugin/assets/propertyInspector/deviceBrightness.html diff --git a/plugins/com.amansprojects.starterpack.sdPlugin/files/propertyInspector/inputSimulation.html b/plugins/com.amansprojects.starterpack.sdPlugin/assets/propertyInspector/inputSimulation.html similarity index 100% rename from plugins/com.amansprojects.starterpack.sdPlugin/files/propertyInspector/inputSimulation.html rename to plugins/com.amansprojects.starterpack.sdPlugin/assets/propertyInspector/inputSimulation.html diff --git a/plugins/com.amansprojects.starterpack.sdPlugin/files/propertyInspector/runCommand.html b/plugins/com.amansprojects.starterpack.sdPlugin/assets/propertyInspector/runCommand.html similarity index 100% rename from plugins/com.amansprojects.starterpack.sdPlugin/files/propertyInspector/runCommand.html rename to plugins/com.amansprojects.starterpack.sdPlugin/assets/propertyInspector/runCommand.html diff --git a/plugins/com.amansprojects.starterpack.sdPlugin/files/propertyInspector/sdpi.css b/plugins/com.amansprojects.starterpack.sdPlugin/assets/propertyInspector/sdpi.css similarity index 100% rename from plugins/com.amansprojects.starterpack.sdPlugin/files/propertyInspector/sdpi.css rename to plugins/com.amansprojects.starterpack.sdPlugin/assets/propertyInspector/sdpi.css diff --git a/plugins/com.amansprojects.starterpack.sdPlugin/files/propertyInspector/switchProfile.html b/plugins/com.amansprojects.starterpack.sdPlugin/assets/propertyInspector/switchProfile.html similarity index 100% rename from plugins/com.amansprojects.starterpack.sdPlugin/files/propertyInspector/switchProfile.html rename to plugins/com.amansprojects.starterpack.sdPlugin/assets/propertyInspector/switchProfile.html diff --git a/plugins/com.amansprojects.starterpack.sdPlugin/build.ts b/plugins/com.amansprojects.starterpack.sdPlugin/build.ts index 225a4b4..71ec2b2 100644 --- a/plugins/com.amansprojects.starterpack.sdPlugin/build.ts +++ b/plugins/com.amansprojects.starterpack.sdPlugin/build.ts @@ -3,8 +3,10 @@ import { copy } from "jsr:@std/fs"; import { join } from "jsr:@std/path"; -if (Deno.args.length < 1) Deno.exit(1); +if (Deno.args.length < 2) Deno.exit(1); const outDir = Deno.args[0]; +const target = Deno.args[1]; + try { await Deno.remove(outDir, { recursive: true }); } catch (error: any) { @@ -12,9 +14,6 @@ try { throw error; } } -copy("files", outDir); -if (!(await new Deno.Command("cargo", { args: ["build", "--release"] }).spawn().status).success) Deno.exit(1); -const builtExec = Deno.build.os == "windows" ? "opendeck-starterpack.exe" : "opendeck-starterpack"; -const targetExec = Deno.build.os == "windows" ? "opendeck-starterpack.exe" : Deno.build.os == "darwin" ? "opendeck-starterpack-mac" : "opendeck-starterpack"; -copy(join("target", "release", builtExec), join(outDir, targetExec)); +copy("assets", outDir); +if (!(await new Deno.Command("cargo", { args: ["install", "--path", ".", "--target", target, "--root", join(outDir, Deno.build.os)] }).spawn().status).success) Deno.exit(1); diff --git a/src-tauri/build.rs b/src-tauri/build.rs index 387a442..0b6c697 100644 --- a/src-tauri/build.rs +++ b/src-tauri/build.rs @@ -8,7 +8,14 @@ fn main() { let out_dir = std::path::Path::new("target").join("plugins").join(entry.file_name()); fs::create_dir_all(&out_dir)?; let status = std::process::Command::new("deno") - .args(["run", "--lock=target/deno.lock", "--allow-all", "build.ts", fs::canonicalize(out_dir)?.to_string_lossy().as_ref()]) + .args([ + "run", + "--lock=target/deno.lock", + "--allow-all", + "build.ts", + fs::canonicalize(out_dir)?.to_string_lossy().as_ref(), + &std::env::var("TARGET").unwrap(), + ]) .current_dir(entry.path()) .status()?; if !status.success() {