From 507ad335b168f232c06e887491fbc28ffbe815a3 Mon Sep 17 00:00:00 2001 From: tildearrow Date: Mon, 6 Jun 2022 18:18:45 -0500 Subject: [PATCH] add instruments to make install --- .github/workflows/build.yml | 2 +- CMakeLists.txt | 1 + scripts/release-win32.sh | 3 ++- scripts/release-win64.sh | 3 ++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8fd08833..9d130246 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -243,7 +243,7 @@ jobs: cp -v ../LICENSE LICENSE.txt cp -v ../README.md README.txt - cp -vr ../{papers,demos} ../${binPath}/furnace.exe ./ + cp -vr ../{papers,demos,instruments} ../${binPath}/furnace.exe ./ popd diff --git a/CMakeLists.txt b/CMakeLists.txt index fe6a12fe..d8491b45 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -633,6 +633,7 @@ if (NOT ANDROID OR TERMUX) install(DIRECTORY papers DESTINATION ${CMAKE_INSTALL_DOCDIR}) install(FILES LICENSE DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/furnace) install(DIRECTORY demos DESTINATION ${CMAKE_INSTALL_DATADIR}/furnace) + install(DIRECTORY instruments DESTINATION ${CMAKE_INSTALL_DATADIR}/furnace) foreach(num 16 32 64 128 256 512) set(res ${num}x${num}) install(FILES res/icon.iconset/icon_${res}.png RENAME furnace.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/${res}/apps) diff --git a/scripts/release-win32.sh b/scripts/release-win32.sh index 2257a595..7b3c76d7 100755 --- a/scripts/release-win32.sh +++ b/scripts/release-win32.sh @@ -29,8 +29,9 @@ cp ../../win32build/furnace.exe . || exit 1 cp ../../README.md README.txt || exit 1 cp -r ../../papers papers || exit 1 cp -r ../../demos demos || exit 1 +cp -r ../../instruments instruments || exit 1 -zip -r furnace.zip LICENSE.txt furnace.exe README.txt papers demos +zip -r furnace.zip LICENSE.txt furnace.exe README.txt papers demos instruments furName=$(git describe --tags | sed "s/v0/0/") diff --git a/scripts/release-win64.sh b/scripts/release-win64.sh index db580e09..75a07f51 100755 --- a/scripts/release-win64.sh +++ b/scripts/release-win64.sh @@ -29,8 +29,9 @@ cp ../../winbuild/furnace.exe . || exit 1 cp ../../README.md README.txt || exit 1 cp -r ../../papers papers || exit 1 cp -r ../../demos demos || exit 1 +cp -r ../../instruments instruments || exit 1 -zip -r furnace.zip LICENSE.txt furnace.exe README.txt papers demos +zip -r furnace.zip LICENSE.txt furnace.exe README.txt papers demos instruments furName=$(git describe --tags | sed "s/v0/0/")