From 1905f9a9ce406131a791af6321c8c6e39d32d96a Mon Sep 17 00:00:00 2001 From: Minh141120 Date: Wed, 8 Oct 2025 16:55:24 +0700 Subject: [PATCH] chore: move license to resources --- src-tauri/tauri.android.conf.json | 3 ++- src-tauri/tauri.bundle.windows.nsis.template | 4 ++++ src-tauri/tauri.conf.json | 3 ++- src-tauri/tauri.ios.conf.json | 3 ++- src-tauri/tauri.linux.conf.json | 2 +- src-tauri/tauri.macos.conf.json | 2 +- src-tauri/tauri.windows.conf.json | 3 ++- 7 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src-tauri/tauri.android.conf.json b/src-tauri/tauri.android.conf.json index c38f73c88..2f1144c20 100644 --- a/src-tauri/tauri.android.conf.json +++ b/src-tauri/tauri.android.conf.json @@ -15,7 +15,8 @@ "bundle": { "active": true, "resources": [ - "resources/pre-install/**/*" + "resources/pre-install/**/*", + "resources/LICENSE" ], "externalBin": [], "android": { diff --git a/src-tauri/tauri.bundle.windows.nsis.template b/src-tauri/tauri.bundle.windows.nsis.template index 5d10e19c4..8e7602f25 100644 --- a/src-tauri/tauri.bundle.windows.nsis.template +++ b/src-tauri/tauri.bundle.windows.nsis.template @@ -697,6 +697,7 @@ Section Install CreateDirectory "$INSTDIR\resources" CreateDirectory "$INSTDIR\resources\pre-install" SetOutPath $INSTDIR + File /a "/oname=LICENSE" "D:\a\jan\jan\src-tauri\resources\LICENSE" SetOutPath "$INSTDIR\resources\pre-install" File /nonfatal /a /r "D:\a\jan\jan\src-tauri\resources\pre-install\" SetOutPath $INSTDIR @@ -820,6 +821,9 @@ Section Uninstall ; Copy main executable Delete "$INSTDIR\${MAINBINARYNAME}.exe" + ; Delete LICENSE file + Delete "$INSTDIR\LICENSE" + ; Delete resources Delete "$INSTDIR\resources\pre-install\janhq-assistant-extension-1.0.2.tgz" Delete "$INSTDIR\resources\pre-install\janhq-conversational-extension-1.0.0.tgz" diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 0c36fac98..95f1cf30b 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -86,6 +86,7 @@ "icons/128x128@2x.png", "icons/icon.icns", "icons/icon.ico" - ] + ], + "resources": ["resources/LICENSE"] } } diff --git a/src-tauri/tauri.ios.conf.json b/src-tauri/tauri.ios.conf.json index 4c86629ef..347f16bbd 100644 --- a/src-tauri/tauri.ios.conf.json +++ b/src-tauri/tauri.ios.conf.json @@ -18,7 +18,8 @@ "developmentTeam": "" }, "resources": [ - "resources/pre-install/**/*" + "resources/pre-install/**/*", + "resources/LICENSE" ], "externalBin": [] } diff --git a/src-tauri/tauri.linux.conf.json b/src-tauri/tauri.linux.conf.json index f43b01beb..32f6068a2 100644 --- a/src-tauri/tauri.linux.conf.json +++ b/src-tauri/tauri.linux.conf.json @@ -11,7 +11,7 @@ }, "bundle": { "targets": ["deb", "appimage"], - "resources": ["resources/pre-install/**/*"], + "resources": ["resources/pre-install/**/*", "resources/LICENSE"], "externalBin": ["resources/bin/uv"], "linux": { "appimage": { diff --git a/src-tauri/tauri.macos.conf.json b/src-tauri/tauri.macos.conf.json index 016c02105..5c5b493fa 100644 --- a/src-tauri/tauri.macos.conf.json +++ b/src-tauri/tauri.macos.conf.json @@ -11,7 +11,7 @@ }, "bundle": { "targets": ["app", "dmg"], - "resources": ["resources/pre-install/**/*"], + "resources": ["resources/pre-install/**/*", "resources/LICENSE"], "externalBin": ["resources/bin/bun", "resources/bin/uv"] } } diff --git a/src-tauri/tauri.windows.conf.json b/src-tauri/tauri.windows.conf.json index ffb6cf5e2..bc8ede344 100644 --- a/src-tauri/tauri.windows.conf.json +++ b/src-tauri/tauri.windows.conf.json @@ -13,7 +13,8 @@ "bundle": { "targets": ["nsis", "msi"], "resources": [ - "resources/pre-install/**/*" + "resources/pre-install/**/*", + "resources/LICENSE" ], "externalBin": ["resources/bin/bun", "resources/bin/uv"], "windows": {