r19263 - gnucash/trunk - Finish direct binary execution on Windows and linux and cleanup bin Makefile/targets
Geert Janssens
gjanssens at code.gnucash.org
Wed Jun 16 08:45:34 EDT 2010
Author: gjanssens
Date: 2010-06-16 08:45:34 -0400 (Wed, 16 Jun 2010)
New Revision: 19263
Trac: http://svn.gnucash.org/trac/changeset/19263
Added:
gnucash/trunk/src/bin/gnucash-launcher.in
Removed:
gnucash/trunk/src/bin/environment-osx.in
gnucash/trunk/src/bin/gnucash.in
Modified:
gnucash/trunk/packaging/win32/dist-impl.sh
gnucash/trunk/packaging/win32/gnucash.iss.in
gnucash/trunk/packaging/win32/install-impl.sh
gnucash/trunk/src/bin/Makefile.am
gnucash/trunk/src/bin/environment.in
gnucash/trunk/src/bin/gnucash-gdb.in
gnucash/trunk/src/bin/gnucash-valgrind.in
Log:
Finish direct binary execution on Windows and linux and cleanup bin Makefile/targets
- Windows
* binary name becomes GnuCash.exe
* gnucash.cmd is renamed to gnucash-launcer.cmd (consistent with OS X). This file is only needed to run GnuCash straight from the source installation. It is not used (or distributed) with the Windows Installer version.
* gnucash-valgrind, gnucash-gdb and the override extra's have been removed as they are meant for a UNIX like environment
- Linux/others
* binary name becomes gnucash
* the gnucash launch script has been removed together with gnucash-gdb. They no longer add value on linux.
* gnucash-valgrind has been retained because it contains useful presets
- OS X (Quartz)
* binary name remains gnucash-bin for now (requires synchronous changes in the externally hosted OS X build system)
* gnucash launcher script has been renamed to gnucash-launcher. This file is only needed to run GnuCash straight from the source installation. It is not used (or distributed) in the OS X bundle version.
* gnucash-gdb and gnucash-valgrind remain and can be used for debugging the source installation.
Modified: gnucash/trunk/packaging/win32/dist-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/dist-impl.sh 2010-06-16 08:48:47 UTC (rev 19262)
+++ gnucash/trunk/packaging/win32/dist-impl.sh 2010-06-16 12:45:34 UTC (rev 19263)
@@ -223,7 +223,6 @@
cp -a $_INSTALL_UDIR/etc/gconf/schemas/* $DIST_UDIR/etc/gconf/schemas
mkdir -p $DIST_UDIR/lib
cp -a $_INSTALL_UDIR/lib/lib*.la $DIST_UDIR/lib
- cp -a $_INSTALL_UDIR/libexec $DIST_UDIR
mkdir -p $DIST_UDIR/share
cp -a $_INSTALL_UDIR/share/{gnucash,locale} $DIST_UDIR/share
cp -a $_REPOS_UDIR/packaging/win32/install-fq-mods.cmd $DIST_UDIR/bin
Modified: gnucash/trunk/packaging/win32/gnucash.iss.in
===================================================================
--- gnucash/trunk/packaging/win32/gnucash.iss.in 2010-06-16 08:48:47 UTC (rev 19262)
+++ gnucash/trunk/packaging/win32/gnucash.iss.in 2010-06-16 12:45:34 UTC (rev 19263)
@@ -41,25 +41,25 @@
Name: menuicon; Description: "{cm:CreateMenuLink}"; GroupDescription: "{cm:AdditionalIcons}"
[Icons]
-Name: "{group}\GnuCash"; Filename: "{app}\bin\gnucash-bin.exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: menuicon; Flags: runminimized
+Name: "{group}\GnuCash"; Filename: "{app}\bin\GnuCash.exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: menuicon
Name: "{group}\{cm:IconName_README}"; Filename: "{app}\doc\gnucash\{cm:IconFilename_README}"; Comment: "{cm:IconComment_README}"; Tasks: menuicon
Name: "{group}\{cm:IconName_FAQ}"; Filename: "http://wiki.gnucash.org/wiki/FAQ"; Tasks: menuicon
Name: "{group}\{cm:IconName_Bugzilla}"; Filename: "http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash"; Tasks: menuicon
Name: "{group}\{cm:IconName_InstallFQ}"; Filename: "{app}\bin\install-fq-mods.cmd"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_InstallFQ}"; Tasks: menuicon
Name: "{group}\{cm:IconName_Uninstall}"; Filename: "{uninstallexe}"; Comment: "{cm:IconComment_Uninstall}"; Tasks: menuicon
-Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\gnucash-bin.exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: desktopicon; Flags: runminimized
+Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\GnuCash.exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
[Run]
-Filename: "{app}\bin\gnucash-bin.exe"; Description: "{cm:RunPrg}"; WorkingDir: "{app}\bin"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent runhidden
+Filename: "{app}\bin\GnuCash.exe"; Description: "{cm:RunPrg}"; WorkingDir: "{app}\bin"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent
Filename: "{app}\bin\guile.cmd"; Parameters: "-c ""(use-modules (ice-9 slib)) (require 'printf)"""; Flags: runhidden
;; The Windows firewall exceptions, see http://www.vincenzo.net/isxkb/index.php?title=Adding_a_rule_to_the_Windows_firewall
-Filename: "{sys}\netsh.exe"; Parameters: "firewall add allowedprogram ""{app}\bin\gnucash-bin.exe"" ""GnuCash Free Finance Manager"" ENABLE ALL"; StatusMsg: "{cm:StatusMsgFirewall}"; Flags: runhidden; MinVersion: 0,5.01.2600sp2;
+Filename: "{sys}\netsh.exe"; Parameters: "firewall add allowedprogram ""{app}\bin\GnuCash.exe"" ""GnuCash Free Finance Manager"" ENABLE ALL"; StatusMsg: "{cm:StatusMsgFirewall}"; Flags: runhidden; MinVersion: 0,5.01.2600sp2;
Filename: "{sys}\netsh.exe"; Parameters: "firewall add allowedprogram ""{app}\bin\gconfd-2.exe"" ""GConf Settings Manager"" ENABLE ALL"; StatusMsg: "{cm:StatusMsgFirewall}"; Flags: runhidden; MinVersion: 0,5.01.2600sp2;
[UninstallRun]
Filename: "{app}\bin\gconftool-2.exe"; Parameters: "--shutdown"; Flags: runhidden
-Filename: "{sys}\netsh.exe"; Parameters: "firewall delete allowedprogram program=""{app}\bin\gnucash-bin.exe"""; Flags: runhidden; MinVersion: 0,5.01.2600sp2
+Filename: "{sys}\netsh.exe"; Parameters: "firewall delete allowedprogram program=""{app}\bin\GnuCash.exe"""; Flags: runhidden; MinVersion: 0,5.01.2600sp2
Filename: "{sys}\netsh.exe"; Parameters: "firewall delete allowedprogram program=""{app}\bin\gconfd-2.exe"""; Flags: runhidden; MinVersion: 0,5.01.2600sp2
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -68,11 +68,10 @@
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
[Files]
; The main executables and DLLs
-Source: "@prefix@\..\dist\bin\*"; DestDir: "{app}\bin"; Flags: recursesubdirs ignoreversion; Components: main; AfterInstall: MyAfterInstallConfig()
-; Note: The above AfterInstall function will create the
-; gnucash.cmd file on-the-fly by the Pascal script below.
-
+Source: "@prefix@\..\dist\bin\*"; DestDir: "{app}\bin"; Flags: recursesubdirs ignoreversion; Components: main
Source: "@prefix@\..\dist\etc\*"; DestDir: "{app}\etc"; Flags: recursesubdirs; Components: main; AfterInstall: MyAfterInstallEtc()
+; Note: The above AfterInstall function will create the
+; environment config file on-the-fly by the Pascal script below.
Source: "@prefix@\..\dist\lib\*"; DestDir: "{app}\lib"; Flags: recursesubdirs; Components: main
Source: "@prefix@\..\dist\libexec\*"; DestDir: "{app}\libexec"; Flags: recursesubdirs; Components: main
Source: "@prefix@\..\dist\share\*"; DestDir: "{app}\share"; Flags: recursesubdirs; Components: main
@@ -114,7 +113,7 @@
Root: HKCR; Subkey: ".gnucash"; ValueType: string; ValueName: "Content Type"; ValueData: "application/x-gnucash"; Flags: uninsdeletevalue
Root: HKCR; Subkey: "GnuCash.Financial.Data"; ValueType: string; ValueName: ""; ValueData: "GnuCash Financial Data"; Flags: uninsdeletevalue
Root: HKCR; Subkey: "GnuCash.Financial.Data\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\share\gnucash\pixmaps\gnucash-icon.ico,0"
-Root: HKCR; Subkey: "GnuCash.Financial.Data\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\gnucash-bin.exe"" ""%1"""
+Root: HKCR; Subkey: "GnuCash.Financial.Data\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\GnuCash.exe"" ""%1"""
Root: HKLM; Subkey: "Software\GnuCash"; ValueType: none; Flags: uninsdeletekeyifempty
Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: none; Flags: uninsdeletekeyifempty
@@ -152,7 +151,6 @@
; Delete the created config script on uninstall
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
[UninstallDelete]
-Type: files; Name: "{app}\bin\gnucash.cmd"
Type: files; Name: "{app}\bin\guile.cmd"
Type: files; Name: "{app}\etc\gnucash\environment"
Type: files; Name: "{app}\share\guile\1.6\slibcat"
@@ -188,37 +186,16 @@
{ Get the installation-specific paths }
appdir := ExpandConstant('{app}');
- libdir := appdir + '\lib';
- pkglibdir := libdir + '\gnucash';
pkgdatadir := appdir + '\share\gnucash';
- { Create the gnucash.cmd file; #10 is the linefeed character and #13 CR }
+ { Create the guile.cmd file; #10 is the linefeed character and #13 CR }
- { If you make any changes here, you should probably also change the equivalent sections }
- { in packaging/win32/install.sh, src/bin/environment*.in and src/bin/gnucash-setup-env-osx.in }
- FileName := appdir + '\bin\gnucash.cmd' ;
- FileString := 'setlocal'#13#10 ;
- FileString := FileString + 'chcp ' + ExpandConstant('{cm:LanguageCodePage}') + ''#13#10 ;
- FileString := FileString + 'set PATH=' + appdir + '\bin;' + libdir + ';' + libdir + '\gnucash;%PATH%'#13#10 ;
-
- FileString := FileString + 'set GUILE_WARN_DEPRECATED=no'#13#10 ;
- FileString := FileString + 'set GNC_MODULE_PATH=' + pkglibdir + ''#13#10 ;
- FileString := FileString + 'set GUILE_LOAD_PATH=' + pkgdatadir + '\guile-modules;' + pkgdatadir + '\scm;' + appdir + '\share\guile\1.6;%GUILE_LOAD_PATH%'#13#10 ;
- FileString := FileString + 'set LTDL_LIBRARY_PATH=' + libdir + ''#13#10 ;
- FileString := FileString + 'set QOF_LIB_DIR=' + pkglibdir + ''#13#10 ;
- FileString := FileString + 'set GNC_DBD_DIR=' + libdir + '\dbd'#13#10 ;
- FileString := FileString + 'set GNC_STANDARD_REPORTS_DIR=' + pkgdatadir + '\guile-modules\gnucash\report\standard-reports'#13#10 ;
- FileString := FileString + 'set SCHEME_LIBRARY_PATH='#13#10 ;
- FileString := FileString + 'start gnucash-bin %*'#13#10 ;
-
- { Save the final file }
- Res := SaveStringToFile(FileName, FileString, False);
- if Res = False then
- MsgBox('Error on saving '+FileName+' for completing the installation', mbInformation, MB_OK);
-
FileName := appdir + '\bin\guile.cmd' ;
FileString := 'set GUILE_LOAD_PATH=' + pkgdatadir + '\guile-modules;' + pkgdatadir + '\scm;' + appdir + '\share\guile\1.6;%GUILE_LOAD_PATH%'#13#10 ;
FileString := FileString + 'start guile.exe %*'#13#10 ;
+
+ { Save the final file }
+
Res := SaveStringToFile(FileName, FileString, False);
if Res = False then
MsgBox('Error on saving '+FileName+' for completing the installation', mbInformation, MB_OK);
Modified: gnucash/trunk/packaging/win32/install-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/install-impl.sh 2010-06-16 08:48:47 UTC (rev 19262)
+++ gnucash/trunk/packaging/win32/install-impl.sh 2010-06-16 12:45:34 UTC (rev 19263)
@@ -1403,7 +1403,7 @@
# the equivalent sections in packaging/win32/gnucash.iss.in, and
# src/bin/environment*.in
qpushd $_INSTALL_UDIR/bin
- cat > gnucash.cmd <<EOF
+ cat > gnucash-launcher.cmd <<EOF
@echo off
setlocal
set PATH=$INSTALL_DIR\\bin;%PATH%
@@ -1430,7 +1430,7 @@
set LTDL_LIBRARY_PATH=${INSTALL_DIR}\\lib
-start gnucash-bin %*
+start GnuCash %*
EOF
qpopd
fi
Modified: gnucash/trunk/src/bin/Makefile.am
===================================================================
--- gnucash/trunk/src/bin/Makefile.am 2010-06-16 08:48:47 UTC (rev 19262)
+++ gnucash/trunk/src/bin/Makefile.am 2010-06-16 12:45:34 UTC (rev 19263)
@@ -1,5 +1,9 @@
# Order is important here.
+if !PLATFORM_WIN32
SUBDIRS = . overrides test
+else
+SUBDIRS = . test
+endif
AM_CPPFLAGS = -I${top_builddir} ${GLIB_CFLAGS} ${GNOME_CFLAGS} ${GTK_CFLAGS} \
-DPKGSYSCONFDIR=\"${GNC_CONFIGDIR}\" \
@@ -17,24 +21,51 @@
${GUILE_INCS} \
${IGE_MAC_CFLAGS}
+SUFFIXES = .rc .res
+
+# Some settings are platform dependent. Let's define them per platform.
if PLATFORM_WIN32
+# Windows specific settings go here:
+BIN_NAME = GnuCash
+GnuCash_SOURCES = ${gnucash_SOURCES}
+GnuCash_LDADD = ${gnucash_LDADD}
GNUCASH_RESOURCE_FILE = gnucash.rc
-else
-GNUCASH_RESOURCE_FILE =
-endif
+dist_noinst_DATA = gnucash.rc
-SUFFIXES = .rc .res
-
-if PLATFORM_WIN32
.rc.res:
$(AM_V_GEN)$(RC) -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:
+BIN_NAME = gnucash-bin
+gnucash_bin_SOURCES = ${gnucash_SOURCES}
+gnucash_bin_LDADD = ${gnucash_LDADD}
+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
-dist_noinst_DATA = gnucash.rc
+else !PLATFORM_OSX_QUARTZ
+# All other platforms use these settings:
+BIN_NAME = gnucash
+PLATFORM_FILES = gnucash-valgrind
+configdir = ${GNC_CONFIGDIR}
+config_DATA = environment
-bin_PROGRAMS = gnucash-bin
-gnucash_bin_SOURCES = gnucash-bin.c ${GNUCASH_RESOURCE_FILE}
-gnucash_bin_LDADD = \
+endif !PLATFORM_OSX_QUARTZ
+endif !PLATFORM_WIN32
+
+bin_PROGRAMS = ${BIN_NAME}
+gnucash_SOURCES = gnucash-bin.c ${GNUCASH_RESOURCE_FILE}
+gnucash_LDADD = \
${top_builddir}/src/libqof/qof/libgnc-qof.la \
${GUILE_LIBS} \
${GLIB_LIBS} \
@@ -47,30 +78,11 @@
${top_builddir}/src/core-utils/libgnc-core-utils.la \
${top_builddir}/src/gnc-module/libgnc-module.la
-GNUCASH_BIN_INSTALL_NAME=`echo gnucash-bin | sed -e '$(transform)'`
+GNUCASH_BIN_INSTALL_NAME=`echo ${BIN_NAME} | sed -e '$(transform)'`
-configdir = ${GNC_CONFIGDIR}
-config_DATA = environment
-
-if PLATFORM_OSX_QUARTZ
-PRE_RUN = . ${bindir}/gnucash-setup-env
-PLATFORM_FILES = gnucash-setup-env
-if CUSTOM_GNC_DBD_DIR
-gnc_dbd_dir_override = export GNC_DBD_DIR="@GNC_DBD_DIR@"
-else
-gnc_dbd_dir_override =
-endif
-
-else
-PRE_RUN =
-PLATFORM_FILES =
-endif
-
-gnucash: gnucash.in ${top_builddir}/config.status Makefile
+gnucash-launcher: gnucash-launcher.in ${top_builddir}/config.status Makefile
rm -f $@.tmp
sed < $< > $@.tmp \
- -e 's#@-BIN_DIR-@#${bindir}#g' \
- -e "s#@-PRE_RUN-@#${PRE_RUN}#g" \
-e "s#@-GNUCASH_BIN_INSTALL_NAME-@#${GNUCASH_BIN_INSTALL_NAME}#g"
mv $@.tmp $@
chmod u+x $@
@@ -78,8 +90,6 @@
gnucash-gdb: gnucash-gdb.in ${top_builddir}/config.status Makefile
rm -f $@.tmp
sed < $< > $@.tmp \
- -e 's#@-BIN_DIR-@#${bindir}#g' \
- -e "s#@-PRE_RUN-@#${PRE_RUN}#g" \
-e "s#@-GNUCASH_BIN_INSTALL_NAME-@#${GNUCASH_BIN_INSTALL_NAME}#g"
mv $@.tmp $@
chmod u+x $@
@@ -87,14 +97,11 @@
gnucash-valgrind: gnucash-valgrind.in ${top_builddir}/config.status Makefile
rm -f $@.tmp
sed < $< > $@.tmp \
- -e 's#@-BIN_DIR-@#${bindir}#g' \
-e "s#@-TOP_SRC_DIR-@#${abs_top_srcdir}#g" \
- -e "s#@-PRE_RUN-@#${PRE_RUN}#g" \
-e "s#@-GNUCASH_BIN_INSTALL_NAME-@#${GNUCASH_BIN_INSTALL_NAME}#g"
mv $@.tmp $@
chmod u+x $@
-if PLATFORM_OSX_QUARTZ
gnucash-setup-env: gnucash-setup-env-osx.in ${top_builddir}/config.status Makefile
rm -f $@.tmp
sed < $< > $@.tmp \
@@ -110,7 +117,6 @@
-e 's#@-PREFIX-@#${prefix}#g'
mv $@.tmp $@
chmod u+x $@
-endif
environment: ${GNUCASH_ENVIRONMENT}.in ${top_builddir}/config.status Makefile
rm -f $@.tmp
@@ -129,8 +135,11 @@
mv $@.tmp $@
chmod u+x $@
-CLEANFILES = $(BUILT_SOURCES) gnucash gnucash-valgrind gnucash-gdb environment ${PLATFORM_FILES}
+CLEANFILES = $(BUILT_SOURCES) ${config_DATA} ${PLATFORM_FILES}
+if !PLATFORM_WIN32
+# The gnucash scripts don't make sense on Windows, so will only be
+# generated and included on the other platforms.
# We handle gnucash scripts in a somewhat unexpected way, but we do
# this so that a user who doesn't necessarily have the right
# directories in their path can still invoke these commands via their
@@ -151,24 +160,11 @@
bin_SCRIPTS = \
${gnc_common_scripts} \
update-gnucash-gconf \
- gnucash \
- gnucash-valgrind \
- gnucash-gdb \
${PLATFORM_FILES}
# if you change gncoverridedir, make sure you change ./overrides/Makefile.am too.
gncoverridesdir = ${GNC_LIBEXECDIR}/overrides
-EXTRA_DIST = \
- generate-gnc-script \
- update-gnucash-gconf.in \
- gnucash.in \
- gnucash-valgrind.in \
- gnucash-gdb.in \
- environment.in \
- environment-win32.in \
- environment-osx.in
-
## Gnucash scripts -- real code is in overrides, these just get you there.
${gnc_common_scripts}: generate-gnc-script ${top_builddir}/config.status
${srcdir}/generate-gnc-script $@ "${gncoverridesdir}"
@@ -187,4 +183,15 @@
mv $@.tmp $@
chmod +x $@
+endif
+
+EXTRA_DIST = \
+ generate-gnc-script \
+ update-gnucash-gconf.in \
+ gnucash-launcher.in \
+ gnucash-valgrind.in \
+ gnucash-gdb.in \
+ environment.in \
+ environment-win32.in
+
INCLUDES = -DG_LOG_DOMAIN=\"gnc.bin\"
Deleted: gnucash/trunk/src/bin/environment-osx.in
===================================================================
--- gnucash/trunk/src/bin/environment-osx.in 2010-06-16 08:48:47 UTC (rev 19262)
+++ gnucash/trunk/src/bin/environment-osx.in 2010-06-16 12:45:34 UTC (rev 19263)
@@ -1,33 +0,0 @@
-# environment
-#
-# This configuration file can be used to change/add
-# environment variables during GnuCash startup.
-#
-# If you make any changes here, you should probably
-# also change the equivalent sections in:
-# - src/bin/environment.in
-# - src/bin/environment-win32.in
-# - packaging/win32/gnucash.iss.in
-# - packaging/win32/install.sh
-
-[Variables]
-# All settings are commented out for now. This requires more testing
-# on the interaction with the OSX bundle launcher script.
-# Until then these parameters remain set via gnucash-setup-env
-#GUILE_WARN_DEPRECATED=no
-#XDG_CONFIG_DIRS=@-PREFIX-@/etc/xdg
-#XDG_DATA_DIRS=@-PREFIX-@/share
-
-#PATH=@-BIN_DIR-@;{PATH}
-#GNC_MODULE_PATH=@-GNC_PKGLIB_INSTALLDIR-@;{GNC_MODULE_PATH}
-
-#EXTRA_PATH={EXTRA_PATH};@-GNC_GUILE_MODULE_DIR-@;@-GNC_SCM_INSTALL_DIR-@
-#GUILE_LOAD_PATH={EXTRA_PATH};{GUILE_LOAD_PATH}
-
-#EXTRA_LIBS={GNC_MODULE_PATH};/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/
-#EXTRA_LIBS={EXTRA_LIBS};@-GNC_LIB_INSTALLDIR-@;@-GNC_PKGLIB_INSTALLDIR-@
-#LD_LIBRARY_PATH={EXTRA_LIBS};${LD_LIBRARY_PATH}
-#DYLD_LIBRARY_PATH={EXTRA_LIBS};${DYLD_LIBRARY_PATH}
-
-#GNC_STANDARD_REPORTS_DIR=@-GNC_STANDARD_REPORTS_DIR-@
-#GNC_DOT_DIR={HOME}/Library/Application Support/Gnucash
Modified: gnucash/trunk/src/bin/environment.in
===================================================================
--- gnucash/trunk/src/bin/environment.in 2010-06-16 08:48:47 UTC (rev 19262)
+++ gnucash/trunk/src/bin/environment.in 2010-06-16 12:45:34 UTC (rev 19263)
@@ -19,8 +19,4 @@
EXTRA_PATH={EXTRA_PATH};@-GNC_GUILE_MODULE_DIR-@;@-GNC_SCM_INSTALL_DIR-@
GUILE_LOAD_PATH={EXTRA_PATH};{GUILE_LOAD_PATH}
-EXTRA_LIBS={GNC_MODULE_PATH};@-GNC_LIB_INSTALLDIR-@;@-GNC_PKGLIB_INSTALLDIR-@
-LD_LIBRARY_PATH={EXTRA_LIBS};{LD_LIBRARY_PATH}
-DYLD_LIBRARY_PATH={EXTRA_LIBS};{DYLD_LIBRARY_PATH}
-
GNC_STANDARD_REPORTS_DIR=@-GNC_STANDARD_REPORTS_DIR-@
Modified: gnucash/trunk/src/bin/gnucash-gdb.in
===================================================================
--- gnucash/trunk/src/bin/gnucash-gdb.in 2010-06-16 08:48:47 UTC (rev 19262)
+++ gnucash/trunk/src/bin/gnucash-gdb.in 2010-06-16 12:45:34 UTC (rev 19263)
@@ -1,4 +1,7 @@
#!/bin/sh
- at -PRE_RUN-@
-exec gdb $(dirname $0)/@-GNUCASH_BIN_INSTALL_NAME-@ "$@"
+BIN_DIR=$(dirname $0)
+[ -e ${BIN_DIR}/gnucash-setup-env ] && \
+ . ${BIN_DIR}/gnucash-setup-env
+
+exec gdb ${BIN_DIR}/@-GNUCASH_BIN_INSTALL_NAME-@ "$@"
Copied: gnucash/trunk/src/bin/gnucash-launcher.in (from rev 19249, gnucash/trunk/src/bin/gnucash.in)
===================================================================
--- gnucash/trunk/src/bin/gnucash-launcher.in (rev 0)
+++ gnucash/trunk/src/bin/gnucash-launcher.in 2010-06-16 12:45:34 UTC (rev 19263)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+BIN_DIR=$(dirname $0)
+[ -e ${BIN_DIR}/gnucash-setup-env ] && \
+ . ${BIN_DIR}/gnucash-setup-env
+
+exec ${BIN_DIR}/@-GNUCASH_BIN_INSTALL_NAME-@ "$@"
Modified: gnucash/trunk/src/bin/gnucash-valgrind.in
===================================================================
--- gnucash/trunk/src/bin/gnucash-valgrind.in 2010-06-16 08:48:47 UTC (rev 19262)
+++ gnucash/trunk/src/bin/gnucash-valgrind.in 2010-06-16 12:45:34 UTC (rev 19263)
@@ -1,6 +1,9 @@
#!/bin/sh
- at -PRE_RUN-@
+BIN_DIR=$(dirname $0)
+[ -e ${BIN_DIR}/gnucash-setup-env ] && \
+ . ${BIN_DIR}/gnucash-setup-env
+
TOP_SRC_DIR="@-TOP_SRC_DIR-@"
#
# Other potentially useful options, particularly for valgrind-2.x:
@@ -18,4 +21,4 @@
--error-limit=no \
--tool=memcheck \
--leak-check=full \
- $(dirname $0)/@-GNUCASH_BIN_INSTALL_NAME-@ "$@"
+ ${BIN_DIR}/@-GNUCASH_BIN_INSTALL_NAME-@ "$@"
Deleted: gnucash/trunk/src/bin/gnucash.in
===================================================================
--- gnucash/trunk/src/bin/gnucash.in 2010-06-16 08:48:47 UTC (rev 19262)
+++ gnucash/trunk/src/bin/gnucash.in 2010-06-16 12:45:34 UTC (rev 19263)
@@ -1,4 +0,0 @@
-#!/bin/sh
-
- at -PRE_RUN-@
-exec $(dirname $0)/@-GNUCASH_BIN_INSTALL_NAME-@ "$@"
More information about the gnucash-changes
mailing list