github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[desktop] Remove assets symlink

Browse Source
This commit is contained in:
Vladimir Stoilov
2024-05-10 20:36:16 +03:00
parent 2da6bcc28d
commit e964385f83
4 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Earthfile
View File

@@ -455,10 +455,10 @@ tauri-prep-windows:
# RUN ls -R ./binaries # RUN ls -R ./binaries
# RUN ls -R ./dist # RUN ls -R ./dist
SAVE ARTIFACT "./dist/tauri-builtin" AS LOCAL "${outputDir}/${GO_ARCH_STRING}/angular/dist/" SAVE ARTIFACT "./dist/tauri-builtin" AS LOCAL "${outputDir}/${GO_ARCH_STRING}/desktop/angular/dist/"
SAVE ARTIFACT "./src-tauri" AS LOCAL "${outputDir}/${GO_ARCH_STRING}/tauri/src-tauri" SAVE ARTIFACT "./src-tauri" AS LOCAL "${outputDir}/${GO_ARCH_STRING}/desktop/tauri/src-tauri"
SAVE ARTIFACT "./binaries" AS LOCAL "${outputDir}/${GO_ARCH_STRING}/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}/tauri/assets" SAVE ARTIFACT "./assets" AS LOCAL "${outputDir}/${GO_ARCH_STRING}/assets"
tauri-release: tauri-release:
FROM ${work_image} FROM ${work_image}

1
desktop/tauri/assets
View File

@@ -1 +0,0 @@
../../assets/data

12
desktop/tauri/src-tauri/src/traymenu.rs
View File

@@ -39,10 +39,14 @@ const PM_TRAY_ICON_ID: &'static str = "pm_icon";
// Icons // Icons
// //
const BLUE_ICON: &'static [u8] = include_bytes!("../../assets/icons/pm_light_blue_512.ico"); const BLUE_ICON: &'static [u8] =
const RED_ICON: &'static [u8] = include_bytes!("../../assets/icons/pm_light_red_512.ico"); include_bytes!("../../../../assets/data/icons/pm_light_blue_512.ico");
const YELLOW_ICON: &'static [u8] = include_bytes!("../../assets/icons/pm_light_yellow_512.ico"); const RED_ICON: &'static [u8] =
const GREEN_ICON: &'static [u8] = include_bytes!("../../assets/icons/pm_light_green_512.ico"); 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( pub fn setup_tray_menu(
app: &mut tauri::App, app: &mut tauri::App,

8
desktop/tauri/src-tauri/tauri.conf.json
View File

@@ -96,10 +96,10 @@
"msi" "msi"
], ],
"icon": [ "icon": [
"../assets/icons/pm_dark_512.png", "../../../assets/data/icons/pm_dark_512.png",
"../assets/icons/pm_dark_512.ico", "../../../assets/data/icons/pm_dark_512.ico",
"../assets/icons/pm_light_512.png", "../../../assets/data/icons/pm_light_512.png",
"../assets/icons/pm_light_512.ico" "../../../assets/data/icons/pm_light_512.ico"
] ]
} }
} }