Skip to content

Commit aa53264

Browse files
author
Chris Warren-Smith
committed
FLATPAK: manifest lint errors
1 parent 33c50c8 commit aa53264

7 files changed

Lines changed: 79 additions & 19 deletions

‎Makefile.am‎

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,21 +76,44 @@ appImage:
7676
# inspect build-dir/files (or /app from flatpack-shell) for additional "cleanup" items
7777
#
7878

79+
# starting from scratch, download and build all dependencies
7980
flatpak-build:
80-
flatpak-builder --force-clean --ccache build-dir io.github.smallbasic.json
81+
flatpak-builder --force-clean --ccache build-dir io.github.smallbasic.SmallBASIC.json
8182

83+
# development workflow
8284
flatpak-run:
8385
make -s -j$(nproc) && \
84-
flatpak-builder --user --install --force-clean --ccache --disable-download build-dir io.github.smallbasic.json && \
85-
flatpak run io.github.smallbasic
86+
flatpak-builder --user --install --force-clean --ccache --disable-download build-dir io.github.smallbasic.SmallBASIC.json && \
87+
flatpak run io.github.smallbasic.SmallBASIC
8688

89+
# debugging specific flatpak issues
8790
flatpak-debug:
8891
make -s -j$(nproc) && \
89-
flatpak-builder --build-only --force-clean --ccache --disable-download --disable-updates build-dir io.github.smallbasic.json && \
90-
flatpak-builder --run build-dir io.github.smallbasic.json gdb sbasicg
92+
flatpak-builder --build-only --force-clean --ccache --disable-download --disable-updates build-dir io.github.smallbasic.SmallBASIC.json && \
93+
flatpak-builder --run build-dir io.github.smallbasic.SmallBASIC.json gdb sbasicg
9194

95+
# to inspect the built components - requires commenting deletion of xxd
9296
flatpak-shell:
93-
flatpak-builder --build-shell=sbasicg build-dir io.github.smallbasic.json
97+
flatpak-builder --build-shell=sbasicg build-dir io.github.smallbasic.SmallBASIC.json
98+
99+
# how to invoke the command line sbasic
100+
flatpak-command:
101+
flatpak run --filesystem=`pwd` --command=sbasic io.github.smallbasic.SmallBASIC $1
102+
103+
# preparing for release
104+
flatpak-lint1:
105+
flatpak run --command=flatpak-builder-lint org.flatpak.Builder manifest io.github.smallbasic.SmallBASIC.json
106+
107+
flatpak-lint2:
108+
flatpak run --command=flatpak-builder-lint org.flatpak.Builder builddir build-dir
109+
110+
# extra step 1 preparing for release
111+
flatpak-create-repo:
112+
flatpak-builder --repo=repo build-dir io.github.smallbasic.SmallBASIC.json
113+
114+
# extra step 2 preparing for release
115+
flatpak-lint-lint3:
116+
flatpak run --command=flatpak-builder-lint org.flatpak.Builder repo repo
94117

95118
EXTRA_DIST = \
96119
documentation/build_kwp.cpp \

