IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make sure the right gnc-fq-* scripts are used.

Browse Source 
With the original configuration, whatever script was found first on the path was used.
When testing development versions, this caused the also installed stable version to 
be used as it happened to appear first on the path.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19651 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Geert Janssens 2010-10-13 16:11:44 +00:00
parent f58788f91c
commit de7b16533e
6 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core-utils/core-utils.i
View File

@ -12,11 +12,9 @@ SCM scm_init_sw_core_utils_module (void);
%import "base-typemaps.i"
%newobject g_find_program_in_path;
gchar * g_find_program_in_path(const gchar *);
gboolean gnc_is_debugging(void);
gchar * gnc_path_get_bindir(void);
gchar * gnc_path_get_stdreportsdir(void);
gchar * gnc_build_dotgnucash_path(const gchar *);
gchar * gnc_build_report_path(const gchar *);

2
src/core-utils/core-utils.scm
View File

@ -10,11 +10,11 @@
(use-modules (sw_core_utils))
(re-export gnc-is-debugging)
(re-export gnc-path-get-bindir)
(re-export gnc-path-get-stdreportsdir)
(re-export gnc-build-dotgnucash-path)
(re-export gnc-build-report-path)
(re-export gnc-build-stdreports-path)
(re-export g-find-program-in-path)
(re-export gnc-utf8?)
(re-export gnc-utf8-strip-invalid-strdup)
(re-export gnc-locale-from-utf8)

10
src/core-utils/gnc-path.c
View File

@ -31,6 +31,16 @@ gchar *gnc_path_get_prefix()
return gnc_gbr_find_prefix (PREFIX);
}
/** Returns the bindir path, usually
* "$prefix/bin".
*
* @returns A newly allocated string. */
gchar *gnc_path_get_bindir()
{
//printf("Returning bindir %s\n", gnc_gbr_find_bin_dir (BINDIR));
return gnc_gbr_find_bin_dir (BINDIR);
}
/** Returns the libdir path, usually
* "$prefix/lib". Needed for gnome_program_init().
*

6
src/core-utils/gnc-path.h
View File

@ -31,6 +31,12 @@
* @returns A newly allocated string. */
gchar *gnc_path_get_prefix(void);
/** Returns the bindir path, usually
* "$prefix/bin".
*
* @returns A newly allocated string. */
gchar *gnc_path_get_bindir(void);
/** Returns the libdir path, usually
* "$prefix/lib". Needed for gnome_program_init(void).
*

1
src/core-utils/gncla-dir.h.in
View File

@ -27,6 +27,7 @@
#define DATADIR "@-datadir-@"
#define SYSCONFDIR "@-sysconfdir-@"
#define BINDIR "@-bindir-@"
#define LIBDIR "@-libdir-@"
#define LOCALE_DATADIRNAME "@-DATADIRNAME-@"

4
src/scm/price-quotes.scm
View File

@ -240,7 +240,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define gnc:*finance-quote-check*
(g-find-program-in-path "gnc-fq-check"))
(string-append (gnc-path-get-bindir) "/gnc-fq-check"))
(define (gnc:fq-check-sources)
(let ((program '())
@ -286,7 +286,7 @@
;; src/engine/gnc-pricedb.h
(define gnc:*finance-quote-helper*
(g-find-program-in-path "gnc-fq-helper"))
(string-append (gnc-path-get-bindir) "/gnc-fq-helper"))
(define (gnc:fq-get-quotes requests)
;; requests should be a list where each item is of the form