diff --git a/client-gui2 b/client-gui2 index 9ec1b9fe..449c5099 160000 --- a/client-gui2 +++ b/client-gui2 @@ -1 +1 @@ -Subproject commit 9ec1b9fe49ca8ce48ce68feb8f30fd7506ba03b9 +Subproject commit 449c50994b5e75f6039e5dd7cdfb95342f830686 diff --git a/packaging/appimage/README.md b/packaging/appimage/README.md index e172f37f..498ed281 100644 --- a/packaging/appimage/README.md +++ b/packaging/appimage/README.md @@ -29,7 +29,7 @@ packaging/appimage/build.sh ./KompAC.AppImage This performs the existing builds independently: 1. `nix build '.?submodules=1#portable-server'` -2. `yarn tauri build --bundles appimage` in `client-gui2` +2. `yarn tauri build --bundles appimage --features full-embed` in `client-gui2` 3. `assemble.sh` to add the portable server and supervisor to the GUI AppImage The standalone server and GUI build processes remain available unchanged. @@ -38,7 +38,9 @@ The standalone server and GUI build processes remain available unchanged. Already-built artifacts can be combined without rebuilding either application. The first argument may be either a completed GUI AppImage or Tauri's completed -`.AppDir` directory: +`.AppDir` directory. When combining with an embedded server, the GUI artifact +must have been built with its `full-embed` feature so it can safely place local +dump files into the bundled server's dump directory: ```sh packaging/appimage/assemble.sh \ diff --git a/packaging/appimage/build.sh b/packaging/appimage/build.sh index c66b2c97..1d60c938 100755 --- a/packaging/appimage/build.sh +++ b/packaging/appimage/build.sh @@ -31,7 +31,7 @@ trap cleanup EXIT INT TERM HUP set +e ( cd -- "$repo_root/client-gui2" - yarn tauri build --bundles appimage + yarn tauri build --bundles appimage --features full-embed ) tauri_status=$? set -e diff --git a/packaging/appimage/container-build-debian.sh b/packaging/appimage/container-build-debian.sh index 24c64c44..7b028011 100755 --- a/packaging/appimage/container-build-debian.sh +++ b/packaging/appimage/container-build-debian.sh @@ -162,11 +162,15 @@ case "$appimage_bundle_dir" in exit 1 ;; esac -echo "+ yarn tauri build --bundles appimage" +gui_features=() +if [[ "$server_db_mode" == embedded ]]; then + gui_features=(--features full-embed) +fi +echo "+ yarn tauri build --bundles appimage ${gui_features[*]}" set +e APPIMAGE_EXTRACT_AND_RUN=1 \ CARGO_TARGET_DIR=/cargo-target \ -yarn tauri build --bundles appimage +yarn tauri build --bundles appimage "${gui_features[@]}" tauri_status=$? set -e diff --git a/packaging/flatpak/com.kompac.client.yml b/packaging/flatpak/com.kompac.client.yml index 3f9bf047..b06d1223 100644 --- a/packaging/flatpak/com.kompac.client.yml +++ b/packaging/flatpak/com.kompac.client.yml @@ -100,7 +100,7 @@ modules: - cp postgresql-cache/postgresql-17.10.0-x86_64-unknown-linux-gnu.tar.gz "$HOME/.theseus/postgresql/" - cargo build --locked --release --package server --features full-embed - cd client-gui2 && corepack yarn install --frozen-lockfile --non-interactive - - cd client-gui2 && CARGO_TARGET_DIR=/run/build/komp-ac/target/gui corepack yarn tauri build --no-bundle + - cd client-gui2 && CARGO_TARGET_DIR=/run/build/komp-ac/target/gui corepack yarn tauri build --no-bundle --features full-embed - install -Dm755 /run/build/komp-ac/target/server/release/server /app/bin/komp-ac-server - install -Dm755 /run/build/komp-ac/target/gui/release/client-gui2 /app/bin/client-gui2 - install -Dm755 packaging/flatpak/launcher.sh /app/bin/komp-ac