io.github.smallbasic.json renamed to io.github.smallbasic.SmallBASIC.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"app-id": "io.github.smallbasic",
2+
"app-id": "io.github.smallbasic.SmallBASIC",
33
"runtime": "org.freedesktop.Platform",
44
"runtime-version": "25.08",
55
"sdk": "org.freedesktop.Sdk",
@@ -11,19 +11,18 @@
1111
},
1212
"finish-args": [
1313
"--socket=wayland",
14-
"--socket=x11",
1514
"--socket=pulseaudio",
1615
"--device=dri",
1716
"--share=ipc",
18-
"--talk-name=org.freedesktop.portal.Desktop",
1917
"--env=SBASICPATH=/app/lib/smallbasic/plugins"
2018
],
2119
"cleanup": [
2220
"/include",
2321
"/lib/pkgconfig",
2422
"/lib/cmake",
25-
"/lib/debug"
26-
/*"/bin/xxd"*/
23+
"/bin/xxd",
24+
"*.a",
25+
"*.la"
2726
],
2827
"modules": [
2928
{

‎src/platform/sdl/Makefile.am‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SmallBASIC for SDL
2-
# Copyright(C) 2001-2015 Chris Warren-Smith.
2+
# Copyright(C) 2001-2026 Chris Warren-Smith.
33
#
44
# This program is distributed under the terms of the GPL v2.0 or later
55
# Download the GNU Public License (GPL) from www.gnu.org
@@ -39,8 +39,12 @@ sbasicg_DEPENDENCIES = $(top_srcdir)/src/common/libsb_common.a
3939

4040
iconsdir = $(datadir)/icons/hicolor/128x128/apps
4141
icons_DATA = ../../../images/io.github.smallbasic.png
42+
4243
desktopdir = $(datadir)/applications
43-
desktop_DATA = io.github.smallbasic.desktop
44+
desktop_DATA = io.github.smallbasic.SmallBASIC.desktop
45+
46+
metainfodir = $(datadir)/metainfo
47+
metainfo_DATA = io.github.smallbasic.SmallBASIC.metainfo.xml
4448

4549
if WITH_WIN32
4650
sbasicg_LDADD += win.res

‎src/platform/sdl/editor.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ void Runtime::editSource(String loadPath, bool restoreOnExit) {
268268
}
269269
}
270270
} else if (editWidget->getErrorAtLine() != -1) {
271-
String message("Error at line: ");
271+
String message("Error at line:");
272272
message.append(editWidget->getErrorAtLine());
273273
_output->setStatus(message);
274274
editWidget->setCursorRow(editWidget->getErrorAtLine() - 1);

src/platform/sdl/io.github.smallbasic.desktop renamed to src/platform/sdl/io.github.smallbasic.SmallBASIC.desktop

File renamed without changes.

src/platform/sdl/io.github.smallbasic.json renamed to src/platform/sdl/io.github.smallbasic.SmallBASIC.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"app-id": "io.github.smallbasic",
2+
"app-id": "io.github.smallbasic.SmallBASIC",
33
"runtime": "org.freedesktop.Platform",
44
"runtime-version": "25.08",
55
"sdk": "org.freedesktop.Sdk",
@@ -14,15 +14,15 @@
1414
"--socket=pulseaudio",
1515
"--device=dri",
1616
"--share=ipc",
17-
"--talk-name=org.freedesktop.portal.Desktop",
1817
"--env=SBASICPATH=/app/lib/smallbasic/plugins"
1918
],
2019
"cleanup": [
2120
"/include",
2221
"/lib/pkgconfig",
2322
"/lib/cmake",
24-
"/lib/debug",
25-
"/bin/xxd"
23+
"/bin/xxd",
24+
"*.a",
25+
"*.la"
2626
],
2727
"modules": [
2828
{
@@ -89,7 +89,8 @@
8989
"buildsystem": "autotools",
9090
"config-opts": [
9191
"--prefix=/app",
92-
"--enable-sdl"
92+
"--enable-sdl",
93+
"--with-flatpak"
9394
],
9495
"sources": [
9596
{

‎src/platform/sdl/io.github.smallbasic.SmallBASIC.metainfo.xml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<component type="desktop-application">
3+
<id>io.github.smallbasic.SmallBASIC</id>
4+
<name>SmallBASIC</name>
5+
<summary>BASIC programming language IDE</summary>
6+
<metadata_license>CC0-1.0</metadata_license>
7+
<project_license>GPL-3.0+</project_license>
8+
<description>
9+
<p>
10+
SmallBASIC is a fast and easy to learn BASIC language interpreter ideal
11+
for everyday calculations, scripts and prototypes. Includes support for
12+
modules: raylib, nuklear, websocket, glfw, clipboard
13+
</p>
14+
</description>
15+
<launchable type="desktop-id">io.github.smallbasic.desktop</launchable>
16+
<screenshots>
17+
<screenshot type="default">
18+
<image>https://smallbasic.github.io/images/screenshots/sbasicg.png</image>
19+
<caption>Main IDE window</caption>
20+
</screenshot>
21+
</screenshots>
22+
<url type="homepage">https://smallbasic.github.io</url>
23+
<url type="bugtracker">https://github.com/smallbasic/SmallBASIC/issues</url>
24+
<releases>
25+
<release version="12.32" date="2026-01-15">
26+
<description>
27+
<p>Initial Flatpak release</p>
28+
</description>
29+
</release>
30+
</releases>
31+
<content_rating type="oars-1.1" />
32+
</component>
33+

0 commit comments

Comments
 (0)