Skip to content

Commit

Permalink
Remove the possibility to create an App Bundle for macOS (#357)
Browse files Browse the repository at this point in the history
  • Loading branch information
mgeier authored Jun 10, 2023
1 parent 903ffac commit 4d9981d
Show file tree
Hide file tree
Showing 17 changed files with 3 additions and 447 deletions.
9 changes: 0 additions & 9 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,6 @@ doc:

.PHONY: doc

if ENABLE_APP_BUNDLE
dmg: install
$(MAKE) -C data/MacOSX $@
else
dmg:
@echo "You have to run './configure --enable-app-bundle' first!"; false
endif
.PHONY: dmg

.NOTPARALLEL: install

# remove pkgdatadir and docdir (if empty)
Expand Down
53 changes: 1 addition & 52 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -713,32 +713,6 @@ ENABLE_AUTO([isatty], [support for isatty()],
AC_SEARCH_LIBS([isatty], , , [have_isatty=no])
])

dnl trying to mimic the default setting
pkgdatadir="\$(datadir)/$PACKAGE"

ENABLE_EXPLICIT([app-bundle], [creation of a MacOSX application bundle],
[
AC_CHECK_PROG([have_dylibbundler], [dylibbundler], [yes], [no])
AS_IF([test x$enable_app_bundle = xyes -o x$enable_app_bundle = x],
[DMG_NAME=SoundScapeRenderer-$PACKAGE_VERSION.dmg],
[DMG_NAME=$enable_app_bundle])
dmgrootdir=$(pwd)/MacOSX-App-Bundle
bundledir=\${dmgrootdir}/SoundScapeRenderer-$PACKAGE_VERSION
dnl WARNING: any user-specified --prefix, --bindir, ... is overwritten!
dnl however, it can still be specified at make time (although kinda useless)!
prefix=\${bundledir}/SoundScapeRenderer.app/Contents
bindir=\${exec_prefix}/MacOS
datarootdir=\${prefix}/Resources
pkgdatadir="\$(datadir)"
docdir=${bundledir}/Documentation
dnl linker flag to add space to the output file header padding,
dnl so when dylibbundler is changing paths to shared libs later on,
dnl longer paths will fit in too.
LDFLAGS="$LDFLAGS -headerpad_max_install_names"
])

ENABLE_AUTO([browser-gui], [creation of HTML/JavaScript files for browser GUI],
[
AC_ARG_VAR([YARN], [Yarn package manager command])
Expand All @@ -760,21 +734,14 @@ ENABLE_AUTO([browser-gui], [creation of HTML/JavaScript files for browser GUI],
])
])

AC_SUBST(DMG_NAME)
AC_SUBST(dmgrootdir)
AC_SUBST(bundledir)
AC_SUBST(pkgdatadir)

AC_SUBST(OPT_FLAGS)
AC_SUBST(PKG_FLAGS)
AC_SUBST(WARNING_FLAGS)
AC_SUBST(DEBUGGING_FLAGS)

dnl List of output files generated by AC_OUTPUT from their respective *.in files
AC_CONFIG_FILES([Makefile src/Makefile man/Makefile browser-gui/Makefile])
AC_CONFIG_FILES([tests/Makefile])
AC_CONFIG_FILES([data/Makefile data/MacOSX/Makefile])
AC_CONFIG_FILES([data/MacOSX/Info.plist data/MacOSX/DMG-Layout.applescript])
AC_CONFIG_FILES([tests/Makefile data/Makefile])

dnl AC_OUTPUT should be the last command (except maybe some status messages)
dnl It generates and runs config.status, which in turn creates the Makefiles and
Expand Down Expand Up @@ -834,13 +801,7 @@ echo "| Network: legacy/WebSocket/FUDI ......... : $have_ip_interface/$have_webs
echo "| Qt GUI/Browser GUI ..................... : $have_gui/$have_browser_gui"
echo "|"
echo "| Enable debugging/optimization .......... : $have_debugging/$have_optimization"
AS_IF([test x$have_app_bundle = xyes],
[
echo "| Mac OS X application bundle (disk image) : $DMG_NAME"
],
[
echo "| Install prefix ......................... : $prefix"
])

AS_IF([test x$have_ecasound = xyes -a x$have_ecasound_program != xyes],
[
Expand All @@ -854,20 +815,8 @@ AS_IF([test x$have_manpages != xyes],
echo "|> WARNING: help2man was not found!"
echo "|> Disabling building of manpages"
])
AS_IF([test x$have_app_bundle = xyes -a x$have_dylibbundler != xyes],
[
echo "|"
echo "|> WARNING: dylibbundler was not found!"
echo "|> It is needed for creating the app bundle."
])

echo "|"
echo
AS_IF([test x$have_app_bundle = xyes],
[
echo 'If everything looks OK, continue with "make" and "make dmg".'
],
[
echo 'If everything looks OK, continue with "make" and "make install".'
])
echo
Binary file removed data/MacOSX/.background/background.png
Binary file not shown.
18 changes: 0 additions & 18 deletions data/MacOSX/DMG-Layout.applescript.in

This file was deleted.

7 changes: 0 additions & 7 deletions data/MacOSX/Getting-Started.txt

This file was deleted.

21 changes: 0 additions & 21 deletions data/MacOSX/Info.plist.in

This file was deleted.

8 changes: 0 additions & 8 deletions data/MacOSX/Jack.webloc

This file was deleted.

99 changes: 0 additions & 99 deletions data/MacOSX/Makefile.am

This file was deleted.

Binary file removed data/MacOSX/SSRIcon.icns
Binary file not shown.
2 changes: 0 additions & 2 deletions data/MacOSX/qt.conf

This file was deleted.

83 changes: 0 additions & 83 deletions data/MacOSX/run-ssr.applescript

This file was deleted.

21 changes: 0 additions & 21 deletions data/MacOSX/run-ssr.sh

This file was deleted.

Loading

0 comments on commit 4d9981d

Please sign in to comment.