r23290 - gnucash/trunk/src/bin - Remove gnucash-launcher and related scripting files.
John Ralls
jralls at code.gnucash.org
Sun Oct 13 13:11:40 EDT 2013
Author: jralls
Date: 2013-10-13 13:11:39 -0400 (Sun, 13 Oct 2013)
New Revision: 23290
Trac: http://svn.gnucash.org/trac/changeset/23290
Removed:
gnucash/trunk/src/bin/gnucash-gdb.in
gnucash/trunk/src/bin/gnucash-launcher.in
gnucash/trunk/src/bin/gnucash-setup-env-osx.in
Modified:
gnucash/trunk/src/bin/Makefile.am
gnucash/trunk/src/bin/gnucash-bin.c
Log:
Remove gnucash-launcher and related scripting files.
With GConf gone, gnucash can launch the same way on MacOSX as it does everywhere else.
Modified: gnucash/trunk/src/bin/Makefile.am
===================================================================
--- gnucash/trunk/src/bin/Makefile.am 2013-10-09 05:28:15 UTC (rev 23289)
+++ gnucash/trunk/src/bin/Makefile.am 2013-10-13 17:11:39 UTC (rev 23290)
@@ -23,6 +23,9 @@
SUFFIXES = .rc
+config_DATA = environment
+configdir = ${GNC_CONFIGDIR}
+
# Some settings are platform dependent. Let's define them per platform.
if PLATFORM_WIN32
# Windows specific settings go here:
@@ -32,28 +35,10 @@
.rc.o:
$(AM_V_GEN)$(RC) -I${top_srcdir}/src/pixmaps -i '$<' --input-format=rc -o '$@' -O coff
-configdir = ${GNC_CONFIGDIR}
-config_DATA = environment
-
else !PLATFORM_WIN32
-if PLATFORM_OSX_QUARTZ
-# OSX/Quartz specific settings go here:
-PLATFORM_FILES = gnucash-setup-env \
- gnucash-launcher \
- gnucash-gdb \
- gnucash-valgrind
-
-if CUSTOM_GNC_DBD_DIR
-gnc_dbd_dir_override = export GNC_DBD_DIR="@GNC_DBD_DIR@"
-endif
-
-else !PLATFORM_OSX_QUARTZ
# All other platforms use these settings:
PLATFORM_FILES = gnucash-valgrind
-configdir = ${GNC_CONFIGDIR}
-config_DATA = environment
-endif !PLATFORM_OSX_QUARTZ
endif !PLATFORM_WIN32
BIN_NAME = gnucash
@@ -75,20 +60,6 @@
GNUCASH_BIN_INSTALL_NAME=`echo ${BIN_NAME} | sed -e '$(transform)'`
-gnucash-launcher: gnucash-launcher.in ${top_builddir}/config.status Makefile
- rm -f $@.tmp
- sed < $< > $@.tmp \
- -e "s#@-GNUCASH_BIN_INSTALL_NAME-@#${GNUCASH_BIN_INSTALL_NAME}#g"
- mv $@.tmp $@
- chmod u+x $@
-
-gnucash-gdb: gnucash-gdb.in ${top_builddir}/config.status Makefile
- rm -f $@.tmp
- sed < $< > $@.tmp \
- -e "s#@-GNUCASH_BIN_INSTALL_NAME-@#${GNUCASH_BIN_INSTALL_NAME}#g"
- mv $@.tmp $@
- chmod u+x $@
-
gnucash-valgrind: gnucash-valgrind.in ${top_builddir}/config.status Makefile
rm -f $@.tmp
sed < $< > $@.tmp \
@@ -97,21 +68,6 @@
mv $@.tmp $@
chmod u+x $@
-gnucash-setup-env: gnucash-setup-env-osx.in ${top_builddir}/config.status Makefile
- rm -f $@.tmp
- sed < $< > $@.tmp \
- -e 's#@-BIN_DIR-@#${bindir}#g' \
- -e 's#@-GNC_DBD_DIR-@#${GNC_DBD_DIR}#g' \
- -e 's#@-GNC_GUILE_MODULE_DIR-@#${GNC_SHAREDIR}/guile-modules#g' \
- -e 's#@-GNC_SCM_INSTALL_DIR-@#${GNC_SCM_INSTALL_DIR}#g' \
- -e 's#@-GNC_LIB_INSTALLDIR-@#${libdir}#' \
- -e 's#@-GNC_PKGLIB_INSTALLDIR-@#${pkglibdir}#g' \
- -e "s#@-TOP_SRC_DIR-@#`pwd`/${top_srcdir}#g" \
- -e 's#@-PATH_SEPARATOR-@#${PATH_SEPARATOR}#g' \
- -e 's#@-PREFIX-@#${prefix}#g'
- mv $@.tmp $@
- chmod u+x $@
-
environment: environment.in ${top_builddir}/config.status Makefile
rm -f $@.tmp
sed < $< > $@.tmp \
@@ -168,10 +124,7 @@
EXTRA_DIST = \
generate-gnc-script \
- gnucash-launcher.in \
gnucash-valgrind.in \
- gnucash-gdb.in \
- environment.in \
- gnucash-setup-env-osx.in
+ environment.in
AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.bin\"
Modified: gnucash/trunk/src/bin/gnucash-bin.c
===================================================================
--- gnucash/trunk/src/bin/gnucash-bin.c 2013-10-09 05:28:15 UTC (rev 23289)
+++ gnucash/trunk/src/bin/gnucash-bin.c 2013-10-13 17:11:39 UTC (rev 23290)
@@ -157,7 +157,6 @@
_("To find the last stable version, please refer to http://www.gnucash.org"));
}
-#ifndef MAC_INTEGRATION
static gchar *environment_expand(gchar *param)
{
gchar *search_start;
@@ -333,7 +332,7 @@
g_key_file_free(keyfile);
}
-#else /* MAC_INTEGRATION */
+#ifdef MAC_INTEGRATION
static void
set_mac_locale()
{
@@ -858,9 +857,8 @@
*/
#ifdef MAC_INTEGRATION
set_mac_locale();
-#else
- environment_override();
#endif
+ environment_override();
#ifdef HAVE_GETTEXT
{
gchar *localedir = gnc_path_get_localedir();
Deleted: gnucash/trunk/src/bin/gnucash-gdb.in
===================================================================
--- gnucash/trunk/src/bin/gnucash-gdb.in 2013-10-09 05:28:15 UTC (rev 23289)
+++ gnucash/trunk/src/bin/gnucash-gdb.in 2013-10-13 17:11:39 UTC (rev 23290)
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-BIN_DIR=$(dirname $0)
-[ -e ${BIN_DIR}/gnucash-setup-env ] && \
- . ${BIN_DIR}/gnucash-setup-env
-
-exec gdb ${BIN_DIR}/@-GNUCASH_BIN_INSTALL_NAME-@ "$@"
Deleted: gnucash/trunk/src/bin/gnucash-launcher.in
===================================================================
--- gnucash/trunk/src/bin/gnucash-launcher.in 2013-10-09 05:28:15 UTC (rev 23289)
+++ gnucash/trunk/src/bin/gnucash-launcher.in 2013-10-13 17:11:39 UTC (rev 23290)
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-BIN_DIR=$(dirname $0)
-[ -e ${BIN_DIR}/gnucash-setup-env ] && \
- . ${BIN_DIR}/gnucash-setup-env
-
-exec ${BIN_DIR}/@-GNUCASH_BIN_INSTALL_NAME-@ "$@"
Deleted: gnucash/trunk/src/bin/gnucash-setup-env-osx.in
===================================================================
--- gnucash/trunk/src/bin/gnucash-setup-env-osx.in 2013-10-09 05:28:15 UTC (rev 23289)
+++ gnucash/trunk/src/bin/gnucash-setup-env-osx.in 2013-10-13 17:11:39 UTC (rev 23290)
@@ -1,37 +0,0 @@
-# If you make any changes here, you should probably also change the equivalent sections
-# in packaging/win32/gnucash.iss.in, packaging/win32/install.sh and src/bin/gnucash-setup-env.in
-
-PATH="@-BIN_DIR-@:${PATH}"
-export PATH
-XDG_CONFIG_DIRS=@-PREFIX-@/etc/xdg
-export XDG_CONFIG_DIRS
-XDG_DATA_DIRS=@-PREFIX-@/share
-export XDG_DATA_DIRS
-
-
-GUILE_WARN_DEPRECATED="no"
-export GUILE_WARN_DEPRECATED
-
-GNC_MODULE_PATH="@-GNC_PKGLIB_INSTALLDIR-@:${GNC_MODULE_PATH}"
-
-EXTRA_PATH="${EXTRA_PATH}:@-GNC_GUILE_MODULE_DIR-@"
-EXTRA_PATH="${EXTRA_PATH}:@-GNC_SCM_INSTALL_DIR-@"
-GUILE_LOAD_PATH="${EXTRA_PATH}:${GUILE_LOAD_PATH}"
-
-EXTRA_LIBS="/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/"
-EXTRA_LIBS="${EXTRA_LIBS}:@-GNC_LIB_INSTALLDIR-@"
-
-LD_LIBRARY_PATH="${EXTRA_LIBS}:${LD_LIBRARY_PATH}"
-DYLD_LIBRARY_PATH="${EXTRA_LIBS}:${DYLD_LIBRARY_PATH}"
-GNC_DBD_DIR="@-GNC_DBD_DIR-@"
-
-export GNC_MODULE_PATH
-export GUILE_LOAD_PATH
-export LD_LIBRARY_PATH
-export DYLD_LIBRARY_PATH
-export GNC_DBD_DIR
-export GNC_DOT_DIR="$HOME/Library/Application Support/Gnucash"
-
-if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
- eval `dbus-launch --sh-syntax --exit-with-session --config-file=@-PREFIX-@/etc/dbus-1/session.conf`
-fi
More information about the gnucash-changes
mailing list