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
9 changes: 9 additions & 0 deletions packaging/flatpak/me.sgomez.rfirma.yml
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,8 @@ modules:
/app/share/icons/hicolor/scalable/apps/me.sgomez.rfirma.svg
- install -Dm644 src-tauri/icons/icon-symbolic.svg
/app/share/icons/hicolor/symbolic/apps/me.sgomez.rfirma-symbolic.svg
- install -Dm644 -t /app/share/licenses/me.sgomez.rfirma
EUPL-1.2.md EUPL-1.1.pdf heroicons-MIT.txt
sources:
- type: dir
path: ../../rfirma-app
Expand All @@ -360,6 +362,13 @@ modules:
path: me.sgomez.rfirma.desktop
- type: file
path: me.sgomez.rfirma.metainfo.xml
- type: file
path: ../../LICENSE.md
dest-filename: EUPL-1.2.md
- type: file
path: ../licenses/EUPL-1.1.pdf
- type: file
path: ../licenses/heroicons-MIT.txt
# Las dependencias de cargo, vendorizadas. Va AL FINAL: son 955 entradas
# y arriba estan las que se leen a mano.
- cargo-sources.json
5 changes: 5 additions & 0 deletions packaging/macos/tauri.macos.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
"bundle": {
"targets": ["app", "dmg"],
"icon": ["icons/32x32.png", "icons/128x128.png", "icons/128x128@2x.png", "icons/icon.png"],
"resources": {
"../../LICENSE.md": "licenses/EUPL-1.2.md",
"../../packaging/licenses/EUPL-1.1.pdf": "licenses/EUPL-1.1.pdf",
"../../packaging/licenses/heroicons-MIT.txt": "licenses/heroicons-MIT.txt"
},
"macOS": {
"frameworks": ["../../rfirma-native-bridge/target/lib/rfirma/librfirma_crypto.dylib"],
"infoPlist": "../../packaging/macos/Info.plist",
Expand Down
19 changes: 8 additions & 11 deletions packaging/verifica-contenido.sh
Original file line number Diff line number Diff line change
Expand Up @@ -136,17 +136,14 @@ exige_relacion() {
echo "OK $tipo $nombre"
}

# La licencia de las hojas de FacturaE que van en el binario (ADR-0051), con las demás de terceros.
case "$PAQUETE" in
*.deb | *.rpm)
licencia="$LAB/contenido/usr/share/doc/rfirma/licenses/EUPL-1.1.pdf"
if [ ! -f "$licencia" ]; then
echo "FALTA la EUPL 1.1 de las hojas de FacturaE en /usr/share/doc/rfirma/licenses" >&2
exit 1
fi
echo "OK la EUPL 1.1 de las hojas de FacturaE"
;;
esac
# La licencia de rFirma y las de terceros, en todos los formatos: la de las hojas de FacturaE (ADR-0051) y la de los iconos.
for licencia in EUPL-1.2.md EUPL-1.1.pdf heroicons-MIT.txt; do
if [ -z "$(find -L "$LAB/contenido" -path '*licenses/*' -name "$licencia")" ]; then
echo "FALTA la licencia $licencia en el paquete" >&2
exit 1
fi
echo "OK la licencia $licencia"
done

case "$PAQUETE" in
*.deb)
Expand Down
2 changes: 2 additions & 0 deletions packaging/verify-packages.test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ Recommends: opensc, pcscd
"$relations" > "$staging/DEBIAN/control"
: > "$staging/usr/lib/rfirma/librfirma_crypto.so"
: > "$staging/usr/share/doc/rfirma/licenses/EUPL-1.1.pdf"
: > "$staging/usr/share/doc/rfirma/licenses/EUPL-1.2.md"
: > "$staging/usr/share/doc/rfirma/licenses/heroicons-MIT.txt"
[ -z "$library" ] || : > "$staging/usr/lib/rfirma/$library"
dpkg-deb --build --root-owner-group "$staging" "$out" > /dev/null
}
Expand Down
5 changes: 4 additions & 1 deletion packaging/windows/tauri.windows.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
"../../rfirma-native-bridge/target/lib/rfirma/rfirma_crypto.dll": "rfirma_crypto.dll",
"target/windows-runtime/vcruntime140.dll": "vcruntime140.dll",
"target/windows-runtime/vcruntime140_1.dll": "vcruntime140_1.dll",
"target/windows-runtime/rfirma.com": "rfirma.com"
"target/windows-runtime/rfirma.com": "rfirma.com",
"../../LICENSE.md": "licenses/EUPL-1.2.md",
"../../packaging/licenses/EUPL-1.1.pdf": "licenses/EUPL-1.1.pdf",
"../../packaging/licenses/heroicons-MIT.txt": "licenses/heroicons-MIT.txt"
},
"windows": {
"webviewInstallMode": { "type": "downloadBootstrapper", "silent": true },
Expand Down
6 changes: 4 additions & 2 deletions rfirma-app/src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
"/usr/share/kio/servicemenus/rfirma-sign.desktop": "../../packaging/kde/rfirma-sign.desktop",
"/usr/share/nautilus-python/extensions/rfirma-sign.py": "../../packaging/gnome/rfirma-sign.py",
"/usr/share/doc/rfirma/licenses/heroicons-MIT.txt": "../../packaging/licenses/heroicons-MIT.txt",
"/usr/share/doc/rfirma/licenses/EUPL-1.1.pdf": "../../packaging/licenses/EUPL-1.1.pdf"
"/usr/share/doc/rfirma/licenses/EUPL-1.1.pdf": "../../packaging/licenses/EUPL-1.1.pdf",
"/usr/share/doc/rfirma/licenses/EUPL-1.2.md": "../../LICENSE.md"
},
"depends": ["libpcsclite1", "libxslt1.1"],
"recommends": ["python3-nautilus", "opensc", "pcscd"],
Expand All @@ -38,7 +39,8 @@
"/usr/share/kio/servicemenus/rfirma-sign.desktop": "../../packaging/kde/rfirma-sign.desktop",
"/usr/share/nautilus-python/extensions/rfirma-sign.py": "../../packaging/gnome/rfirma-sign.py",
"/usr/share/doc/rfirma/licenses/heroicons-MIT.txt": "../../packaging/licenses/heroicons-MIT.txt",
"/usr/share/doc/rfirma/licenses/EUPL-1.1.pdf": "../../packaging/licenses/EUPL-1.1.pdf"
"/usr/share/doc/rfirma/licenses/EUPL-1.1.pdf": "../../packaging/licenses/EUPL-1.1.pdf",
"/usr/share/doc/rfirma/licenses/EUPL-1.2.md": "../../LICENSE.md"
},
"depends": ["libpcsclite.so.1()(64bit)", "libxslt.so.1()(64bit)"],
"recommends": ["nautilus-python", "opensc", "pcsc-lite"],
Expand Down
Loading