Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions README.es.md
Original file line number Diff line number Diff line change
Expand Up @@ -310,20 +310,20 @@ por defecto (no guarda preferencias) y avisa por stderr.

## Flatpak

Hay dos manifiestos dirigidos al runtime GNOME 51:
[packaging/flatpak](packaging/flatpak) compila desde un commit fijado y es el que
se envía a Flathub, y [build-aux/flatpak](build-aux/flatpak) compila el
directorio de trabajo. La ficha publicada vive en
El manifiesto que compila Flathub vive en
[flathub/io.github.gnacho.Scribe](https://github.com/flathub/io.github.gnacho.Scribe),
y ahí se actualiza cada versión. Los dos son YAML, y el `cargo-sources.json` que
usa `build-aux/flatpak` es un enlace simbólico a la copia canónica de
`packaging/flatpak/`, generada con
y ahí se actualiza cada versión: ese repositorio es la fuente de verdad y este no
guarda ninguna copia.

[build-aux/flatpak](build-aux/flatpak) es un manifiesto aparte que compila el
directorio de trabajo contra el runtime GNOME 51, que es lo que quieres mientras
trabajas en la aplicación. Su `cargo-sources.json` se genera con
[flatpak-cargo-generator](https://github.com/flatpak/flatpak-builder-tools/tree/master/cargo)
a partir del `Cargo.lock` commiteado:

```sh
cargo generate-lockfile
python3 flatpak-cargo-generator.py Cargo.lock -o packaging/flatpak/cargo-sources.json
python3 flatpak-cargo-generator.py Cargo.lock -o build-aux/flatpak/cargo-sources.json
cd build-aux/flatpak
flatpak-builder --user --install build-dir io.github.gnacho.Scribe.yml --force-clean
```
Expand Down
17 changes: 9 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -332,19 +332,20 @@ are not saved) and logs a warning to stderr.

## Flatpak

Two manifests target the GNOME 51 runtime: [packaging/flatpak](packaging/flatpak)
builds from a pinned git commit and is the one submitted to Flathub, while
[build-aux/flatpak](build-aux/flatpak) builds the local checkout. The published
listing lives in [flathub/io.github.gnacho.Scribe](https://github.com/flathub/io.github.gnacho.Scribe),
and that is where each release is bumped. Both are YAML, and the
`cargo-sources.json` used by `build-aux/flatpak` is a symlink to the canonical
copy in `packaging/flatpak/`, generated with
The manifest Flathub builds lives in
[flathub/io.github.gnacho.Scribe](https://github.com/flathub/io.github.gnacho.Scribe),
and that is where each release is bumped: the repository there is the source of
truth, this one keeps no copy of it.

[build-aux/flatpak](build-aux/flatpak) is a separate manifest that builds the
local checkout against the GNOME 51 runtime, which is what you want while
working on the app. Its `cargo-sources.json` is generated with
[flatpak-cargo-generator](https://github.com/flatpak/flatpak-builder-tools/tree/master/cargo)
from the committed `Cargo.lock`:

```sh
cargo generate-lockfile
python3 flatpak-cargo-generator.py Cargo.lock -o packaging/flatpak/cargo-sources.json
python3 flatpak-cargo-generator.py Cargo.lock -o build-aux/flatpak/cargo-sources.json
cd build-aux/flatpak
flatpak-builder --user --install build-dir io.github.gnacho.Scribe.yml --force-clean
```
Expand Down
1 change: 0 additions & 1 deletion build-aux/flatpak/cargo-sources.json

This file was deleted.

Loading