Merge pull request #265 from chrisws/12_32_2

12 32 2

Author: chrisws

CMakeLists.txt

@@ -9,7 +9,9 @@ set(VERSION "12.29")
 cmake_minimum_required(VERSION 3.10)
 project(SmallBASIC VERSION ${VERSION} LANGUAGES C CXX)
 
-set(CMAKE_CXX_STANDARD 14)
+# clang-check ../*.cpp
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # cmake -DWITH_DEBUG=ON
@@ -85,7 +87,7 @@ function(buildSDL)
     include_directories(${FONTCONFIG_INCLUDE_DIRS})
     add_compile_options(${FONTCONFIG_CFLAGS_OTHER})
     execute_process(
-      COMMAND ${XXD_EXECUTABLE} -i images/sb-desktop-128x128.png
+      COMMAND ${XXD_EXECUTABLE} -i ${CMAKE_SOURCE_DIR}/images/io.github.smallbasic.png
       OUTPUT_FILE ${CMAKE_BINARY_DIR}/src/platform/sdl/icon.h
     )
   endif()
@@ -109,8 +111,9 @@ function(buildSDL)
   set(IMPL_LOG_WRITE ON)
 
   # Process assets
+  message("generating main_bas.h")
   execute_process(
-    COMMAND ${XXD_EXECUTABLE} -i src/platform/android/app/src/main/assets/main.bas
+    COMMAND ${XXD_EXECUTABLE} -i ${CMAKE_SOURCE_DIR}/src/platform/android/app/src/main/assets/main.bas
     OUTPUT_FILE ${CMAKE_BINARY_DIR}/src/platform/sdl/main_bas.h
   )
   writeConfig()

ChangeLog

@@ -1,3 +1,9 @@
+2026-01-20 (12.32)
+	SDL: Created flatpak based build
+
+2025-10-14 (12.32)
+	ANDROID: replace react/mui based portal with native javascript solution
+
 2025-09-11 (12.31)
 	ANDROID: Implemented support for editing with the system keypad
 

Makefile.am

@@ -68,6 +68,53 @@ appImage:
 	~/apps/linuxdeploy-x86_64.AppImage --appdir=AppDir --executable=./src/platform/fltk/sbasici && \
 	~/apps/appimagetool-x86_64.AppImage AppDir
 
+#
+# flatpak install flathub org.flatpak.Builder
+# sudo apt install flatpak-builder
+# https://docs.flathub.org/docs/for-app-authors/submission
+#
+# inspect build-dir/files (or /app from flatpack-shell) for additional "cleanup" items
+#
+
+# starting from scratch, download and build all dependencies
+flatpak-build:
+	flatpak-builder --force-clean --ccache build-dir io.github.smallbasic.SmallBASIC.json
+
+# development workflow
+flatpak-run:
+	make -s -j$(nproc) && \
+  flatpak-builder --user --install --force-clean --ccache --disable-download build-dir io.github.smallbasic.SmallBASIC.json && \
+	flatpak run io.github.smallbasic.SmallBASIC
+
+# debugging specific flatpak issues
+flatpak-debug:
+	make -s -j$(nproc) && \
+	flatpak-builder --build-only --force-clean --ccache --disable-download --disable-updates build-dir io.github.smallbasic.SmallBASIC.json && \
+	flatpak-builder --run build-dir io.github.smallbasic.SmallBASIC.json gdb sbasicg
+
+# to inspect the built components - requires commenting deletion of xxd
+flatpak-shell:
+	flatpak-builder --build-shell=sbasicg build-dir io.github.smallbasic.SmallBASIC.json
+
+# how to invoke the command line sbasic
+flatpak-command:
+	flatpak run --filesystem=`pwd` --command=sbasic io.github.smallbasic.SmallBASIC $1
+
+# preparing for release
+flatpak-lint1:
+	flatpak run --command=flatpak-builder-lint org.flatpak.Builder manifest io.github.smallbasic.SmallBASIC.json
+
+flatpak-lint2:
+	flatpak run --command=flatpak-builder-lint org.flatpak.Builder builddir build-dir
+
+# extra step 1 preparing for release
+flatpak-create-repo:
+	flatpak-builder --repo=repo build-dir io.github.smallbasic.SmallBASIC.json
+
+# extra step 2 preparing for release
+flatpak-lint3:
+		flatpak run --command=flatpak-builder-lint org.flatpak.Builder repo repo
+
 EXTRA_DIST =                                                 \
 documentation/build_kwp.cpp                                  \
 documentation/sbasic_ref.csv                                 \

