Changeset 113 for tags/1.1.1/Install


Ignore:
Timestamp:
Jan 13, 2025, 11:28:26 PM (8 months ago)
Author:
chronos
Message:

Merged revision(s) 107-112 from trunk:

  • Fixed: Full screen mode switching on Windows.
  • Modified: Updated Common package.
  • Modified: Improved flatpak packaging files.
  • Fixed: Flatpak desktop file name.
  • Fixed: Languages directory detection on Linux.
Location:
tags/1.1.1
Files:
3 deleted
4 edited
1 copied

Legend:

Unmodified
Added
Removed

  • tags/1.1.1

  • tags/1.1.1/Install/common/Tunneler.desktop

    r63 r113  
    77Terminal=false
    88Type=Application
    9 Categories=GNOME;Application;Game;
     9Categories=Game;ActionGame;Shooter
    1010StartupNotify=true
     11Keywords=digging;tunnel;tanks;multiplayer;shooting;battle

  • tags/1.1.1/Install/flatpak/build.sh

    r97 r113  
    22set -x
    33
    4 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 ../.. .
    5 
    64BUILD_DIR=build
     5REPO_DIR=repo
    76FLATPAK_ID=net.zdechov.app.Tunneler
    87
    98# Install dependencies
    10 flatpak install flathub org.kde.Sdk//5.15-23.08
    11 flatpak install flathub org.kde.Platform//5.15-23.08
    12 flatpak install flathub org.freedesktop.Sdk.Extension.freepascal//23.08
     9flatpak install --system flathub org.kde.Sdk//5.15-24.08
     10flatpak install --system flathub org.kde.Platform//5.15-24.08
     11flatpak install --system flathub org.freedesktop.Sdk.Extension.freepascal//24.08
     12flatpak install --system flathub org.flatpak.Builder
    1313
    1414# Build
    15 flatpak-builder --force-clean $BUILD_DIR $FLATPAK_ID.yml
    16 
    17 # Build bundle
    18 flatpak build-export export build
    19 flatpak build-bundle export Tunneler.flatpak $FLATPAK_ID
    20 
    21 # Install
    22 flatpak-builder --user --install --force-clean $BUILD_DIR $FLATPAK_ID.yml
     15flatpak 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
    2316
    2417# Run
    2518flatpak run $FLATPAK_ID
     19# Linter
     20flatpak run --command=flatpak-builder-lint org.flatpak.Builder manifest $FLATPAK_ID.yml
     21flatpak run --command=flatpak-builder-lint org.flatpak.Builder repo $REPO_DIR

  • tags/1.1.1/Install/flatpak/net.zdechov.app.Tunneler.metainfo.xml

    r112 r113  
    4040    <screenshot type="default">
    4141      <caption>Gameplay</caption>
    42       <image>https://svn.zdechov.net/Tunneler/trunk/Images/Screenshots/Gameplay.png</image>
     42      <image>https://svn.zdechov.net/Tunneler/tags/1.1.1/Images/Screenshots/Gameplay.png</image>
    4343    </screenshot>
    4444  </screenshots>

  • tags/1.1.1/Install/flatpak/net.zdechov.app.Tunneler.yml

    r96 r113  
    11app-id: net.zdechov.app.Tunneler
    22runtime: org.kde.Platform
    3 runtime-version: '5.15-23.08'
     3runtime-version: '5.15-24.08'
    44sdk: org.kde.Sdk
    55sdk-extensions:
    66  - org.freedesktop.Sdk.Extension.freepascal
    77command: Tunneler
     8rename-icon: Tunneler
     9rename-desktop-file: Tunneler.desktop
    810finish-args:
    911  - --share=ipc
    … …  
    2527  - name: Tunneler
    2628    sources:
    27       - type: archive
    28         path: tunneler.tar.gz
     29      - type: svn
     30        url: https://svn.zdechov.net/Tunneler/tags/1.1.1
     31        revision: r113
    2932    buildsystem: simple
    3033    build-commands:
    31       - (. /usr/lib/sdk/freepascal/enable.sh && lazbuild --build-mode=Release --ws=qt5 tunneler.lpi)
    32       - install -d -m 755 $FLATPAK_DEST/share/Tunneler
    33       - install -s -m 755 Tunneler $FLATPAK_DEST/share/Tunneler
    34       - install -d -m 755 $FLATPAK_DEST/bin
    35       - ln -s $FLATPAK_DEST/share/Tunneler/Tunneler $FLATPAK_DEST/bin/Tunneler
    36       - install -d -m 755 $FLATPAK_DEST/share/applications
    37       - install -m 755 Install/flatpak/${FLATPAK_ID}.desktop $FLATPAK_DEST/share/applications
    38       - install -d -m 755 $FLATPAK_DEST/share/icons/hicolor/256x256/apps
    39       - install -m 644 Images/256x256/Tunneler.png $FLATPAK_DEST/share/icons/hicolor/256x256/apps/${FLATPAK_ID}.png
    40       - install -d -m 755 $FLATPAK_DEST/share/Tunneler/Languages
    41       - install -D -m 755 Languages/*.pot $FLATPAK_DEST/share/Tunneler/Languages
    42       - install -D -m 755 Languages/*.po $FLATPAK_DEST/share/Tunneler/Languages
    43       - install -d -m 755 $FLATPAK_DEST/share/Tunneler/Audio
    44       - install -D -m 755 Audio/*.wav $FLATPAK_DEST/share/Tunneler/Audio
    45       - install -d -m 755 $FLATPAK_DEST/share/metainfo
    46       - install -D Install/flatpak/${FLATPAK_ID}.appdata.xml $FLATPAK_DEST/share/metainfo/${FLATPAK_ID}.metainfo.xml
     34      - |
     35        . /usr/lib/sdk/freepascal/enable.sh
     36        lazbuild --build-mode=Release --ws=qt5 tunneler.lpi
     37      - install -Dm755 Tunneler -t $FLATPAK_DEST/bin
     38      - install -Dm644 Install/common/Tunneler.desktop -t $FLATPAK_DEST/share/applications
     39      - install -Dm644 Images/256x256/Tunneler.png -t $FLATPAK_DEST/share/icons/hicolor/256x256/apps
     40      - install -Dm644 Languages/*.po -t $FLATPAK_DEST/share/Tunneler/Languages
     41      - install -Dm644 Packages/Common/Languages/*.po -t $FLATPAK_DEST/share/Tunneler/Languages
     42      - install -Dm644 Audio/*.wav -t $FLATPAK_DEST/share/Tunneler/Audio
     43      - install -Dm644 Install/flatpak/${FLATPAK_ID}.metainfo.xml -t $FLATPAK_DEST/share/metainfo
Note: See TracChangeset for help on using the changeset viewer.