Überarbeitete metainfo und readme

* metainfo.xml
 * BSD-3-Clause

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "arch-pkg"]
+	path = arch-pkg
+	url = ssh://aur@aur.archlinux.org/tigerjython.git

LICENCE

@@ -0,0 +1,7 @@
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ * Neither the name of the author nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Makefile

@@ -1,13 +0,0 @@
-# src https://www.pragmaticlinux.com/2021/01/create-a-man-page-for-your-own-program-or-script-with-pandoc/
-man:
-	pandoc man/tigerjython.md -s -t man | gzip > man/tigerjython.1.gz
-tar.gz: man
-	mkdir -p TigerJython/man
-	cp man/tigerjython.1.gz TigerJython/man
-	tar -czf TigerJython.tar.gz TigerJython
-arch:
-	cd arch-pkg && makepkg
-arch-local: tar.gz
-	cd arch-local-pkg && makepkg
-deb: tar.gz
-	cd debian-deb && sh makedeb.sh

README.md

@@ -1,18 +1,15 @@
 # TigerJython Paketierung
 
-Dieses Repo soll helfen TigerJython für Arch oder Debian zu paketieren.
+Dieses Repo soll helfen TigerJython für Arch, Debian oder Flatpak zu paketieren.
 
-## Ordnerstruktur
+## Builds
 
-Im Repository sind folgende Ordner:
-
- * arch-pkg: paketierung für ArchLinux
- * debian-deb: Paketierung für Debian
- * flatpak: Paketierung für flatpak
- * man: Manual (Basierend auf dem Readme.txt)
- * TigerJython: Quelldateien
- * TigerJython.tar.gz: Tarball von TigerJython
+An folgenden Orten kann man die TigerJython von diesem Repo herunterladen:
 
