Changeset 653

Timestamp:

Feb 27, 2025, 10:07:05 PM (10 days ago)

Author:

chronos

Message:

• Fixed: Do not pack logo images into install packages.
• Fixed: Updated flatpak packaging.
• Modified: Common Linux packaging files moved to common install directory.

Location:

tags/1.3.7/Install

Files:

• appimage/build.sh (modified) (1 diff)
• common (added)
• common/c-evo.desktop (moved) (moved from tags/1.3.7/Install/deb/c-evo.desktop )
• common/c-evo.xml (moved) (moved from tags/1.3.7/Install/deb/c-evo.xml )
• common/c-evo_1024x1024.png (moved) (moved from tags/1.3.7/Graphics/c-evo_1024x1024.png )
• common/c-evo_128x128.png (moved) (moved from tags/1.3.7/Graphics/c-evo_128x128.png )
• common/c-evo_256x256.png (moved) (moved from tags/1.3.7/Graphics/c-evo_256x256.png )
• common/c-evo_512x512.png (moved) (moved from tags/1.3.7/Graphics/c-evo_512x512.png )
• common/c-evo_64x64.png (moved) (moved from tags/1.3.7/Graphics/c-evo_64x64.png )
• deb/debian/rules (modified) (1 diff)
• flatpak/net.zdechov.app.C-evo.desktop (deleted)
• flatpak/net.zdechov.app.C-evo.metainfo.xml (moved) (moved from tags/1.3.7/Install/flatpak/net.zdechov.app.C-evo.appdata.xml )
• flatpak/net.zdechov.app.C-evo.yml (modified) (3 diffs)
• rpm/c-evo.spec (modified) (2 diffs)
• snap/snapcraft.yaml (modified) (2 diffs)

tags/1.3.7/Install/appimage/build.sh

@@ -10 +10 @@
 install -Dm644 ../../Install/flatpak/net.zdechov.app.C-evo.desktop -t AppDir
 install -Dm644 ../../Install/flatpak/net.zdechov.app.C-evo.desktop -t AppDir/usr/share/applications
-install -Dm644 ../../Install/deb/c-evo.xml -t AppDir/usr/share/mime/packages
-install -Dm644 ../../Graphics/c-evo_256x256.png AppDir/net.zdechov.app.C-evo.png
-install -Dm644 ../../Graphics/c-evo_256x256.png AppDir/usr/share/icons/hicolor/256x256/apps/net.zdechov.app.C-evo.png
-install -Dm644 ../../Graphics/c-evo_256x256.png -t AppDir/usr/share/pixmaps/application-cevo.png
-install -Dm644 ../../Graphics/c-evo_256x256.png -t AppDir/usr/share/pixmaps/application-cevomap.png
+install -Dm644 ../../Install/common/c-evo.xml -t AppDir/usr/share/mime/packages
+install -Dm644 ../../Install/common/c-evo_256x256.png AppDir/net.zdechov.app.C-evo.png
+install -Dm644 ../../Install/common/c-evo_256x256.png AppDir/usr/share/icons/hicolor/256x256/apps/net.zdechov.app.C-evo.png
+install -Dm644 ../../Install/common/c-evo_256x256.png -t AppDir/usr/share/pixmaps/application-cevo.png
+install -Dm644 ../../Install/common/c-evo_256x256.png -t AppDir/usr/share/pixmaps/application-cevomap.png
 install -Dm644 ../../AI/StdAI/libstdai-amd64.so -t AppDir/usr/share/c-evo/AI/StdAI
 install -Dm644 ../../AI/StdAI/StdAI.ai.txt -t AppDir/usr/share/c-evo/AI/StdAI

tags/1.3.7/Install/deb/debian/rules

@@ -17 +17 @@
 override_dh_auto_install:
         install -Dm755 c-evo -t $(ROOT)/usr/bin
-        install -Dm644 Install/deb/c-evo.desktop -t $(ROOT)/usr/share/applications
-        install -Dm644 Install/deb/c-evo.xml -t $(ROOT)/usr/share/mime/packages
-        install -Dm644 Graphics/c-evo_256x256.png $(ROOT)/usr/share/pixmaps/c-evo.png
-        install -Dm644 Graphics/c-evo_256x256.png $(ROOT)/usr/share/pixmaps/application-cevo.png
-        install -Dm644 Graphics/c-evo_256x256.png $(ROOT)/usr/share/pixmaps/application-cevomap.png
+        install -Dm644 Install/common/c-evo.desktop -t $(ROOT)/usr/share/applications
+        install -Dm644 Install/common/c-evo.xml -t $(ROOT)/usr/share/mime/packages
+        install -Dm644 Install/common/c-evo_256x256.png $(ROOT)/usr/share/pixmaps/c-evo.png
+        install -Dm644 Install/common/c-evo_256x256.png $(ROOT)/usr/share/pixmaps/application-cevo.png
+        install -Dm644 Install/common/c-evo_256x256.png $(ROOT)/usr/share/pixmaps/application-cevomap.png
         install -Dm644 AI/StdAI/libstdai-$(DEB_HOST_ARCH).so -t $(ROOT)/usr/share/c-evo/AI/StdAI
 

