fix build
This commit is contained in:
@@ -1,12 +1,10 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
ONE_FILE=false
|
|
||||||
CREATE_TAR=true
|
CREATE_TAR=true
|
||||||
|
|
||||||
while [[ $# -gt 0 ]]; do
|
while [[ $# -gt 0 ]]; do
|
||||||
case "$1" in
|
case "$1" in
|
||||||
--onefile) ONE_FILE=true; shift ;;
|
|
||||||
--no-tar) CREATE_TAR=false; shift ;;
|
--no-tar) CREATE_TAR=false; shift ;;
|
||||||
*) echo "Unknown option: $1"; exit 1 ;;
|
*) echo "Unknown option: $1"; exit 1 ;;
|
||||||
esac
|
esac
|
||||||
@@ -32,12 +30,6 @@ npm run build
|
|||||||
echo "Installing desktop build dependencies..."
|
echo "Installing desktop build dependencies..."
|
||||||
uv pip install -e ".[desktop]"
|
uv pip install -e ".[desktop]"
|
||||||
|
|
||||||
if $ONE_FILE; then
|
|
||||||
MODE="--onefile"
|
|
||||||
else
|
|
||||||
MODE="--onedir"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Packaging desktop app with PyInstaller..."
|
echo "Packaging desktop app with PyInstaller..."
|
||||||
$PYTHON -m PyInstaller \
|
$PYTHON -m PyInstaller \
|
||||||
desktop.py \
|
desktop.py \
|
||||||
@@ -45,7 +37,7 @@ $PYTHON -m PyInstaller \
|
|||||||
--clean \
|
--clean \
|
||||||
--name tono \
|
--name tono \
|
||||||
--windowed \
|
--windowed \
|
||||||
$MODE \
|
--onefile \
|
||||||
--distpath desktop-dist \
|
--distpath desktop-dist \
|
||||||
--workpath desktop-build \
|
--workpath desktop-build \
|
||||||
--specpath desktop-build \
|
--specpath desktop-build \
|
||||||
@@ -54,7 +46,8 @@ $PYTHON -m PyInstaller \
|
|||||||
--collect-all matplotlib \
|
--collect-all matplotlib \
|
||||||
--collect-all scipy \
|
--collect-all scipy \
|
||||||
--collect-all skimage \
|
--collect-all skimage \
|
||||||
--collect-all webview
|
--collect-all webview \
|
||||||
|
--copy-metadata gwyfile
|
||||||
|
|
||||||
if $CREATE_TAR; then
|
if $CREATE_TAR; then
|
||||||
TAR_PATH="desktop-dist/tono-linux.tar.gz"
|
TAR_PATH="desktop-dist/tono-linux.tar.gz"
|
||||||
|
|||||||
@@ -1,12 +1,10 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
ONE_FILE=false
|
|
||||||
CREATE_DMG=true
|
CREATE_DMG=true
|
||||||
|
|
||||||
while [[ $# -gt 0 ]]; do
|
while [[ $# -gt 0 ]]; do
|
||||||
case "$1" in
|
case "$1" in
|
||||||
--onefile) ONE_FILE=true; shift ;;
|
|
||||||
--no-dmg) CREATE_DMG=false; shift ;;
|
--no-dmg) CREATE_DMG=false; shift ;;
|
||||||
*) echo "Unknown option: $1"; exit 1 ;;
|
*) echo "Unknown option: $1"; exit 1 ;;
|
||||||
esac
|
esac
|
||||||
@@ -32,12 +30,6 @@ npm run build
|
|||||||
echo "Installing desktop build dependencies..."
|
echo "Installing desktop build dependencies..."
|
||||||
uv pip install -e ".[desktop]"
|
uv pip install -e ".[desktop]"
|
||||||
|
|
||||||
if $ONE_FILE; then
|
|
||||||
MODE="--onefile"
|
|
||||||
else
|
|
||||||
MODE="--onedir"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Packaging desktop app with PyInstaller..."
|
echo "Packaging desktop app with PyInstaller..."
|
||||||
$PYTHON -m PyInstaller \
|
$PYTHON -m PyInstaller \
|
||||||
desktop.py \
|
desktop.py \
|
||||||
@@ -45,7 +37,7 @@ $PYTHON -m PyInstaller \
|
|||||||
--clean \
|
--clean \
|
||||||
--name tono \
|
--name tono \
|
||||||
--windowed \
|
--windowed \
|
||||||
$MODE \
|
--onefile \
|
||||||
--distpath desktop-dist \
|
--distpath desktop-dist \
|
||||||
--workpath desktop-build \
|
--workpath desktop-build \
|
||||||
--specpath desktop-build \
|
--specpath desktop-build \
|
||||||
@@ -55,6 +47,7 @@ $PYTHON -m PyInstaller \
|
|||||||
--collect-all scipy \
|
--collect-all scipy \
|
||||||
--collect-all skimage \
|
--collect-all skimage \
|
||||||
--collect-all webview \
|
--collect-all webview \
|
||||||
|
--copy-metadata gwyfile \
|
||||||
--icon ../resources/icon.icns
|
--icon ../resources/icon.icns
|
||||||
|
|
||||||
APP_BUNDLE="desktop-dist/tono.app"
|
APP_BUNDLE="desktop-dist/tono.app"
|
||||||
|
|||||||
@@ -1,6 +1,3 @@
|
|||||||
param(
|
|
||||||
[switch]$OneFile
|
|
||||||
)
|
|
||||||
|
|
||||||
Set-StrictMode -Version Latest
|
Set-StrictMode -Version Latest
|
||||||
$ErrorActionPreference = "Stop"
|
$ErrorActionPreference = "Stop"
|
||||||
@@ -52,8 +49,6 @@ Write-Host "Installing desktop build dependencies..."
|
|||||||
& uv pip install -e ".[desktop]"
|
& uv pip install -e ".[desktop]"
|
||||||
Assert-LastExitCode "Desktop dependency installation"
|
Assert-LastExitCode "Desktop dependency installation"
|
||||||
|
|
||||||
$mode = if ($OneFile) { "--onefile" } else { "--onedir" }
|
|
||||||
|
|
||||||
$pyInstallerArgs = @(
|
$pyInstallerArgs = @(
|
||||||
"-m", "PyInstaller",
|
"-m", "PyInstaller",
|
||||||
"desktop.py",
|
"desktop.py",
|
||||||
@@ -61,7 +56,7 @@ $pyInstallerArgs = @(
|
|||||||
"--clean",
|
"--clean",
|
||||||
"--name", "tono",
|
"--name", "tono",
|
||||||
"--windowed",
|
"--windowed",
|
||||||
$mode,
|
"--onefile",
|
||||||
"--distpath", "desktop-dist",
|
"--distpath", "desktop-dist",
|
||||||
"--workpath", "desktop-build",
|
"--workpath", "desktop-build",
|
||||||
"--specpath", "desktop-build",
|
"--specpath", "desktop-build",
|
||||||
@@ -71,6 +66,7 @@ $pyInstallerArgs = @(
|
|||||||
"--collect-all", "scipy",
|
"--collect-all", "scipy",
|
||||||
"--collect-all", "skimage",
|
"--collect-all", "skimage",
|
||||||
"--collect-all", "webview",
|
"--collect-all", "webview",
|
||||||
|
"--copy-metadata", "gwyfile",
|
||||||
"--icon", "../resources/icon.ico"
|
"--icon", "../resources/icon.ico"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user