configure.ac

@@ -7,7 +7,7 @@ dnl This program is distributed under the terms of the GPL v2.0
 dnl Download the GNU Public License (GPL) from www.gnu.org
 dnl
 
-AC_INIT([smallbasic], [12.31])
+AC_INIT([smallbasic], [12.32])
 AC_CONFIG_SRCDIR([configure.ac])
 
 AC_CANONICAL_TARGET
@@ -174,6 +174,9 @@ function buildSDL() {
 
    PKG_CHECK_MODULES([SDL3], [sdl3])
 
+   AC_MSG_CHECKING([for SDL3 library linking])
+   SDL3_LIBS=`pkg-config sdl3 --libs --static`
+
    SAVED_CPPFLAGS="$CPPFLAGS"
    CPPFLAGS="$CPPFLAGS `pkg-config freetype2 --cflags`"
    AC_CHECK_HEADERS([ft2build.h], [], [AC_MSG_ERROR([libfreetype6-dev not installed: configure failed.])])
@@ -184,6 +187,15 @@ function buildSDL() {
      AC_MSG_ERROR([xxd command not installed: configure failed.])
    fi
 
+   AC_ARG_WITH(flatpak,
+   [  --with-flatpak  Build the flatpak version default=no],
+       [with_flatpak=$withval],
+       [with_flatpak=no])
+   if test "$with_flatpak" = "yes" || test "$with_flatpak" = "full"
+   then
+     AC_DEFINE(_FLATPAK, 1, [flatpak build enabled])
+   fi
+
    case "${host_os}" in
      *mingw* | cygwin*)
      dnl avoid using MSCRT versions of printf for long double
@@ -222,11 +234,7 @@ function buildSDL() {
 
      PACKAGE_CFLAGS="${PACKAGE_CFLAGS} ${FONTCONFIG_CFLAGS}"
 
-     (cd images && xxd -i sb-desktop-128x128.png > ../src/platform/sdl/icon.h)
-
-     AC_MSG_CHECKING([for SDL3 library linking])
-     SDL3_LIBS=`pkg-config sdl3 --libs --static`
-     AC_MSG_RESULT([$SDL3_LIBS])
+     (cd images && xxd -i io.github.smallbasic.SmallBASIC.png > ../src/platform/sdl/icon.h)
 
      dnl backlinking support for modules
      PACKAGE_LIBS="${PACKAGE_LIBS} -ldl -no-pie"
@@ -271,7 +279,6 @@ function buildAndroid() {
    TEST_DIR="src/platform/android"
    AC_SUBST(TEST_DIR)
    if test $with_library = no; then
-      (cd src/platform/android/webui && npm run build)
       TARGET="Building for Android."
    else
       TARGET="Building for Android library."
@@ -351,6 +358,14 @@ function buildWeb() {
      PACKAGE_LIBS="${PACKAGE_LIBS} -lm -ldl -lpthread -lmicrohttpd"
      AC_CHECK_HEADERS([microhttpd.h], [], [AC_MSG_ERROR([microhttpd is not installed])])
    fi
+
+   AC_CHECK_HEADERS([curl/curl.h], [have_curl_h=yes; break;])
+
+   if test "x${have_curl_h}" = "xyes" ; then
+      AC_DEFINE(USE_LIB_CURL, 1, [use the curl library.])
+      PACKAGE_LIBS="${PACKAGE_LIBS} -lcurl"
+   fi
+
    BUILD_SUBDIRS="src/common src/platform/web"
    AM_CONDITIONAL(WITH_CYGWIN_CONSOLE, false)
    AC_DEFINE(_UnixOS, 1, [Building under Unix like systems.])
@@ -385,6 +400,17 @@ function buildTEENSY() {
    if test "${have_xxd}" = "no" ; then
      AC_MSG_ERROR([xxd command not installed: configure failed.])
    fi
+   AC_CHECK_PROG([ARM_GCC], [arm-none-eabi-gcc], [yes], [no])
+   AC_CHECK_PROG([ARM_GXX], [arm-none-eabi-g++], [yes], [no])
+   if test "$ARM_GCC" = "no"; then
+     AC_MSG_ERROR([arm-none-eabi-gcc not found in PATH. Please install gcc-arm-none-eabi.])
+   fi
+   if test "$ARM_GXX" = "no"; then
+     AC_MSG_ERROR([arm-none-eabi-g++ not found in PATH. Please install g++-arm-none-eabi.])
+   fi
+   PKG_CHECK_MODULES([LIBUSB], [libusb], [],
+     [AC_MSG_ERROR([libusb not found. Please install libusb-dev])]
+   )
    AM_CONDITIONAL(WITH_CYGWIN_CONSOLE, false)
    AC_DEFINE(_UnixOS, 1, [Building under Unix like systems.])
    AC_DEFINE(_MCU, 1, [Micro controller based builds])
@@ -482,7 +508,7 @@ checkProfiling
 checkForWindows
 
 CFLAGS="${CFLAGS} -std=gnu11"
-PACKAGE_CFLAGS="${PACKAGE_CFLAGS} -Wall -Wno-unused-result"
+PACKAGE_CFLAGS="${PACKAGE_CFLAGS} -Wall -Werror -Wno-unused-result"
 BUILD_DATE=`date +"%a, %d %b %Y"`
 AC_DEFINE_UNQUOTED([BUILD_DATE],["$BUILD_DATE"],[Build date])
 

images/io.github.smallbasic.SmallBASIC.png

@@ -0,0 +1,105 @@
+{
+  "app-id": "io.github.smallbasic.SmallBASIC",
+  "runtime": "org.freedesktop.Platform",
+  "runtime-version": "25.08",
+  "sdk": "org.freedesktop.Sdk",
+  "command": "sbasicg",
+  "build-options": {
+    "env": {
+      "MAKEFLAGS": "-j$(nproc) -s"
+    }
+  },
+  "finish-args": [
+    "--socket=wayland",
+    "--socket=fallback-x11",
+    "--socket=pulseaudio",
+    "--device=dri",
+    "--share=ipc",
+    "--env=SBASICPATH=/app/lib/smallbasic/plugins"
+  ],
+  "cleanup": [
+    "/include",
+    "/lib/pkgconfig",
+    "/lib/cmake",
+    "/bin/xxd",
+    "*.a",
+    "*.la"
+  ],
+  "modules": [
+    {
+      "name": "smallbasic-plugins",
+      "buildsystem": "simple",
+      "build-commands": [
+        "./autogen.sh",
+        "./configure --prefix=/app",
+        "make -s",
+        "mkdir -p ${FLATPAK_DEST}/lib/smallbasic/plugins",
+        "find . -name '*.so' -exec install -Dm755 {} ${FLATPAK_DEST}/lib/smallbasic/plugins/ \\;"
+      ],
+      "sources": [
+        {
+          "type": "git",
+          "url": "https://github.com/smallbasic/smallbasic.plugins.git",
+          "commit": "12_32"
+        }
+      ]
+    }, {
+      "name": "xxd",
+      "buildsystem": "simple",
+      "build-commands": [
+        "cd src/xxd && make CC=gcc CFLAGS='-O2'",
+        "install -Dm755 src/xxd/xxd /app/bin/xxd"
+      ],
+      "sources": [
+        {
+          "type": "git",
+          "url": "https://github.com/vim/vim.git",
+          "tag": "v9.1.0"
+        }
+      ]
+    }, {
+      "name": "SDL3",
+      "buildsystem": "cmake-ninja",
+      "config-opts": [
+        "-DCMAKE_BUILD_TYPE=Release"
+      ],
+      "sources": [
+        {
+          "type": "git",
+          "url": "https://github.com/libsdl-org/SDL.git",
+          "tag": "release-3.2.26"
+        }
+      ]
+    }, {
+      "name": "sbasic",
+      "buildsystem": "autotools",
+      "config-opts": [
+        "--prefix=/app"
+      ],
+      "sources": [
+        {
+          "type": "dir",
+          "path": "."
+        }
+      ],
+      "build-commands": [
+        "make install -s -j$(nproc)"
+      ]
+    }, {
+      "name": "sbasicg",
+      "buildsystem": "autotools",
+      "autogen": true,
+      "config-opts": [
+        "--prefix=/app",
+        "--enable-sdl",
+        "--with-flatpak"
+      ],
+      "sources": [
+        {
+          "type": "dir",
+          "path": "."
+        }
+      ]
+    }
+  ]
+}

images/io.github.smallbasic.png

@@ -1002,7 +1002,7 @@ bcip_t cmd_push_args(int cmd, bcip_t goto_addr, bcip_t rvid) {
 
         prog_ip = ofs;       // back to the start of the expression
         // now we are sure, this parameter is not a single variable
-        // no 'break' here
+        // fallthrough
 
       default:
         // default: the parameter is an expression
@@ -1096,7 +1096,7 @@ void cmd_call_unit_udp(int cmd, int udp_tid, bcip_t goto_addr, bcip_t rvid) {
 
         prog_ip = ofs;       // back to the start of the expression
         // now we are sure, this parameter is not a single variable
-        // no 'break' here
+        // fallthrough
 
       default:
         // default: the parameter is an expression

io.github.smallbasic.SmallBASIC.json

@@ -2574,7 +2574,8 @@ void cmd_genfunc(long funcCode, var_t *r) {
           }
         }
         prog_ip = ofs;
-        // no 'break' here
+        // fallthrough
+
       default:
         // default --- expression
         v_init(&arg);
@@ -2646,7 +2647,8 @@ void cmd_genfunc(long funcCode, var_t *r) {
           }
         }
         prog_ip = ofs;
-        // no 'break' here
+        // fallthrough
+
       default:
         // default --- expression
         v_init(&arg);

src/common/blib.c

@@ -288,7 +288,9 @@ void exec_setup_predefined_variables() {
     }
   }
 #elif defined(_UnixOS)
-  if (getenv("HOME")) {
+  if (getenv("XDG_DATA_HOME")) {
+    strlcpy(homedir, getenv("XDG_DATA_HOME"), sizeof(homedir));
+  } else if (getenv("HOME")) {
     strlcpy(homedir, getenv("HOME"), sizeof(homedir));
   } else {
     strcpy(homedir, "/tmp/");
@@ -1641,6 +1643,7 @@ int sbasic_exec(const char *file) {
   opt_show_page = 0;
 
   // setup global values
+  gsb_err_mod_perm = 0;
   gsb_last_line = gsb_last_error = 0;
   strlcpy(gsb_last_file, file, sizeof(gsb_last_file));
   strcpy(gsb_last_errmsg, "");
@@ -1654,6 +1657,8 @@ int sbasic_exec(const char *file) {
   } else if (!success) {        // there was some errors; do not continue
     exec_rq = 0;
     gsb_last_error = 1;
+  } else if (gsb_err_mod_perm) {
+    exec_rq = 0;                // a module was not permitted to run
   }
 
   if (exec_rq) {                // we will run it