Changeset 108

Timestamp:

Jan 13, 2025, 10:48:36 PM (9 days ago)

Author:

chronos

Message:

• Modified: Improved flatpak packaging files.

Location:

trunk

Files:

• Install/common/Tunneler.desktop (modified) (1 diff)
• Install/flatpak/build.sh (modified) (1 diff)
• Install/flatpak/flathub (deleted)
• Install/flatpak/net.zdechov.app.Tunneler.desktop (deleted)
• Install/flatpak/net.zdechov.app.Tunneler.metainfo.xml (moved) (moved from trunk/Install/flatpak/net.zdechov.app.Tunneler.appdata.xml ) (4 diffs)
• Install/flatpak/net.zdechov.app.Tunneler.yml (modified) (2 diffs)
• Languages/FormAbout.cs.po (deleted)
• Languages/FormAbout.pot (deleted)
• Read me.txt (modified) (1 diff)

trunk/Install/common/Tunneler.desktop

@@ -7 +7 @@
 Terminal=false
 Type=Application
-Categories=GNOME;Application;Game;
+Categories=Game;ActionGame;Shooter
 StartupNotify=true
+Keywords=digging;tunnel;tanks;multiplayer;shooting;battle

trunk/Install/flatpak/build.sh

@@ -2 +2 @@
 set -x
 
-tar --exclude='./Install/flatpak/build' --exclude='./Install/flatpak/export' --exclude='./Install/flatpak/.flatpak-builder' --exclude='./lib' --exclude='./Install/flatpak/tunneler.tar.gz' --exclude='./Install/flatpak/flathub' -zcvf tunneler.tar.gz -C ../.. .
-
 BUILD_DIR=build
+REPO_DIR=repo
 FLATPAK_ID=net.zdechov.app.Tunneler
 
 # Install dependencies
-flatpak install flathub org.kde.Sdk//5.15-23.08
-flatpak install flathub org.kde.Platform//5.15-23.08
-flatpak install flathub org.freedesktop.Sdk.Extension.freepascal//23.08
+flatpak install --system flathub org.kde.Sdk//5.15-24.08
+flatpak install --system flathub org.kde.Platform//5.15-24.08
+flatpak install --system flathub org.freedesktop.Sdk.Extension.freepascal//24.08
+flatpak install --system flathub org.flatpak.Builder
 
 # Build
-flatpak-builder --force-clean $BUILD_DIR $FLATPAK_ID.yml
-
-# Build bundle
-flatpak build-export export build
-flatpak build-bundle export Tunneler.flatpak $FLATPAK_ID
-
-# Install
-flatpak-builder --user --install --force-clean $BUILD_DIR $FLATPAK_ID.yml
+flatpak run org.flatpak.Builder --force-clean --sandbox --user --install --ccache --mirror-screenshots-url=https://dl.flathub.org/media/ --repo=$REPO_DIR $BUILD_DIR $FLATPAK_ID.yml
 
 # Run
 flatpak run $FLATPAK_ID
+# Linter
+flatpak run --command=flatpak-builder-lint org.flatpak.Builder manifest $FLATPAK_ID.yml
+flatpak run --command=flatpak-builder-lint org.flatpak.Builder repo $REPO_DIR

trunk/Install/flatpak/net.zdechov.app.Tunneler.metainfo.xml

@@ -4 +4 @@
 
   <name>Tunneler</name>
-  <summary>A tank digging battle game</summary>
-  <developer_name>Chronos</developer_name>
+  <summary>Tank digging battle game</summary>
+  <developer id="net.zdechov.chronos">
+    <name>Chronos</name>
+  </developer>
 
   <url type="homepage">https://app.zdechov.net/Tunneler/</url>
+  <url type="contact">https://app.zdechov.net/Tunneler#Contact</url>
+  <url type="vcs-browser">https://app.zdechov.net/Tunneler/browser</url>
 
   <metadata_license>CC0-1.0</metadata_license>
@@ -15 +19 @@
     <p>
       This is a remake of the famous MS-DOS Tunneler game originally written in Pascal language. ​https://tunneler.org/
-      Now it has been written from scratch in Lazarus/FPC to run natively on Linux and Windows.
+      Now it has been written from scratch in Lazarus/FPC to run natively on both Linux and Windows.
     </p>
     <ul>
       <li>Up to 8 players</li>
-      <li>Configurable player keys </li>
+      <li>Configurable player keys</li>
       <li>Many sample maps included</li>
       <li>Multi-language support (English, Czech)</li>
