From 9cce7d263ea3f2984a619cdfcb54d264c6a4c51d Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Tue, 5 Nov 2024 01:29:53 +0300 Subject: fully support relocatable binaries, improving AppImages * You can now specify `--with-scitecodatadir` as a relative path, that will be interpreted relative to the binary's location. * Win32 binaries already were relocatable, but this was a Windows-specific hack. Win32 binaries are now built with `--with-scitecodatadir=.` since everything is in a single directory. * Ubuntu packages are now also built `--with-scitecodatadir=../share/sciteco`. This is not crucial for ordinary installations, but is meant for AppImage creation. * Since AppImages are now built from relocatable packages, we no longer need the unionfs-workaround from pkg2appimage. This should fix the strange root contents when autocompleting in AppImage builds. * This might also fix the appimage.github.io CI issues. I assume that because I could reproduce the issue on FreeBSD's Linuxulator in dependence of pkg2appimage's "union"-setting. See https://github.com/AppImage/appimage.github.io/pull/3402 * Determining the binary location actually turned out be hard and very platform-dependant. There are now implementations for Windows (which could also read argv[0]), Linux and generic UNIX (which works on FreeBSD, but I am not sure about the others). I believe this could also be useful on Mac OS to create app bundles, but this needs to be tested - currently the Mac OS binaries are installed into fixed locations and don't use relocation. --- AppImage/curses.yml | 5 ----- AppImage/gtk.yml | 5 ----- 2 files changed, 10 deletions(-) (limited to 'AppImage') diff --git a/AppImage/curses.yml b/AppImage/curses.yml index 2989a39..edf9fd0 100755 --- a/AppImage/curses.yml +++ b/AppImage/curses.yml @@ -1,10 +1,5 @@ app: sciteco-curses -# We currently use paths hardcoded at build-time. -# Alternatively, it would be possible to customize the AppRun script or -# add a wrapper that sets $SCITECOPATH. -union: true - ingredients: packages: - sciteco-curses diff --git a/AppImage/gtk.yml b/AppImage/gtk.yml index d49e308..ea233db 100755 --- a/AppImage/gtk.yml +++ b/AppImage/gtk.yml @@ -1,10 +1,5 @@ app: sciteco-gtk -# We currently use paths hardcoded at build-time. -# Alternatively, it would be possible to customize the AppRun script or -# add a wrapper that sets $SCITECOPATH. -union: true - ingredients: packages: - sciteco-gtk -- cgit v1.2.3