diff --git a/LICENCE b/LICENCE new file mode 100644 index 0000000..22375ce --- /dev/null +++ b/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. diff --git a/Makefile b/Makefile index f56b6f9..d80c6be 100644 --- a/Makefile +++ b/Makefile @@ -8,3 +8,5 @@ tar.gz: man tar -czf TigerJython.tar.gz TigerJython deb: tar.gz cd debian-deb && sh makedeb.sh +b2sum: + b2sum TigerJython.tar.gz diff --git a/TigerJython.tar.gz b/TigerJython.tar.gz index c797e67..0bf0b0d 100644 Binary files a/TigerJython.tar.gz and b/TigerJython.tar.gz differ diff --git a/TigerJython/ch.tigerjython.TigerJython2.metainfo.xml b/TigerJython/ch.tigerjython.TigerJython2.metainfo.xml new file mode 100644 index 0000000..469e733 --- /dev/null +++ b/TigerJython/ch.tigerjython.TigerJython2.metainfo.xml @@ -0,0 +1,31 @@ + + + ch.tigerjython.TigerJython2 + + TigerJython + TigerJython IDE + TJ Group + + FSFAP + BSD-3-Clause + + + 482 + + + +

+ 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. +

+

+ For all versions we guarantee not to change or spy your software. +

+ + + tigerjython.desktop + + + + + https://www.tigerjython.ch/ + diff --git a/TigerJython/tigerjython.desktop b/TigerJython/tigerjython.desktop old mode 100644 new mode 100755 index c3f0e64..a628df6 --- a/TigerJython/tigerjython.desktop +++ b/TigerJython/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; diff --git a/arch-pkg b/arch-pkg index 7d08674..27805c2 160000 --- a/arch-pkg +++ b/arch-pkg @@ -1 +1 @@ -Subproject commit 7d08674c084d76e22b0b4d5fd647d46d40390ef7 +Subproject commit 27805c21d5beca3c79b3240ae1ab7403a98ec7ca diff --git a/flatpak/Makefile b/flatpak/Makefile index d49bf0b..983b275 100644 --- a/flatpak/Makefile +++ b/flatpak/Makefile @@ -1,7 +1,9 @@ manifest = ch.tigerjython.TigerJython2.yml gpg = beat@git.jdmweb2.ch -build: +clean: flatpak uninstall --noninteractive ch.tigerjython.TigerJython2 > /dev/null || true + +build: clean flatpak-builder --install --user --force-clean build-dir ch.tigerjython.TigerJython2.yml run: flatpak run --nosocket=fallback-x11 --socket=x11 ch.tigerjython.TigerJython2 @@ -9,10 +11,12 @@ sh: flatpak run --command=sh ch.tigerjython.TigerJython2 #https://docs.flathub.org/docs/for-app-authors/submission/ -sub_build: +sub_build: clean # flatpak run org.flatpak.Builder --force-clean --sandbox --user --install --install-deps-from=flathub --ccache --mirror-screenshots-url=https://dl.flathub.org/repo/screenshots --repo=repo builddir ch.tigerjython.TigerJython2.yml # flatpak run org.flatpak.Builder --force-clean --sandbox --user --install --ccache --mirror-screenshots-url=https://dl.flathub.org/repo/screenshots --repo=repo builddir ch.tigerjython.TigerJython2.yml # flatpak --user install -y --noninteractive flathub org.freedesktop.Sdk/x86_64/23.08 flatpak-builder --gpg-sign=beat@git.jdmweb2.ch --force-clean --sandbox --user --install --install-deps-from=flathub --ccache --mirror-screenshots-url=https://dl.flathub.org/repo/screenshots --repo=repo builddir ${manifest} sub_lint: flatpak run --command=flatpak-builder-lint org.flatpak.Builder manifest ${manifest} +sub_metainfo: + flatpak run --command=appstream-util org.flatpak.Builder validate ch.tigerjython.TigerJython2.metainfo.xml diff --git a/flatpak/ch.tigerjython.TigerJython2.yml b/flatpak/ch.tigerjython.TigerJython2.yml index cc256e3..5cad3bc 100644 --- a/flatpak/ch.tigerjython.TigerJython2.yml +++ b/flatpak/ch.tigerjython.TigerJython2.yml @@ -1,33 +1,11 @@ id: ch.tigerjython.TigerJython2 -branch: '2.39' runtime: org.freedesktop.Platform 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 - - sources: - - type: archive - url: https://git.jdmweb2.ch/beat/tigerjython_pkg/raw/tag/V2.39/TigerJython.tar.gz - sha256: 5961b11112ad27d4831d47d3422baa41d1ba8059e8dde3db2e4c4a8759aad607 finish-args: - - --env=PATH=/app/tigerjython:/app/jre/bin:/usr/bin + - --env=PATH=/app/jre/bin:/app/bin:/usr/bin # X11 + XShm access - --share=ipc # - --socket=fallback-x11 @@ -39,11 +17,23 @@ finish-args: - --share=network # Needs to save files locally - --filesystem=xdg-documents - -## Error: Command 'tigerjython' not found -# command: tigerjython - -## WARNING: toplevel-command-is-path -## https://github.com/flathub-infra/flatpak-builder-lint/issues/23 -command: /app/tigerjython/tigerjython - +command: tigerjython +modules: + - name: openjdk + buildsystem: simple + build-commands: + - /usr/lib/sdk/openjdk/install.sh + - name: tigerjython2 + buildsystem: simple + build-commands: + - sed -i "s|/usr/bin/java|/app/jre/bin/java|g" tigerjython + - sed -i "s|/opt/tigerjython|/app/tigerjython|g" tigerjython + - install -Dm644 Lib/* -t /app/tigerjython/Lib + - install -Dm644 TestSamples/* -t /app/tigerjython/TestSamples + - install -m755 tigerjython2.jar /app/tigerjython/tigerjython2.jar + - install -Dm755 tigerjython -t /app/bin + - desktop-file-edit --set-icon=ch.tigerjython.TigerJython2 --set-key=Exec --set-value="tigerjython %f" tigerjython.desktop + sources: + - type: archive + url: https://git.jdmweb2.ch/beat/tigerjython_pkg/raw/tag/V2.39/TigerJython.tar.gz + sha256: 5961b11112ad27d4831d47d3422baa41d1ba8059e8dde3db2e4c4a8759aad607