tags/1.3.7/Install/flatpak/net.zdechov.app.C-evo.yml

@@ -6 +6 @@
   - org.freedesktop.Sdk.Extension.freepascal
 command: c-evo
+rename-icon: c-evo
+rename-desktop-file: c-evo.desktop
 finish-args:
   - --socket=x11
@@ -17 +19 @@
       - type: svn
         url: https://svn.zdechov.net/c-evo/tags/1.3.7
-        revision: 651
+        revision: 653
     buildsystem: simple
     build-options:
@@ -37 +39 @@
       - install -Dm644 Language2.txt -t $FLATPAK_DEST/share/c-evo
       - install -Dm644 Fonts.txt -t $FLATPAK_DEST/share/c-evo
-      - install -Dm644 Install/flatpak/${FLATPAK_ID}.desktop -t $FLATPAK_DEST/share/applications
-      - install -Dm644 Install/deb/c-evo.xml -t $FLATPAK_DEST/share/mime/packages
-      - install -Dm644 Graphics/c-evo_256x256.png $FLATPAK_DEST/share/icons/hicolor/256x256/apps/${FLATPAK_ID}.png
-      - install -Dm644 Graphics/c-evo_256x256.png -t $FLATPAK_DEST/share/pixmaps/application-cevo.png
-      - install -Dm644 Graphics/c-evo_256x256.png -t $FLATPAK_DEST/share/pixmaps/application-cevomap.png
+      - install -Dm644 Install/common/c-evo.desktop -t $FLATPAK_DEST/share/applications
+      - install -Dm644 Install/common/c-evo.xml -t $FLATPAK_DEST/share/mime/packages
+      - install -Dm644 Install/common/c-evo_256x256.png $FLATPAK_DEST/share/icons/hicolor/256x256/apps/c-evo.png
+      - install -Dm644 Install/common/c-evo_256x256.png $FLATPAK_DEST/share/pixmaps/application-cevo.png
+      - install -Dm644 Install/common/c-evo_256x256.png $FLATPAK_DEST/share/pixmaps/application-cevomap.png
       - install -Dm644 AI/StdAI/libstdai-$STDAI_ARCH.so -t $FLATPAK_DEST/share/c-evo/AI/StdAI
       - install -Dm644 AI/StdAI/StdAI.ai.txt -t $FLATPAK_DEST/share/c-evo/AI/StdAI
       - install -Dm644 AI/StdAI/StdAI.png -t $FLATPAK_DEST/share/c-evo/AI/StdAI
-      - install -Dm644 Install/flatpak/${FLATPAK_ID}.appdata.xml $FLATPAK_DEST/share/metainfo/${FLATPAK_ID}.metainfo.xml
+      - install -Dm644 Install/flatpak/${FLATPAK_ID}.metainfo.xml -t $FLATPAK_DEST/share/metainfo
       - cp -r Graphics $FLATPAK_DEST/share/c-evo
       - cp -r Help $FLATPAK_DEST/share/c-evo

tags/1.3.7/Install/rpm/c-evo.spec

@@ -42 +42 @@
 rm -rf $RPM_BUILD_ROOT
 install -Dm755 c-evo -t $RPM_BUILD_ROOT/usr/bin
-install -Dm755 Install/deb/c-evo.desktop -t $RPM_BUILD_ROOT/usr/share/applications
-install -Dm644 Graphics/c-evo_256x256.png $RPM_BUILD_ROOT/usr/share/pixmaps/c-evo.png
+install -Dm755 Install/common/c-evo.xml -t $RPM_BUILD_ROOT/usr/share/mime/packages
+install -Dm755 Install/common/c-evo.desktop -t $RPM_BUILD_ROOT/usr/share/applications
+install -Dm644 Install/common/c-evo_256x256.png $RPM_BUILD_ROOT/usr/share/pixmaps/c-evo.png
+install -Dm644 Install/common/c-evo_256x256.png $RPM_BUILD_ROOT/usr/share/pixmaps/application-cevo.png
+install -Dm644 Install/common/c-evo_256x256.png $RPM_BUILD_ROOT/usr/share/pixmaps/application-cevomap.png
 install -Dm644 AI/StdAI/libstdai-%{_target_cpu}.so -t $RPM_BUILD_ROOT/usr/share/c-evo/AI/StdAI
 install -Dm644 AI/StdAI/StdAI.ai.txt -t $RPM_BUILD_ROOT/usr/share/c-evo/AI/StdAI
