fix: double tray icon + bundle resources pour MSI
CI / lint (push) Successful in 23s
CI / security (push) Successful in 14s
CI / test (push) Successful in 27s
CI / build (push) Successful in 6s
CI / e2e (push) Failing after 20s
Desktop Build / build-windows (push) Has been cancelled
Desktop Build / build-linux (push) Has been cancelled
CI / lint (push) Successful in 23s
CI / security (push) Successful in 14s
CI / test (push) Successful in 27s
CI / build (push) Successful in 6s
CI / e2e (push) Failing after 20s
Desktop Build / build-windows (push) Has been cancelled
Desktop Build / build-linux (push) Has been cancelled
- tauri.conf.json: supprimer trayIcon (géré par build_tray_menu dans main.rs → plus de double icône) - tauri.conf.json: ajouter bundle.resources (python-embed/**, ../backend/**, ../frontend/**) - build-windows.bat: echo ..>> dans _pth AVANT build Tauri (pour que le bundle ait le bon sys.path)
This commit is contained in:
@@ -27,6 +27,9 @@ del python-embed.zip
|
|||||||
REM Enable pip and site-packages in embedded Python
|
REM Enable pip and site-packages in embedded Python
|
||||||
echo import site >> python-embed\python311._pth
|
echo import site >> python-embed\python311._pth
|
||||||
|
|
||||||
|
REM Add parent dir to Python path so 'import backend' works at runtime (for bundle)
|
||||||
|
echo ..>> python-embed\python311._pth
|
||||||
|
|
||||||
REM Download get-pip.py (embed Python doesn't include ensurepip)
|
REM Download get-pip.py (embed Python doesn't include ensurepip)
|
||||||
echo 📥 Downloading get-pip.py...
|
echo 📥 Downloading get-pip.py...
|
||||||
curl -L -o get-pip.py "https://bootstrap.pypa.io/get-pip.py"
|
curl -L -o get-pip.py "https://bootstrap.pypa.io/get-pip.py"
|
||||||
|
|||||||
@@ -28,12 +28,6 @@
|
|||||||
],
|
],
|
||||||
"security": {
|
"security": {
|
||||||
"csp": "default-src 'self' http://127.0.0.1:*; script-src 'self' 'unsafe-inline' 'unsafe-eval' http://127.0.0.1:* https://cdn.jsdelivr.net https://cdnjs.cloudflare.com https://unpkg.com https://esm.sh; style-src 'self' 'unsafe-inline' http://127.0.0.1:* https://cdnjs.cloudflare.com https://fonts.googleapis.com; font-src 'self' http://127.0.0.1:* https://fonts.gstatic.com; img-src 'self' data: blob: http://127.0.0.1:* https:; connect-src 'self' http://127.0.0.1:* ws://127.0.0.1:*;"
|
"csp": "default-src 'self' http://127.0.0.1:*; script-src 'self' 'unsafe-inline' 'unsafe-eval' http://127.0.0.1:* https://cdn.jsdelivr.net https://cdnjs.cloudflare.com https://unpkg.com https://esm.sh; style-src 'self' 'unsafe-inline' http://127.0.0.1:* https://cdnjs.cloudflare.com https://fonts.googleapis.com; font-src 'self' http://127.0.0.1:* https://fonts.gstatic.com; img-src 'self' data: blob: http://127.0.0.1:* https:; connect-src 'self' http://127.0.0.1:* ws://127.0.0.1:*;"
|
||||||
},
|
|
||||||
"trayIcon": {
|
|
||||||
"iconPath": "icons/icon.png",
|
|
||||||
"iconAsTemplate": true,
|
|
||||||
"tooltip": "ObsiGate",
|
|
||||||
"menuOnLeftClick": false
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"bundle": {
|
"bundle": {
|
||||||
@@ -46,6 +40,11 @@
|
|||||||
"icons/icon.icns",
|
"icons/icon.icns",
|
||||||
"icons/icon.ico"
|
"icons/icon.ico"
|
||||||
],
|
],
|
||||||
|
"resources": [
|
||||||
|
"python-embed/**/*",
|
||||||
|
"../backend/**/*",
|
||||||
|
"../frontend/**/*"
|
||||||
|
],
|
||||||
"fileAssociations": [
|
"fileAssociations": [
|
||||||
{
|
{
|
||||||
"ext": ["md", "markdown", "txt"],
|
"ext": ["md", "markdown", "txt"],
|
||||||
|
|||||||
Reference in New Issue
Block a user