+ * Arch Linux: https://aur.archlinux.org/packages/tigerjython
+ * Flatpak: https://flathub.org/apps/ch.tigerjython.TigerJython2
+ * Debian: https://git.jdmweb2.ch/beat/-/packages/debian/tigerjython
+ 
 ## Logo
 
 Das vektorisierte Logo stammt von [Pixabay](https://pixabay.com/de/vectors/fu%C3%9Fabdruck-tier-pelzig-pfote-308794/)

arch-local-pkg/PKGBUILD

@@ -1,35 +0,0 @@
-# Maintainer: Beat Jäckle <beat at git dot jdmweb2 dot ch>
-
-pkgname=tigerjython
-pkgver=2.37
-pkgrel=2
-#pkgrel=5
-pkgdesc='TigerJython IDE'
-arch=(x86_64)
-url='https://www.tigerjython.ch/'
-license=('custom')
-depends=('java-runtime>=2')
-source=("TigerJython.tar.gz")
-b2sums=('SKIP')
-_install_path=/usr/share
-
-build() {
-    sed -i "s|/opt/${pkgname}|${_install_path}/${pkgname}|g" TigerJython/tigerjython.desktop
-    sed -i "s|/opt/${pkgname}|${_install_path}/${pkgname}|g" TigerJython/tigerjython
-}
-
-package() {
-    install -Ddm755 "${pkgdir}/${_install_path}/${pkgname}/Lib"
-    install -Ddm755 "${pkgdir}/${_install_path}/${pkgname}/TestSamples"
-    install -Ddm755 "${pkgdir}/usr/share/man/man1/"
-
-    install -Dm644 "${srcdir}/TigerJython/tigerjython2.jar" "${pkgdir}/${_install_path}/${pkgname}/."
-    install -Dm644 "${srcdir}/TigerJython/Lib/"* "${pkgdir}/${_install_path}/${pkgname}/Lib/."
-    install -Dm644 "${srcdir}/TigerJython/TestSamples/"* "${pkgdir}/${_install_path}/${pkgname}/TestSamples/."
-
-    install -Dm644 "${srcdir}/TigerJython/man/tigerjython.1.gz" "${pkgdir}/usr/share/man/man1/"
-
-    install -Dm755 "${srcdir}/TigerJython/tigerjython" "${pkgdir}/usr/bin/tigerjython"
-    install -Dm755 "${srcdir}/TigerJython/tigerjython.desktop" "${pkgdir}/usr/share/applications/tigerjython.desktop"
-    install -Dm755 "${srcdir}/TigerJython/tigerjython.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/tigerjython.svg"
-}

arch-local-pkg/TigerJython.tar.gz

@@ -1 +0,0 @@
-../TigerJython.tar.gz

arch-pkg/PKGBUILD

@@ -1,60 +0,0 @@
-# Maintainer: Beat Jäckle <beat@git.jdmweb2.ch>
-
-pkgname=tigerjython
-pkgver=2.37
-pkgrel=5
-pkgdesc='TigerJython IDE'
-arch=(x86_64)
-url='https://www.tigerjython.ch/'
-license=('custom')
-depends=(
-    'java-runtime>=2'
-)
-makedepends=('tar' 'gzip')
-
-# https://pixabay.com/de/vectors/fu%C3%9Fabdruck-tier-pelzig-pfote-308794/
-source=("https://www.tigerjython.ch/user/pages/download/TigerJython.tar.gz" 'http://jython.tobiaskohn.ch/images/TigerJython_Logo.png')
-b2sums=('32181780c1b1a86e7e151e01cf0428726f3c7ccd8c27db9d64cac4b03c1b8a0ae8e32fb029e9d32d3d1baf196f6874418d6a394e8b503bc454fdc367bbf2f01e'
-    '4ae37420b11b7dd5e7ceb9c00fb48c6f575d6658b0cb0963e38155e79af5ba0cfaf1d00da8c278a6dcf5ae6615bf86b298dabca3c827fb7c80d1c55302a58dc7')
-_install_path=/opt
-
-prepare() {
-    rm -fr "$pkgname-$pkgver"
-    mv TigerJython/bin "$pkgname-$pkgver"
-    mv TigerJython/Readme.txt "$pkgname-$pkgver"
-    rm -r TigerJython
-    cd "$pkgname-$pkgver"
-    rm -r ./jre
-    find -name ._\* -delete
-    find -name .DS_Store -delete
-}
-
-build() {
-    echo "#!/bin/sh" > "${srcdir}/tigerjython"
-    echo "set -ue" >> "${srcdir}/tigerjython"
-    echo "java -jar ${_install_path}/${pkgname}/tigerjython2.jar \$@" >> "${srcdir}/tigerjython"
-
-    _desktopfile_path="${srcdir}/tigerjython.desktop"
-    echo "[Desktop Entry]" > ${_desktopfile_path}
-    echo "Name=${pkgdesc}" >> ${_desktopfile_path}
-    echo "Exec=java -jar ${_install_path}/${pkgname}/tigerjython2.jar" >> ${_desktopfile_path}
-    echo "Icon=tigerjython" >> ${_desktopfile_path}
-    echo "Type=Application" >> ${_desktopfile_path}
-    echo "Categories=Education;Science;Math;" >> ${_desktopfile_path}
-    echo "Keywords=science;math;matrix;plotting;" >> ${_desktopfile_path}
-
-}
-
-package() {
-
-     install -Ddm755 "${pkgdir}/${_install_path}/${pkgname}/Lib"
-     install -Ddm755 "${pkgdir}/${_install_path}/${pkgname}/TestSamples"
-
-    install -Dm644 "${srcdir}/$pkgname-$pkgver/tigerjython2"* "${pkgdir}/${_install_path}/${pkgname}/."
-    install -Dm644 "${srcdir}/$pkgname-$pkgver/Lib/"* "${pkgdir}/${_install_path}/${pkgname}/Lib/."
-    install -Dm644 "${srcdir}/$pkgname-$pkgver/TestSamples/"* "${pkgdir}/${_install_path}/${pkgname}/TestSamples/."
-
-    install -Dm755 "${srcdir}/tigerjython" "${pkgdir}/usr/bin/tigerjython"
-    install -Dm755 "${srcdir}/tigerjython.desktop" "${pkgdir}/usr/share/applications/tigerjython.desktop"
-    install -Dm755 "${srcdir}/../tigerjython.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/tigerjython.svg"
-}

ch.tigerjython.TigerJython2.metainfo.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+  <id>ch.tigerjython.TigerJython2</id>
+
+  <name>TigerJython</name>
+  <summary>Python IDE for schools</summary>
+  <summary xml:lang="de">Python IDE für Schulen</summary>
+  <developer id="ch.tjgroup">
+    <name>TJ Group</name>
+  </developer>
+
+  <metadata_license>FSFAP</metadata_license>
+  <project_license>BSD-3-Clause</project_license>
+
+  <recommends>
+    <display_length compare="ge">482</display_length>
+  </recommends>
+
+  <description>
+    <p>
+      TigerJython is a free development environment for the Python programming language. If you want to learn programming, this is the tool for you. It already includes everything you need to start programming right away.
+    </p>
+    <p xml:lang="de">
+      TigerJython ist eine einfache Programmier-Umgebung für Python. Sie basiert auf Jython (Java-Python) und enthält bereits alle benötigten Bibliotheken.
+    </p>
+  </description>
+
+  <launchable type="desktop-id">ch.tigerjython.TigerJython2.desktop</launchable>
+  <content_rating type="oars-1.1"/>
+  <releases>
+    <release version="2.40" date="2024-09-05">
+      <url type="details">https://tigerjython.ch/products/download</url>
+      <description>
+        <p>Version 2.40 [Sept-05-2024]</p>
+          <ul>
+            <li>mbrobot and mbrobot_plusV2: Calibration of motors</li>
+          </ul>
+      </description>
+    </release>
+    <release version="2.39" date="2024-01-01">
+    <url type="details">https://tigerjython.ch/products/download</url>
+    <description>
+      <p>Version 2.39 [Jan-01-2024]</p>
+        <ul>
+          <li>Module Callibot: Support for servomotors (Maqueen Mechanic)</li>
+          <li>Update of documentation</li>
+        </ul>
+      </description>
+    </release>
+  </releases>
+  <url type="homepage">https://www.tigerjython.ch/</url>
+  <screenshots>
+    <screenshot type="default">
+      <caption>Main window with an example python file open.</caption>
+      <image>https://git.jdmweb2.ch/beat/tigerjython_pkg/raw/branch/main/screenshots/tigerjython_2_40.png</image>
+      <image xml:lang="de">https://git.jdmweb2.ch/beat/tigerjython_pkg/raw/branch/main/screenshots/tigerjython_2_40_de.png</image>
+    </screenshot>
+  </screenshots>
+  <branding>
+    <color type="primary" scheme_preference="light">#f37b1e</color>
+    <color type="primary" scheme_preference="dark">#040507</color>
+  </branding>
+</component>

debian-deb/PKGBUILD

@@ -1,60 +0,0 @@
-# Maintainer: Beat Jäckle <beat@git.jdmweb2.ch>
-
-pkgname=tigerjython
-pkgver=2.37
-pkgrel=4
-pkgdesc='TigerJython IDE'
-arch=(x86_64)
-url='https://www.tigerjython.ch/'
-license=('custom')
-depends=(
-    'jre-openjdk>=2'
-)
-makedepends=('tar' 'gzip')
-
-# https://pixabay.com/de/vectors/fu%C3%9Fabdruck-tier-pelzig-pfote-308794/
-source=("https://www.tigerjython.ch/user/pages/download/TigerJython.tar.gz" 'http://jython.tobiaskohn.ch/images/TigerJython_Logo.png')
-b2sums=('32181780c1b1a86e7e151e01cf0428726f3c7ccd8c27db9d64cac4b03c1b8a0ae8e32fb029e9d32d3d1baf196f6874418d6a394e8b503bc454fdc367bbf2f01e'
-    '4ae37420b11b7dd5e7ceb9c00fb48c6f575d6658b0cb0963e38155e79af5ba0cfaf1d00da8c278a6dcf5ae6615bf86b298dabca3c827fb7c80d1c55302a58dc7')
-_install_path=/opt
-
-prepare() {
-    rm -fr "$pkgname-$pkgver"
-    mv TigerJython/bin "$pkgname-$pkgver"
-    mv TigerJython/Readme.txt "$pkgname-$pkgver"
-    rm -r TigerJython
-    cd "$pkgname-$pkgver"
-    rm -r ./jre
-    find -name ._\* -delete
-    find -name .DS_Store -delete
-}
-
-build() {
-    echo "#!/bin/sh" > "${srcdir}/tigerjython"
-    echo "set -ue" >> "${srcdir}/tigerjython"
-    echo "java -jar ${_install_path}/${pkgname}/tigerjython2.jar \$@" >> "${srcdir}/tigerjython"
-
-    _desktopfile_path="${srcdir}/tigerjython.desktop"
-    echo "[Desktop Entry]" > ${_desktopfile_path}
-    echo "Name=${pkgdesc}" >> ${_desktopfile_path}
-    echo "Exec=java -jar ${_install_path}/${pkgname}/tigerjython2.jar" >> ${_desktopfile_path}
-    echo "Icon=tigerjython" >> ${_desktopfile_path}
-    echo "Type=Application" >> ${_desktopfile_path}
-    echo "Categories=Education;Science;Math;" >> ${_desktopfile_path}
-    echo "Keywords=science;math;matrix;plotting;" >> ${_desktopfile_path}
-
-}
-
-package() {
-
-     install -Ddm755 "${pkgdir}/${_install_path}/${pkgname}/Lib"
-     install -Ddm755 "${pkgdir}/${_install_path}/${pkgname}/TestSamples"
-
-    install -Dm644 "${srcdir}/$pkgname-$pkgver/tigerjython2"* "${pkgdir}/${_install_path}/${pkgname}/."
-    install -Dm644 "${srcdir}/$pkgname-$pkgver/Lib/"* "${pkgdir}/${_install_path}/${pkgname}/Lib/."
-    install -Dm644 "${srcdir}/$pkgname-$pkgver/TestSamples/"* "${pkgdir}/${_install_path}/${pkgname}/TestSamples/."
-
-    install -Dm755 "${srcdir}/tigerjython" "${pkgdir}/usr/bin/tigerjython"
-    install -Dm755 "${srcdir}/tigerjython.desktop" "${pkgdir}/usr/share/applications/tigerjython.desktop"
-    install -Dm755 "${srcdir}/../tigerjython.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/tigerjython.svg"
-}

debian-deb/makedeb.sh

@@ -1,33 +0,0 @@
-#!/bin/bash
-set -ue
-# Src:
-# https://earthly.dev/blog/creating-and-hosting-your-own-deb-packages-and-apt-repo/
-
-. PKGBUILD
-
-srcdir="${PWD}/src"
-pkgdir="${PWD}/${pkgname}_${pkgver}-${pkgrel}_${arch}"
-rootdir="${PWD}"
-mkdir -p "${srcdir}"
-cd "${srcdir}"
-wget -c https://www.tigerjython.ch/user/pages/download/TigerJython.tar.gz
-# if ! [ -f TigerJython.tar.gz ];then wget https://www.tigerjython.ch/user/pages/download/TigerJython.tar.gz;fi
-tar -xf TigerJython.tar.gz
-prepare
-
-build
-
-mkdir -p "${pkgdir}"
-cd "${pkgdir}"
-package
-
-mkdir -p ${pkgdir}/DEBIAN
-echo "Package: ${pkgname}
-Version: ${pkgver}
-Maintainer: Beat Jäckle <beat@git.jdmweb2.ch>
-Depends: default-jre
-Architecture: amd64
-Homepage: ${url}
-Description: ${pkgdesc}" \
-> ${pkgdir}/DEBIAN/control
-fakeroot dpkg --build ${pkgdir}

flatpak/Makefile

@@ -1,6 +0,0 @@
-build:
-	flatpak-builder --install --user --force-clean build-dir ch.tigerjython.TigerJython2.yml
-run:
-	flatpak run --nosocket=fallback-x11 --socket=x11 ch.tigerjython.TigerJython2
-sh:
-	flatpak run --command=sh ch.tigerjython.TigerJython2

flatpak/TigerJython.tar.gz

@@ -1 +0,0 @@
-../TigerJython.tar.gz

flatpak/ch.tigerjython.TigerJython2.yml

@@ -1,43 +0,0 @@
-id: ch.tigerjython.TigerJython2
-runtime: org.freedesktop.Platform
-# runtime: org.freedesktop.Sdk.Extension.openjdk
-runtime-version: '23.08'
-sdk: org.freedesktop.Sdk
-sdk-extensions:
-  - org.freedesktop.Sdk.Extension.openjdk
-modules:
-  - name: openjdk
-    buildsystem: simple
-    build-commands:
-      - /usr/lib/sdk/openjdk/install.sh
-  - name: tigerjython2
-    buildsystem: simple
-    build-commands:
-      - install -Ddm755 /app/tigerjython/Lib
-      - install -Ddm755 /app/tigerjython/TestSamples
-      - sed -i "s|/usr/bin/java|/app/jre/bin/java|g" tigerjython
-      - sed -i "s|/opt/tigerjython|/app/tigerjython|g" tigerjython
-      - install -Dm644 Lib/* /app/tigerjython/Lib
-      - install -Dm644 TestSamples/* /app/tigerjython/TestSamples
-      - install -m755 tigerjython2.jar /app/tigerjython/tigerjython2.jar
-      - install -m755 tigerjython /app/tigerjython/tigerjython.sh
-
-    sources:
-      - type: archive
-        path: TigerJython.tar.gz
-finish-args:
-  - --env=PATH=/app/jre/bin:/usr/bin
-  # X11 + XShm access
-  - --share=ipc
-  - --socket=fallback-x11
-  # Wayland access
-  - --socket=wayland
-  # GPU acceleration if needed
-  - --device=dri
-  # Needs to talk to the network:
-  - --share=network
-  # Needs to save files locally
-  - --filesystem=xdg-documents
-# command: java -jar tigerjython2.jar
-# command: java --version
-command: /app/tigerjython/tigerjython.sh

man/tigerjython.md

@@ -2,8 +2,8 @@
 title: TigerJython
 section: 1
 header: TigerJython Manual
-footer: tigerjython 2.37
-date: 2023-08-02
+footer: tigerjython 2.40
+date: 2024-09-05
 ---
 # NAME
 

tigerjython.desktop

@@ -1,6 +1,7 @@
+#!/usr/bin/env xdg-open
 [Desktop Entry]
 Name=TigerJython IDE
-Exec=java -jar /opt/tigerjython/tigerjython2.jar
+Exec=tigerjython %f
 Icon=tigerjython
 Type=Application
 Categories=Education;Science;Math;