gnucash maint: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Sun Oct 26 18:08:01 EDT 2014
Updated via https://github.com/Gnucash/gnucash/commit/5acdbb6f (commit)
via https://github.com/Gnucash/gnucash/commit/283dfa2d (commit)
from https://github.com/Gnucash/gnucash/commit/25a7e9cc (commit)
commit 5acdbb6f52bc449d19fdc7b0b5ec147a9ff99e40
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sun Oct 26 23:05:55 2014 +0100
Rewrite old-fashioned makefile construct
diff --git a/src/app-utils/test/Makefile.am b/src/app-utils/test/Makefile.am
index 3a00263..8510dff 100644
--- a/src/app-utils/test/Makefile.am
+++ b/src/app-utils/test/Makefile.am
@@ -31,7 +31,7 @@ TESTS_ENVIRONMENT = \
GUILE_WARN_DEPRECATED=no \
GUILE="${GUILE}" \
SRCDIR=${srcdir} \
- GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
+ GNC_BUILDDIR="${abs_top_builddir}" \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
LDADD = \
diff --git a/src/backend/xml/test/Makefile.am b/src/backend/xml/test/Makefile.am
index f32419f..0575f90 100644
--- a/src/backend/xml/test/Makefile.am
+++ b/src/backend/xml/test/Makefile.am
@@ -216,7 +216,7 @@ TESTS_ENVIRONMENT = \
GNC_ACCOUNT_PATH=${top_srcdir}/accounts/C \
GNC_TEST_FILES=test-files/xml2 \
SRCDIR=${srcdir} \
- GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
+ GNC_BUILDDIR="${abs_top_builddir}" \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
check_LTLIBRARIES = libgnc-test-file-stuff.la
diff --git a/src/engine/test/Makefile.am b/src/engine/test/Makefile.am
index 38fc13a..2a1ce64 100644
--- a/src/engine/test/Makefile.am
+++ b/src/engine/test/Makefile.am
@@ -67,7 +67,7 @@ TESTS_ENVIRONMENT = \
GUILE_WARN_DEPRECATED=no \
GUILE="${GUILE}" \
SRCDIR=${srcdir} \
- GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
+ GNC_BUILDDIR="${abs_top_builddir}" \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
check_PROGRAMS = \
diff --git a/src/gnome-utils/test/Makefile.am b/src/gnome-utils/test/Makefile.am
index 1ec3511..f80c4f0 100644
--- a/src/gnome-utils/test/Makefile.am
+++ b/src/gnome-utils/test/Makefile.am
@@ -30,7 +30,7 @@ TESTS_ENVIRONMENT = \
GUILE_WARN_DEPRECATED=no \
GUILE="${GUILE}" \
SRCDIR=${srcdir} \
- GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
+ GNC_BUILDDIR="${abs_top_builddir}" \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
check_PROGRAMS = \
diff --git a/src/import-export/test/Makefile.am b/src/import-export/test/Makefile.am
index 7eee4db..5363e8a 100644
--- a/src/import-export/test/Makefile.am
+++ b/src/import-export/test/Makefile.am
@@ -47,7 +47,7 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
TESTS_ENVIRONMENT = \
GUILE_WARN_DEPRECATED=no \
- GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
+ GNC_BUILDDIR="${abs_top_builddir}" \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
check_PROGRAMS = \
diff --git a/src/optional/python-bindings/tests/Makefile.am b/src/optional/python-bindings/tests/Makefile.am
index 04a96b4..d828941 100644
--- a/src/optional/python-bindings/tests/Makefile.am
+++ b/src/optional/python-bindings/tests/Makefile.am
@@ -15,7 +15,7 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
--library-dir ${top_builddir}/src/test-core
TESTS_ENVIRONMENT = \
- GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
+ GNC_BUILDDIR="${abs_top_builddir}" \
PYTHON=${PYTHON} \
PYTHONPATH=$$PYTHONPATH:$(top_builddir)/src/optional/python-bindings \
PYTHONPATH=$$PYTHONPATH:$(top_builddir)/src/optional/python-bindings/.libs \
diff --git a/src/report/report-gnome/test/Makefile.am b/src/report/report-gnome/test/Makefile.am
index 4e998cc..98b12fc 100644
--- a/src/report/report-gnome/test/Makefile.am
+++ b/src/report/report-gnome/test/Makefile.am
@@ -52,7 +52,7 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
TESTS_ENVIRONMENT = \
GUILE_WARN_DEPRECATED=no \
GUILE="${GUILE}" \
- GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
+ GNC_BUILDDIR="${abs_top_builddir}" \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
diff --git a/src/report/report-system/test/Makefile.am b/src/report/report-system/test/Makefile.am
index 859454a..3e5dd8c 100644
--- a/src/report/report-system/test/Makefile.am
+++ b/src/report/report-system/test/Makefile.am
@@ -57,7 +57,7 @@ $(SCM_TESTS): %: $(srcdir)/%.scm Makefile .scm-links
TESTS_ENVIRONMENT = \
GUILE_WARN_DEPRECATED=no \
GUILE="${GUILE}" \
- GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
+ GNC_BUILDDIR="${abs_top_builddir}" \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
diff --git a/src/report/standard-reports/test/Makefile.am b/src/report/standard-reports/test/Makefile.am
index 9fe4f5b..61c48af 100644
--- a/src/report/standard-reports/test/Makefile.am
+++ b/src/report/standard-reports/test/Makefile.am
@@ -47,7 +47,7 @@ $(SCM_TESTS): %: $(srcdir)/%.scm Makefile .scm-links
TESTS_ENVIRONMENT = \
GUILE_WARN_DEPRECATED=no \
GUILE="${GUILE}" \
- GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
+ GNC_BUILDDIR="${abs_top_builddir}" \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
diff --git a/src/report/stylesheets/test/Makefile.am b/src/report/stylesheets/test/Makefile.am
index 6b8fd45..092b7be 100644
--- a/src/report/stylesheets/test/Makefile.am
+++ b/src/report/stylesheets/test/Makefile.am
@@ -33,7 +33,7 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
TESTS_ENVIRONMENT = \
GUILE_WARN_DEPRECATED=no \
GUILE="${GUILE}" \
- GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
+ GNC_BUILDDIR="${abs_top_builddir}" \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
EXTRA_DIST = test-load-module
diff --git a/src/report/utility-reports/test/Makefile.am b/src/report/utility-reports/test/Makefile.am
index de6c7f4..939305c 100644
--- a/src/report/utility-reports/test/Makefile.am
+++ b/src/report/utility-reports/test/Makefile.am
@@ -28,7 +28,7 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
TESTS_ENVIRONMENT = \
GUILE_WARN_DEPRECATED=no \
GUILE="${GUILE}" \
- GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
+ GNC_BUILDDIR="${abs_top_builddir}" \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
EXTRA_DIST = test-load-module
commit 283dfa2d8317dada0ec494f2fe933dc38320a604
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Sat Oct 25 12:31:52 2014 +0200
Fix invocations of guile function 'load-from-path'
The '.scm' extension prevents loading of a precompiled
version of the file from the %load-compiled-path and
will always trigger an autocompilation instead. Omitting
the extension properly allows the function to load a
precompiled version if it exists and is more recent than
the source file. This is only relevant for guile 2 but
works ok for guile 1.8 as well so it's changed unconditionally.
diff --git a/src/app-utils/app-utils.scm b/src/app-utils/app-utils.scm
index 4973845..85755f5 100644
--- a/src/app-utils/app-utils.scm
+++ b/src/app-utils/app-utils.scm
@@ -300,13 +300,13 @@
;; make N_ available everywhere.
(module-define! the-root-module 'N_ (module-ref (current-module) 'N_))
-(load-from-path "c-interface.scm")
-(load-from-path "config-var.scm")
-(load-from-path "options.scm")
-(load-from-path "hooks.scm")
-(load-from-path "prefs.scm")
-(load-from-path "date-utilities.scm")
-(load-from-path "simple-obj.scm")
+(load-from-path "c-interface")
+(load-from-path "config-var")
+(load-from-path "options")
+(load-from-path "hooks")
+(load-from-path "prefs")
+(load-from-path "date-utilities")
+(load-from-path "simple-obj")
;; Business options
(define gnc:*business-label* (N_ "Business"))
@@ -343,5 +343,5 @@
(export gnc:*option-section-budgeting* gnc:*option-name-default-budget*)
-(load-from-path "business-options.scm")
-(load-from-path "business-prefs.scm")
+(load-from-path "business-options")
+(load-from-path "business-prefs")
diff --git a/src/engine/engine.scm b/src/engine/engine.scm
index 2c7e008..c60b150 100644
--- a/src/engine/engine.scm
+++ b/src/engine/engine.scm
@@ -94,7 +94,7 @@
(export trans-splits)
(export gnc:transaction-scm-onto-transaction)
-(load-from-path "gnc-numeric.scm")
-(load-from-path "commodity-table.scm")
-(load-from-path "engine-interface.scm")
-(load-from-path "engine-utilities.scm")
+(load-from-path "gnc-numeric")
+(load-from-path "commodity-table")
+(load-from-path "engine-interface")
+(load-from-path "engine-utilities")
diff --git a/src/gnome-utils/gnome-utils.scm b/src/gnome-utils/gnome-utils.scm
index 4417087..fb7a9b2 100644
--- a/src/gnome-utils/gnome-utils.scm
+++ b/src/gnome-utils/gnome-utils.scm
@@ -19,7 +19,7 @@
(export gnc:kvp-option-dialog)
-(load-from-path "gnc-menu-extensions.scm")
+(load-from-path "gnc-menu-extensions")
(define (gnc:kvp-option-dialog id-type slots title changed_cb)
(let* ((options (gnc-make-kvp-options id-type))
diff --git a/src/import-export/qif-imp/qif-import.scm b/src/import-export/qif-imp/qif-import.scm
index 25cf5e9..0b42933 100644
--- a/src/import-export/qif-imp/qif-import.scm
+++ b/src/import-export/qif-imp/qif-import.scm
@@ -31,14 +31,14 @@
(gnc:module-load "gnucash/app-utils" 0)
(gnc:module-load "gnucash/gnome-utils" 0)
-(load-from-path "qif-import/qif-objects.scm") ;; class definitions
-(load-from-path "qif-import/qif-parse.scm") ;; string-to-value
-(load-from-path "qif-import/qif-utils.scm")
-(load-from-path "qif-import/qif-file.scm") ;; actual file reading
-(load-from-path "qif-import/qif-dialog-utils.scm") ;; build displays
-(load-from-path "qif-import/qif-guess-map.scm") ;; build acct mappings
-(load-from-path "qif-import/qif-to-gnc.scm") ;; conv QIF xtns to GNC
-(load-from-path "qif-import/qif-merge-groups.scm") ;; merge into user's acct
+(load-from-path "qif-import/qif-objects") ;; class definitions
+(load-from-path "qif-import/qif-parse") ;; string-to-value
+(load-from-path "qif-import/qif-utils")
+(load-from-path "qif-import/qif-file") ;; actual file reading
+(load-from-path "qif-import/qif-dialog-utils") ;; build displays
+(load-from-path "qif-import/qif-guess-map") ;; build acct mappings
+(load-from-path "qif-import/qif-to-gnc") ;; conv QIF xtns to GNC
+(load-from-path "qif-import/qif-merge-groups") ;; merge into user's acct
(export make-qif-file)
(export make-ticker-map)
diff --git a/src/report/report-system/html-barchart.scm b/src/report/report-system/html-barchart.scm
index 0a04f62..c1b62c8 100644
--- a/src/report/report-system/html-barchart.scm
+++ b/src/report/report-system/html-barchart.scm
@@ -21,7 +21,7 @@
;; Boston, MA 02110-1301, USA gnu at gnu.org
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(load-from-path "html-jqplot.scm")
+(load-from-path "html-jqplot")
(define <html-barchart>
(make-record-type "<html-barchart>"
diff --git a/src/report/report-system/html-piechart.scm b/src/report/report-system/html-piechart.scm
index 5c5a251..7bff905 100644
--- a/src/report/report-system/html-piechart.scm
+++ b/src/report/report-system/html-piechart.scm
@@ -21,7 +21,7 @@
;; Boston, MA 02110-1301, USA gnu at gnu.org
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(load-from-path "html-jqplot.scm")
+(load-from-path "html-jqplot")
(define <html-piechart>
(make-record-type "<html-piechart>"
diff --git a/src/report/report-system/html-scatter.scm b/src/report/report-system/html-scatter.scm
index deaa13c..d1b5f22 100644
--- a/src/report/report-system/html-scatter.scm
+++ b/src/report/report-system/html-scatter.scm
@@ -24,7 +24,7 @@
;; Boston, MA 02110-1301, USA gnu at gnu.org
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(load-from-path "html-jqplot.scm")
+(load-from-path "html-jqplot")
(define <html-scatter>
(make-record-type "<html-scatter>"
diff --git a/src/report/report-system/report-system.scm b/src/report/report-system/report-system.scm
index 357651a..ff74462 100644
--- a/src/report/report-system/report-system.scm
+++ b/src/report/report-system/report-system.scm
@@ -700,22 +700,22 @@
(export gnc:get-assoc-account-balances-total)
(export make-file-url)
-(load-from-path "commodity-utilities.scm")
-(load-from-path "html-barchart.scm")
-(load-from-path "html-document.scm")
-(load-from-path "html-piechart.scm")
-(load-from-path "html-scatter.scm")
-(load-from-path "html-linechart.scm")
-(load-from-path "html-style-info.scm")
-(load-from-path "html-fonts.scm")
-
-(load-from-path "html-style-sheet.scm")
-(load-from-path "html-table.scm")
-(load-from-path "html-text.scm")
-(load-from-path "html-acct-table.scm")
-(load-from-path "html-utilities.scm")
-(load-from-path "options-utilities.scm")
-(load-from-path "report-utilities.scm")
-(load-from-path "report.scm")
+(load-from-path "commodity-utilities")
+(load-from-path "html-barchart")
+(load-from-path "html-document")
+(load-from-path "html-piechart")
+(load-from-path "html-scatter")
+(load-from-path "html-linechart")
+(load-from-path "html-style-info")
+(load-from-path "html-fonts")
+
+(load-from-path "html-style-sheet")
+(load-from-path "html-table")
+(load-from-path "html-text")
+(load-from-path "html-acct-table")
+(load-from-path "html-utilities")
+(load-from-path "options-utilities")
+(load-from-path "report-utilities")
+(load-from-path "report")
(gnc-hook-add-scm-dangler HOOK-SAVE-OPTIONS gnc:save-style-sheet-options)
diff --git a/src/report/standard-reports/budget-barchart.scm b/src/report/standard-reports/budget-barchart.scm
index ccc1372..d85d719 100644
--- a/src/report/standard-reports/budget-barchart.scm
+++ b/src/report/standard-reports/budget-barchart.scm
@@ -36,7 +36,7 @@
;; included since Bug726449
(use-modules (ice-9 regex)) ;; for regexp-substitute/global, used by jpqplot
-(load-from-path "html-jqplot.scm") ;; for jqplot-escape-string
+(load-from-path "html-jqplot") ;; for jqplot-escape-string
(define reportname (N_ "Budget Barchart"))
diff --git a/src/report/standard-reports/category-barchart.scm b/src/report/standard-reports/category-barchart.scm
index 567593e..f30ba73 100644
--- a/src/report/standard-reports/category-barchart.scm
+++ b/src/report/standard-reports/category-barchart.scm
@@ -37,7 +37,7 @@
;; included since Bug726449
(use-modules (ice-9 regex)) ;; for regexp-substitute/global, used by jpqplot
-(load-from-path "html-jqplot.scm") ;; for jqplot-escape-string
+(load-from-path "html-jqplot") ;; for jqplot-escape-string
;; The option names are defined here to 1. save typing and 2. avoid
;; spelling errors. The *reportnames* are defined here (and not only
diff --git a/src/report/standard-reports/net-barchart.scm b/src/report/standard-reports/net-barchart.scm
index 2b3693b..1934c97 100644
--- a/src/report/standard-reports/net-barchart.scm
+++ b/src/report/standard-reports/net-barchart.scm
@@ -39,7 +39,7 @@
;; included since Bug726449
(use-modules (ice-9 regex)) ;; for regexp-substitute/global, used by jpqplot
-(load-from-path "html-jqplot.scm") ;; for jqplot-escape-string
+(load-from-path "html-jqplot") ;; for jqplot-escape-string
(define reportname (N_ "Income/Expense Chart"))
diff --git a/src/scm/main.scm b/src/scm/main.scm
index a438712..b29baff 100644
--- a/src/scm/main.scm
+++ b/src/scm/main.scm
@@ -42,8 +42,8 @@
;; files we can load from the top-level because they're "well behaved"
;; (these should probably be in modules eventually)
-(load-from-path "string.scm")
-(load-from-path "fin.scm")
+(load-from-path "string")
+(load-from-path "fin")
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Exports
@@ -57,7 +57,7 @@
(export gnc:safe-strcmp) ;; only used by aging.scm atm...
;; Get the Makefile.am/configure.in generated variables.
-(load-from-path "build-config.scm")
+(load-from-path "build-config")
;; Do this stuff very early -- but other than that, don't add any
;; executable code until the end of the file if you can help it.
diff --git a/src/tax/us/de_DE.scm b/src/tax/us/de_DE.scm
index 5dcd7ce..186919c 100644
--- a/src/tax/us/de_DE.scm
+++ b/src/tax/us/de_DE.scm
@@ -29,5 +29,5 @@
(export gnc:*tax-label* gnc:*tax-nr-label*)
-(load-from-path "txf-de_DE.scm")
-(load-from-path "txf-help-de_DE.scm")
+(load-from-path "txf-de_DE")
+(load-from-path "txf-help-de_DE")
diff --git a/src/tax/us/us.scm b/src/tax/us/us.scm
index 9610f68..0a23a6a 100644
--- a/src/tax/us/us.scm
+++ b/src/tax/us/us.scm
@@ -21,5 +21,5 @@
(export txf-asset-categories)
(export txf-liab-eq-categories)
-(load-from-path "txf.scm")
-(load-from-path "txf-help.scm")
+(load-from-path "txf")
+(load-from-path "txf-help")
Summary of changes:
src/app-utils/app-utils.scm | 18 ++++++------
src/app-utils/test/Makefile.am | 2 +-
src/backend/xml/test/Makefile.am | 2 +-
src/engine/engine.scm | 8 +++---
src/engine/test/Makefile.am | 2 +-
src/gnome-utils/gnome-utils.scm | 2 +-
src/gnome-utils/test/Makefile.am | 2 +-
src/import-export/qif-imp/qif-import.scm | 16 +++++------
src/import-export/test/Makefile.am | 2 +-
src/optional/python-bindings/tests/Makefile.am | 2 +-
src/report/report-gnome/test/Makefile.am | 2 +-
src/report/report-system/html-barchart.scm | 2 +-
src/report/report-system/html-piechart.scm | 2 +-
src/report/report-system/html-scatter.scm | 2 +-
src/report/report-system/report-system.scm | 34 +++++++++++------------
src/report/report-system/test/Makefile.am | 2 +-
src/report/standard-reports/budget-barchart.scm | 2 +-
src/report/standard-reports/category-barchart.scm | 2 +-
src/report/standard-reports/net-barchart.scm | 2 +-
src/report/standard-reports/test/Makefile.am | 2 +-
src/report/stylesheets/test/Makefile.am | 2 +-
src/report/utility-reports/test/Makefile.am | 2 +-
src/scm/main.scm | 6 ++--
src/tax/us/de_DE.scm | 4 +--
src/tax/us/us.scm | 4 +--
25 files changed, 63 insertions(+), 63 deletions(-)
More information about the gnucash-changes
mailing list