@@ -57 +60 @@
 install -d -m 755 $RPM_BUILD_ROOT/usr/share/c-evo/Localization
 cp -R Localization $RPM_BUILD_ROOT/usr/share/c-evo
-
 install -Dm644 Language.txt -t $RPM_BUILD_ROOT/usr/share/c-evo/
 install -Dm644 Language2.txt -t $RPM_BUILD_ROOT/usr/share/c-evo/

tags/1.3.7/Install/snap/snapcraft.yaml

@@ -15 +15 @@
   * And much more
 confinement: strict
-base: core22
+base: core24
 grade: stable
-icon: Graphics/c-evo_256x256.png
+icon: Install/common/c-evo_256x256.png
 license: NLPL
 
@@ -75 +75 @@
       mv AI/StdAI/libstdai.so AI/StdAI/libstdai-$SNAPCRAFT_TARGET_ARCH.so
       lazbuild --build-mode=Release Integrated.lpi
-      install -d -m 755 $SNAPCRAFT_PART_INSTALL/usr/share/c-evo
-      install -s -m 755 c-evo $SNAPCRAFT_PART_INSTALL/usr/share/c-evo
-      install -m 644 Language.txt $SNAPCRAFT_PART_INSTALL/usr/share/c-evo
-      install -m 644 Language2.txt $SNAPCRAFT_PART_INSTALL/usr/share/c-evo
-      install -m 644 Fonts.txt $SNAPCRAFT_PART_INSTALL/usr/share/c-evo
-      install -d -m 755 $SNAPCRAFT_PART_INSTALL/usr/share/applications
-      install -m 755 Install/deb/c-evo.desktop $SNAPCRAFT_PART_INSTALL/usr/share/applications
-      install -d -m 755 $SNAPCRAFT_PART_INSTALL/usr/share/mime/packages
-      install -m 644 Install/deb/c-evo.xml $SNAPCRAFT_PART_INSTALL/usr/share/mime/packages
-      install -d -m 755 $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps
-      install -m 644 Graphics/c-evo_256x256.png $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps/c-evo.png
-      install -m 644 Graphics/c-evo_256x256.png $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps/application-cevo.png
-      install -m 644 Graphics/c-evo_256x256.png $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps/application-cevomap.png
-      install -d -m 755 $SNAPCRAFT_PART_INSTALL/usr/share/c-evo/AI/StdAI
-      install -m 644 AI/StdAI/libstdai-$SNAPCRAFT_TARGET_ARCH.so $SNAPCRAFT_PART_INSTALL/usr/share/c-evo/AI/StdAI
-      install -m 644 AI/StdAI/StdAI.ai.txt $SNAPCRAFT_PART_INSTALL/usr/share/c-evo/AI/StdAI
-      install -m 644 AI/StdAI/StdAI.png $SNAPCRAFT_PART_INSTALL/usr/share/c-evo/AI/StdAI
+      install -Dm755 c-evo -t $SNAPCRAFT_PART_INSTALL/usr/bin
+      install -Dm644 Language.txt -t $SNAPCRAFT_PART_INSTALL/usr/share/c-evo
+      install -Dm644 Language2.txt -t $SNAPCRAFT_PART_INSTALL/usr/share/c-evo
+      install -Dm644 Fonts.txt -t $SNAPCRAFT_PART_INSTALL/usr/share/c-evo
+      install -Dm644 Install/common/c-evo.desktop -t $SNAPCRAFT_PART_INSTALL/usr/share/applications
+      install -Dm644 Install/common/c-evo.xml -t $SNAPCRAFT_PART_INSTALL/usr/share/mime/packages
+      install -Dm644 Install/common/c-evo_256x256.png $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps/c-evo.png
+      install -Dm644 Install/common/c-evo_256x256.png $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps/application-cevo.png
+      install -Dm644 Install/common/c-evo_256x256.png $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps/application-cevomap.png
+      install -Dm644 AI/StdAI/libstdai-$SNAPCRAFT_TARGET_ARCH.so -t $SNAPCRAFT_PART_INSTALL/usr/share/c-evo/AI/StdAI
+      install -Dm644 AI/StdAI/StdAI.ai.txt -t $SNAPCRAFT_PART_INSTALL/usr/share/c-evo/AI/StdAI
+      install -Dm644 AI/StdAI/StdAI.png -t $SNAPCRAFT_PART_INSTALL/usr/share/c-evo/AI/StdAI
       cp -r Graphics $SNAPCRAFT_PART_INSTALL/usr/share/c-evo
       cp -r Help $SNAPCRAFT_PART_INSTALL/usr/share/c-evo