diff --git a/Earthfile b/Earthfile index a5c7c29a..9ff9dc16 100644 --- a/Earthfile +++ b/Earthfile @@ -455,10 +455,10 @@ tauri-prep-windows: # RUN ls -R ./binaries # RUN ls -R ./dist - SAVE ARTIFACT "./dist/tauri-builtin" AS LOCAL "${outputDir}/${GO_ARCH_STRING}/angular/dist/" - SAVE ARTIFACT "./src-tauri" AS LOCAL "${outputDir}/${GO_ARCH_STRING}/tauri/src-tauri" - SAVE ARTIFACT "./binaries" AS LOCAL "${outputDir}/${GO_ARCH_STRING}/tauri/src-tauri/" - SAVE ARTIFACT "./assets" AS LOCAL "${outputDir}/${GO_ARCH_STRING}/tauri/assets" + SAVE ARTIFACT "./dist/tauri-builtin" AS LOCAL "${outputDir}/${GO_ARCH_STRING}/desktop/angular/dist/" + SAVE ARTIFACT "./src-tauri" AS LOCAL "${outputDir}/${GO_ARCH_STRING}/desktop/tauri/src-tauri" + SAVE ARTIFACT "./binaries" AS LOCAL "${outputDir}/${GO_ARCH_STRING}/desktop/tauri/src-tauri/" + SAVE ARTIFACT "./assets" AS LOCAL "${outputDir}/${GO_ARCH_STRING}/assets" tauri-release: FROM ${work_image} diff --git a/desktop/tauri/assets b/desktop/tauri/assets deleted file mode 120000 index 21dab851..00000000 --- a/desktop/tauri/assets +++ /dev/null @@ -1 +0,0 @@ -../../assets/data \ No newline at end of file diff --git a/desktop/tauri/src-tauri/src/traymenu.rs b/desktop/tauri/src-tauri/src/traymenu.rs index 2ba69aa8..a67db5f4 100644 --- a/desktop/tauri/src-tauri/src/traymenu.rs +++ b/desktop/tauri/src-tauri/src/traymenu.rs @@ -39,10 +39,14 @@ const PM_TRAY_ICON_ID: &'static str = "pm_icon"; // Icons // -const BLUE_ICON: &'static [u8] = include_bytes!("../../assets/icons/pm_light_blue_512.ico"); -const RED_ICON: &'static [u8] = include_bytes!("../../assets/icons/pm_light_red_512.ico"); -const YELLOW_ICON: &'static [u8] = include_bytes!("../../assets/icons/pm_light_yellow_512.ico"); -const GREEN_ICON: &'static [u8] = include_bytes!("../../assets/icons/pm_light_green_512.ico"); +const BLUE_ICON: &'static [u8] = + include_bytes!("../../../../assets/data/icons/pm_light_blue_512.ico"); +const RED_ICON: &'static [u8] = + include_bytes!("../../../../assets/data/icons/pm_light_red_512.ico"); +const YELLOW_ICON: &'static [u8] = + include_bytes!("../../../../assets/data/icons/pm_light_yellow_512.ico"); +const GREEN_ICON: &'static [u8] = + include_bytes!("../../../../assets/data/icons/pm_light_green_512.ico"); pub fn setup_tray_menu( app: &mut tauri::App, diff --git a/desktop/tauri/src-tauri/tauri.conf.json b/desktop/tauri/src-tauri/tauri.conf.json index 2647f36b..1338970a 100644 --- a/desktop/tauri/src-tauri/tauri.conf.json +++ b/desktop/tauri/src-tauri/tauri.conf.json @@ -96,10 +96,10 @@ "msi" ], "icon": [ - "../assets/icons/pm_dark_512.png", - "../assets/icons/pm_dark_512.ico", - "../assets/icons/pm_light_512.png", - "../assets/icons/pm_light_512.ico" + "../../../assets/data/icons/pm_dark_512.png", + "../../../assets/data/icons/pm_dark_512.ico", + "../../../assets/data/icons/pm_light_512.png", + "../../../assets/data/icons/pm_light_512.ico" ] } } \ No newline at end of file