@@ -28 +32 @@
   <launchable type="desktop-id">net.zdechov.app.Tunneler.desktop</launchable>
 
+  <branding>
+    <color type="primary" scheme_preference="light">#cdab8f</color>
+    <color type="primary" scheme_preference="dark">#63452c</color>
+  </branding>
+
   <screenshots>
     <screenshot type="default">
       <caption>Gameplay</caption>
-      <image>http://svn.zdechov.net/Tunneler/trunk/Images/Screenshots/Gameplay.png</image>
+      <image>https://svn.zdechov.net/Tunneler/trunk/Images/Screenshots/Gameplay.png</image>
     </screenshot>
   </screenshots>
@@ -68 +77 @@
   <categories>
     <category>Game</category>
+    <category>ActionGame</category>
+    <category>Shooter</category>
   </categories>
 

trunk/Install/flatpak/net.zdechov.app.Tunneler.yml

@@ -1 +1 @@
 app-id: net.zdechov.app.Tunneler
 runtime: org.kde.Platform
-runtime-version: '5.15-23.08'
+runtime-version: '5.15-24.08'
 sdk: org.kde.Sdk
 sdk-extensions:
   - org.freedesktop.Sdk.Extension.freepascal
 command: Tunneler
+rename-icon: Tunneler
+rename-desktop-file: tuneller.desktop
 finish-args:
   - --share=ipc
@@ -25 +27 @@
   - name: Tunneler
     sources:
-      - type: archive
-        path: tunneler.tar.gz
+      - type: svn
+        url: https://svn.zdechov.net/Tunneler/trunk
+        revision: 108
     buildsystem: simple
     build-commands:
-      - (. /usr/lib/sdk/freepascal/enable.sh && lazbuild --build-mode=Release --ws=qt5 tunneler.lpi)
-      - install -d -m 755 $FLATPAK_DEST/share/Tunneler
-      - install -s -m 755 Tunneler $FLATPAK_DEST/share/Tunneler
-      - install -d -m 755 $FLATPAK_DEST/bin
-      - ln -s $FLATPAK_DEST/share/Tunneler/Tunneler $FLATPAK_DEST/bin/Tunneler
-      - install -d -m 755 $FLATPAK_DEST/share/applications
-      - install -m 755 Install/flatpak/${FLATPAK_ID}.desktop $FLATPAK_DEST/share/applications
-      - install -d -m 755 $FLATPAK_DEST/share/icons/hicolor/256x256/apps
-      - install -m 644 Images/256x256/Tunneler.png $FLATPAK_DEST/share/icons/hicolor/256x256/apps/${FLATPAK_ID}.png
-      - install -d -m 755 $FLATPAK_DEST/share/Tunneler/Languages
-      - install -D -m 755 Languages/*.pot $FLATPAK_DEST/share/Tunneler/Languages
-      - install -D -m 755 Languages/*.po $FLATPAK_DEST/share/Tunneler/Languages
-      - install -d -m 755 $FLATPAK_DEST/share/Tunneler/Audio
-      - install -D -m 755 Audio/*.wav $FLATPAK_DEST/share/Tunneler/Audio
-      - install -d -m 755 $FLATPAK_DEST/share/metainfo
-      - install -D Install/flatpak/${FLATPAK_ID}.appdata.xml $FLATPAK_DEST/share/metainfo/${FLATPAK_ID}.metainfo.xml
+      - |
+        . /usr/lib/sdk/freepascal/enable.sh
+        lazbuild --build-mode=Release --ws=qt5 tunneler.lpi
+      - install -Dm755 Tunneler -t $FLATPAK_DEST/bin
+      - install -Dm644 Install/common/Tunneler.desktop -t $FLATPAK_DEST/share/applications
+      - install -Dm644 Images/256x256/Tunneler.png -t $FLATPAK_DEST/share/icons/hicolor/256x256/apps
+      - install -Dm644 Languages/*.po -t $FLATPAK_DEST/share/Tunneler/Languages
+      - install -Dm644 Common/Languages/*.po -t $FLATPAK_DEST/share/Tunneler/Languages
+      - install -Dm644 Audio/*.wav -t $FLATPAK_DEST/share/Tunneler/Audio
+      - install -Dm644 Install/flatpak/${FLATPAK_ID}.metainfo.xml -t $FLATPAK_DEST/share/metainfo

trunk/Read me.txt

@@ -1 @@
-Developed using Lazarus 2.2.4 (http://www.lazarus-ide.org/)
+Developed using Lazarus 3.6.0 (https://www.lazarus-ide.org/)