diff --git a/DESKTOP.md b/DESKTOP.md index 7427b1e..9992311 100644 --- a/DESKTOP.md +++ b/DESKTOP.md @@ -24,23 +24,35 @@ Everything from kjvstudy.org, completely offline: ### For Development - macOS 10.15+ (Catalina or later) - Rust (install via [rustup](https://rustup.rs/)) -- Python 3.11+ -- Node.js 18+ (for Tauri CLI) +- Python 3.11+ with uv package manager +- Xcode Command Line Tools ### For Users - macOS 10.15+ (Catalina or later) - ~200MB disk space +## First-Time Setup + +```bash +# 1. Install Rust (if not already installed) +curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh +source ~/.cargo/env + +# 2. Install Tauri CLI +cargo install tauri-cli + +# 3. Verify installations +cargo --version # Should show cargo 1.x.x +cargo tauri --version # Should show tauri-cli 2.x.x +``` + ## Quick Start (Development) ```bash -# 1. Install Tauri CLI -cargo install tauri-cli - -# 2. Start the Python server (in one terminal) +# 1. Start the Python server (in one terminal) make -f Makefile.desktop dev -# 3. Run Tauri in dev mode (in another terminal) +# 2. Run Tauri in dev mode (in another terminal) make -f Makefile.desktop dev-tauri ``` diff --git a/Makefile.desktop b/Makefile.desktop index cb52ff9..a9a0697 100644 --- a/Makefile.desktop +++ b/Makefile.desktop @@ -9,7 +9,7 @@ all: install-deps bundle-python build-tauri # Install required dependencies install-deps: @echo "=== Installing dependencies ===" - pip install pyinstaller + uv pip install pyinstaller cd src-tauri && cargo fetch @echo "Dependencies installed!" diff --git a/scripts/bundle-desktop.sh b/scripts/bundle-desktop.sh index 40e2ce6..215a865 100755 --- a/scripts/bundle-desktop.sh +++ b/scripts/bundle-desktop.sh @@ -20,8 +20,8 @@ mkdir -p "$OUTPUT_DIR" # Install desktop dependencies (without weasyprint) echo "" echo "=== Installing desktop dependencies ===" -pip install pyinstaller -pip install "fastapi[standard]>=0.115.12" "ged4py>=0.5.2" "mistune>=3.0.2" "parse>=1.20.2" "python-gedcom>=1.0.0" +uv pip install pyinstaller +uv pip install "fastapi[standard]>=0.115.12" "ged4py>=0.5.2" "mistune>=3.0.2" "parse>=1.20.2" "python-gedcom>=1.0.0" # Create PyInstaller spec file echo ""