otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

do not alter macOS bundle during packaging

Browse source 
thanks emberdex (https://github.com/tildearrow/furnace/pull/1609#issuecomment-2057085220)

NOTE: if building for installation in /usr/local or something, be sure to pass -DFORCE_APPLE_BIN=ON to CMake!
This commit is contained in:
tildearrow 2024-04-15 17:08:37 -05:00
parent 3a1e286293
commit fb36e5d8d7
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.github/workflows/build.yml vendored
View file

@ -261,11 +261,6 @@ jobs:
rmdir orig rmdir orig
rm Furnace-*-Darwin.dmg rm Furnace-*-Darwin.dmg
if [ -e new/Furnace.app/Contents/Resources/bin/furnace ]; then
rm -v new/Furnace.app/Contents/Resources/bin/furnace
rmdir new/Furnace.app/Contents/Resources/bin
fi
echo "copying extra stuff" echo "copying extra stuff"
cp -v ../LICENSE new/LICENSE.txt cp -v ../LICENSE new/LICENSE.txt
cp -v ../res/releaseReadme/stable-mac.txt new/README cp -v ../res/releaseReadme/stable-mac.txt new/README

10
CMakeLists.txt
View file

@ -116,6 +116,12 @@ option(WITH_DEMOS "Install demo songs" ON)
option(WITH_INSTRUMENTS "Install instruments" ON) option(WITH_INSTRUMENTS "Install instruments" ON)
option(WITH_WAVETABLES "Install wavetables" ON) option(WITH_WAVETABLES "Install wavetables" ON)
option(SHOW_OPEN_ASSETS_MENU_ENTRY "Show option to open built-in assets directory (on supported platforms)" OFF) option(SHOW_OPEN_ASSETS_MENU_ENTRY "Show option to open built-in assets directory (on supported platforms)" OFF)
if (APPLE)
option(FORCE_APPLE_BIN "Force enable binary installation to /bin" OFF)
else()
# not Apple - not needed
set(FORCE_APPLE_BIN OFF)
endif()
set(DEPENDENCIES_INCLUDE_DIRS extern/IconFontCppHeaders src/icon) set(DEPENDENCIES_INCLUDE_DIRS extern/IconFontCppHeaders src/icon)
@ -1161,7 +1167,9 @@ if (NOT ANDROID OR TERMUX)
endforeach() endforeach()
install(FILES res/logo.png RENAME furnace.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/1024x1024/apps) install(FILES res/logo.png RENAME furnace.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/1024x1024/apps)
else() else()
install(TARGETS furnace RUNTIME DESTINATION bin) if (NOT APPLE OR FORCE_APPLE_BIN)
install(TARGETS furnace RUNTIME DESTINATION bin)
endif()
endif() endif()
set(CPACK_PACKAGE_NAME "Furnace") set(CPACK_PACKAGE_NAME "Furnace")

1
README.md
View file

@ -278,6 +278,7 @@ Available options:
| `WITH_INSTRUMENTS` | `ON` | Install demo instruments on `make install` | | `WITH_INSTRUMENTS` | `ON` | Install demo instruments on `make install` |
| `WITH_WAVETABLES` | `ON` | Install wavetables on `make install` | | `WITH_WAVETABLES` | `ON` | Install wavetables on `make install` |
| `SHOW_OPEN_ASSETS_MENU_ENTRY` | `OFF` | Show option to open built-in assets directory (on supported platforms) | | `SHOW_OPEN_ASSETS_MENU_ENTRY` | `OFF` | Show option to open built-in assets directory (on supported platforms) |
| `FORCE_APPLE_BIN` | `OFF` | Enable installation of binaries (when doing `make install`) to PREFIX/bin on Apple platforms |
(\*) `ON` if system-installed JACK detected, otherwise `OFF` (\*) `ON` if system-installed JACK detected, otherwise `OFF`