diff options
| -rwxr-xr-x | .fmsbw/50-ubuntu22-appimage | 9 | ||||
| -rw-r--r-- | .fmsbw/images/Makefile | 28 | ||||
| -rw-r--r-- | TODO | 2 |
3 files changed, 22 insertions, 17 deletions
diff --git a/.fmsbw/50-ubuntu22-appimage b/.fmsbw/50-ubuntu22-appimage index ade1100..ca987fa 100755 --- a/.fmsbw/50-ubuntu22-appimage +++ b/.fmsbw/50-ubuntu22-appimage @@ -9,15 +9,6 @@ set -ex # we run this CI job. # We should be fine, though unless committing at 6:00 in the morning. -#apt-get update -o APT::Cache-Start=100000000 -#apt-get install -o APT::Cache-Start=100000000 -y fuse libfuse2 imagemagick wget file binutils libglib2.0-bin -#mkdir -p ~/pkg2appimage -#cd ~/pkg2appimage -#wget -O pkg2appimage.AppImage https://github.com/AppImageCommunity/pkg2appimage/releases/download/continuous/pkg2appimage-1eceb30-x86_64.AppImage -#chmod +x pkg2appimage.AppImage -# FIXME: We could get automatic mounting to work with fusefs in the host and by exposesing /dev/fuse. -#./pkg2appimage.AppImage --appimage-extract - cd AppImage ~/pkg2appimage/squashfs-root/AppRun curses.yml mv out/*.AppImage /opt/htdocs/downloads/nightly/sciteco-curses_nightly_x86_64.AppImage diff --git a/.fmsbw/images/Makefile b/.fmsbw/images/Makefile index 0878cc2..0295633 100644 --- a/.fmsbw/images/Makefile +++ b/.fmsbw/images/Makefile @@ -6,7 +6,7 @@ freebsd14-sciteco: buildah from --name $@-working --network=host quay.io/dougrabson/freebsd14.1-small buildah config --env ASSUME_ALWAYS_YES=yes $@-working buildah run $@-working pkg update - buildah run $@-working pkg install FreeBSD-clang FreeBSD-clibs-dev \ + buildah run $@-working pkg install FreeBSD-clang FreeBSD-lld FreeBSD-libcompiler_rt-dev FreeBSD-clibs-dev \ gmake pkgconf autoconf automake libtool \ glib gtk3 groff doxygen lowdown valgrind buildah run $@-working pkg clean -a @@ -15,7 +15,8 @@ freebsd14-sciteco: freebsd14-msys-sciteco: buildah from --name $@-working --network=host freebsd14-sciteco buildah run $@-working pkg install llvm21 gnugrep gmake coreutils gsed gawk \ - git wget gnupg bash groff zip autoconf automake libtool python3 + git wget gnupg bash groff zip autoconf automake libtool python3 \ + wine #buildah run $@-working pkg remove FreeBSD-clang buildah run $@-working pkg clean -a # Cannot check out with --depth=1 as we need a particular commit. @@ -30,21 +31,36 @@ freebsd14-msys-sciteco: buildah run $@-working ln -s /usr/local/bin/gsed gnu-overrides/sed buildah run $@-working ln -s /usr/local/bin/greadlink gnu-overrides/readlink buildah run $@-working ln -s /usr/local/bin/wine64 gnu-overrides/wine - buildah run $@-working echo MINGW64 '>msystem.txt' + buildah run $@-working bash -c 'echo MINGW64 >msystem.txt' buildah copy $@-working msys-activate activate buildah run $@-working gmake install _autotools _gcc _libc++ _glib2 _pdcurses _gtk3 _librsvg buildah run $@-working ln -nfs "/opt/quasi-msys2/root/mingw64" /mingw64 # The upstream _pdcurses package is often too outdated, so we also build from sources. + # TOOD: Build this with -flto. buildah run $@-working git clone --depth=1 -b v4.5.4 https://github.com/Bill-Gray/PDCursesMod.git /opt/PDCursesMod - buildah run $@-working bash -c '. /opt/quasi-msys2/activate && gmake -j2 -C /opt/PDCursesMod/wincon CC=$CC AR=$AR' - buildah run $@-working bash -c '. /opt/quasi-msys2/activate && gmake -j2 -C /opt/PDCursesMod/wingui CC=$CC AR=$AR' + buildah run $@-working bash -c '. /opt/quasi-msys2/activate && gmake -j2 -C /opt/PDCursesMod/wincon CC=$$CC AR=$$AR' + buildah run $@-working bash -c '. /opt/quasi-msys2/activate && gmake -j2 -C /opt/PDCursesMod/wingui CC=$$CC AR=$$AR' buildah commit $@-working $@ freebsd14-osx-sciteco: false # TODO +APT_GET = apt-get -o APT::Cache-Start=100000000 --yes + ubuntu22-appimage: - false # TODO + buildah from --name $@-working --network=host --os=linux ubuntu:22.04 + buildah run $@-working $(APT_GET) update + buildah run $@-working $(APT_GET) install fuse libfuse2 imagemagick wget file binutils libglib2.0-bin + buildah run $@-working $(APT_GET) clean + buildah run $@-working mkdir -p ~/pkg2appimage + buildah config --workingdir '~/pkg2appimage' $@-working + buildah run $@-working wget -O pkg2appimage.AppImage \ + https://github.com/AppImageCommunity/pkg2appimage/releases/download/continuous/pkg2appimage-1eceb30-x86_64.AppImage + buildah run $@-working chmod +x pkg2appimage.AppImage + # FIXME: We could get automatic mounting to work with fusefs in the host and by exposing /dev/fuse. + # FIXME: This does not run without /proc. + buildah run $@-working ./pkg2appimage.AppImage --appimage-extract + buildah commit $@-working $@ # Remove all temporary containers clean: @@ -55,8 +55,6 @@ Known Bugs: If SciTECO would do that, it might break other things (e.g. you might want to refer directory C:\mingw64 instead). * PDCurses/Win32: Crashes sometimes without any error message. - * PDCurses/WinGUI: CTRL-modifier can get stuck. - Should have already been fixed in 9f9819fe8d. * NetBSD Curses: scrolling apparently uses hardware idl capabilities resulting in graphical glitches on slow terminals. idlok(FALSE) is apparently ignored. |