From 73986db1ffcf6dfd8260b404640558ae4ae85843 Mon Sep 17 00:00:00 2001 From: tildearrow Date: Sat, 20 May 2023 19:12:46 -0500 Subject: [PATCH] no more AppImage (on next release) --- .github/workflows/build.yml | 2 +- res/furnace.appdata.xml | 5 +++ scripts/release-linux-AppImage.sh | 51 +++++++++++++++++++++++++++++++ scripts/release-linux.sh | 50 ++++++++++++++++++------------ 4 files changed, 87 insertions(+), 21 deletions(-) create mode 100755 scripts/release-linux-AppImage.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 20e26737..7563ac6c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -307,7 +307,7 @@ jobs: pushd furnace.AppDir cp -v usr/share/{icons/hicolor/1024x1024/apps/furnace.png,applications/furnace.desktop} ./ ln -s furnace.png .DirIcon - mv -v usr/share/metainfo/{furnace.appdata,org.tildearrow.furnace.metainfo}.xml + mv -v usr/share/metainfo/org.tildearrow.furnace.metainfo.xml cp -v ../../res/AppRun ./ popd diff --git a/res/furnace.appdata.xml b/res/furnace.appdata.xml index 2214cb10..5271379a 100644 --- a/res/furnace.appdata.xml +++ b/res/furnace.appdata.xml @@ -19,6 +19,11 @@ it also offers DefleMask compatibility, allowing you to import your songs and even export them back for interoperability.

+ + + intense + mild + furnace.desktop diff --git a/scripts/release-linux-AppImage.sh b/scripts/release-linux-AppImage.sh new file mode 100755 index 00000000..35be353d --- /dev/null +++ b/scripts/release-linux-AppImage.sh @@ -0,0 +1,51 @@ +#!/bin/bash +# make linux release +# run on an Ubuntu 16.04 machine or VM for best results. + +if [ ! -e /tmp/furnace ]; then + ln -s "$PWD" /tmp/furnace || exit 1 +fi + +cd /tmp/furnace + +if [ ! -e linuxbuild ]; then + mkdir linuxbuild || exit 1 +fi + +cd linuxbuild + +cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-O2" -DCMAKE_CXX_FLAGS="-O2 -Wall -Wextra -Wno-unused-parameter -Werror" .. || exit 1 +make -j4 || exit 1 + +cd .. + +mkdir -p release/linux/furnace.AppDir || exit 1 +cd linuxbuild + +make DESTDIR=/tmp/furnace/release/linux/furnace.AppDir install || exit 1 + +cd ../release/linux/furnace.AppDir + +cp -v ../../../res/logo.png furnace.png || exit 1 +ln -s furnace.png .DirIcon || exit 1 +cp -v ../../../res/furnace.desktop . || exit 1 +#mkdir -p usr/share/metainfo || exit 1 +cp -v ../../../res/furnace.appdata.xml usr/share/metainfo/org.tildearrow.furnace.metainfo.xml || exit 1 +rm usr/share/metainfo/furnace.appdata.xml || exit 1 +cp -v ../../../res/AppRun . || exit 1 + +#cp /usr/lib/libm.so.6 usr/lib/ || exit 1 +#cp /usr/lib/libstdc++.so.6 usr/lib/ || exit 1 +#cp /usr/lib/libc.so.6 usr/lib/ || exit 1 +#cp /usr/lib/libgcc_s.so.1 usr/lib/ || exit 1 + +cd usr/bin +strip -s furnace + +cd ../../.. + +[ -e appimagetool-x86_64.AppImage ] || { wget "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage" && chmod 755 appimagetool-x86_64.AppImage; } +./appimagetool-x86_64.AppImage --appimage-extract +ARCH=$(uname -m) ./squashfs-root/AppRun furnace.AppDir + +#zip -r furnace.zip LICENSE.txt Furnace*.dmg README.txt papers diff --git a/scripts/release-linux.sh b/scripts/release-linux.sh index ecd03314..570712f0 100755 --- a/scripts/release-linux.sh +++ b/scripts/release-linux.sh @@ -19,32 +19,42 @@ make -j4 || exit 1 cd .. -mkdir -p release/linux/furnace.AppDir || exit 1 +mkdir -p release/linux/furnace || exit 1 cd linuxbuild -make DESTDIR=/tmp/furnace/release/linux/furnace.AppDir install || exit 1 +make DESTDIR=/tmp/furnace/release/linux/furnace install || exit 1 -cd ../release/linux/furnace.AppDir +cd ../release/linux/furnace -cp -v ../../../res/logo.png furnace.png || exit 1 -ln -s furnace.png .DirIcon || exit 1 -cp -v ../../../res/furnace.desktop . || exit 1 -#mkdir -p usr/share/metainfo || exit 1 -cp -v ../../../res/furnace.appdata.xml usr/share/metainfo/org.tildearrow.furnace.metainfo.xml || exit 1 -cp -v ../../../res/AppRun . || exit 1 +cp -v ../../../res/logo.png .DirIcon || exit 1 +#cp -v ../../../res/furnace.desktop . || exit 1 -#cp /usr/lib/libm.so.6 usr/lib/ || exit 1 -#cp /usr/lib/libstdc++.so.6 usr/lib/ || exit 1 -#cp /usr/lib/libc.so.6 usr/lib/ || exit 1 -#cp /usr/lib/libgcc_s.so.1 usr/lib/ || exit 1 +cd usr + +mv bin/furnace .. || exit 1 +rmdir bin || exit 1 + +rm -r share/applications +rm -r share/doc +mv share/icons .. +rm -r share/licenses +rm -r share/metainfo + +mv share/furnace/demos .. +mv share/furnace/instruments .. +mv share/furnace/wavetables .. +rmdir share/furnace || exit 1 +rmdir share || exit 1 + +cd .. + +cp ../../../LICENSE . || exit 1 +cp ../../../README.md . || exit 1 +cp -r ../../../papers papers || exit 1 +rmdir usr || exit 1 -cd usr/bin strip -s furnace -cd ../../.. +cd .. -[ -e appimagetool-x86_64.AppImage ] || { wget "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage" && chmod 755 appimagetool-x86_64.AppImage; } -./appimagetool-x86_64.AppImage --appimage-extract -ARCH=$(uname -m) ./squashfs-root/AppRun furnace.AppDir - -#zip -r furnace.zip LICENSE.txt Furnace*.dmg README.txt papers +tar -zcv -f furnace.tar.gz furnace