gnucash maint: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Mon Nov 10 12:35:23 EST 2014
Updated via https://github.com/Gnucash/gnucash/commit/5f3f9a52 (commit)
via https://github.com/Gnucash/gnucash/commit/c9bfaa8b (commit)
via https://github.com/Gnucash/gnucash/commit/be0e3581 (commit)
via https://github.com/Gnucash/gnucash/commit/97f8f39d (commit)
via https://github.com/Gnucash/gnucash/commit/2a6fcf1c (commit)
via https://github.com/Gnucash/gnucash/commit/9f15bb19 (commit)
via https://github.com/Gnucash/gnucash/commit/4e61f0fc (commit)
from https://github.com/Gnucash/gnucash/commit/cde31d6e (commit)
commit 5f3f9a525a4f0810452f58926b878fd4892f117d
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Nov 4 18:15:01 2014 +0100
Omit extension on calls to load-extension
.so was platform specific. By omitting the extension
guile properly finds the right library on both linux
and Windows (haven't tested on OS X but I assume it
to work there as well).
diff --git a/src/app-utils/app-utils.scm b/src/app-utils/app-utils.scm
index a8388cf..c62e93a 100644
--- a/src/app-utils/app-utils.scm
+++ b/src/app-utils/app-utils.scm
@@ -20,7 +20,7 @@
(guile-2
(eval-when
(compile load eval expand)
- (load-extension "libgncmod-app-utils.so" "scm_init_sw_app_utils_module")))
+ (load-extension "libgncmod-app-utils" "scm_init_sw_app_utils_module")))
(else ))
(use-modules (sw_app_utils))
(use-modules (srfi srfi-1))
diff --git a/src/app-utils/gettext.scm b/src/app-utils/gettext.scm
index 1dd82fb..eeacb81 100644
--- a/src/app-utils/gettext.scm
+++ b/src/app-utils/gettext.scm
@@ -24,7 +24,7 @@
;; Without it sw_app_utils can't be evaluated below
(eval-when
(compile load eval expand)
- (load-extension "libgncmod-app-utils.so" "scm_init_sw_app_utils_module")))
+ (load-extension "libgncmod-app-utils" "scm_init_sw_app_utils_module")))
(else
;; Syncase is deprecated and redundant in guile 2
(use-modules (ice-9 syncase))))
diff --git a/src/core-utils/core-utils.scm b/src/core-utils/core-utils.scm
index b11198c..8e45e3c 100644
--- a/src/core-utils/core-utils.scm
+++ b/src/core-utils/core-utils.scm
@@ -12,9 +12,9 @@
(guile-2
(eval-when
(compile load eval expand)
- (load-extension "libgnc-core-utils.so" "scm_init_sw_core_utils_module")))
+ (load-extension "libgnc-core-utils" "scm_init_sw_core_utils_module")))
(else
- (load-extension "libgnc-core-utils.so" "scm_init_sw_core_utils_module")))
+ (load-extension "libgnc-core-utils" "scm_init_sw_core_utils_module")))
(use-modules (sw_core_utils))
diff --git a/src/engine/engine.scm b/src/engine/engine.scm
index 1772b33..25bd7d8 100644
--- a/src/engine/engine.scm
+++ b/src/engine/engine.scm
@@ -4,7 +4,7 @@
(guile-2
(eval-when
(compile load eval expand)
- (load-extension "libgncmod-engine.so" "scm_init_sw_engine_module")))
+ (load-extension "libgncmod-engine" "scm_init_sw_engine_module")))
(else ))
(use-modules (sw_engine))
diff --git a/src/gnc-module/gnc-module.scm b/src/gnc-module/gnc-module.scm
index fb90ca1..666faea 100644
--- a/src/gnc-module/gnc-module.scm
+++ b/src/gnc-module/gnc-module.scm
@@ -13,9 +13,9 @@
(guile-2
(eval-when
(compile load eval expand)
- (load-extension "libgnc-module.so" "scm_init_sw_gnc_module_module")))
+ (load-extension "libgnc-module" "scm_init_sw_gnc_module_module")))
(else
- (load-extension "libgnc-module.so" "scm_init_sw_gnc_module_module")))
+ (load-extension "libgnc-module" "scm_init_sw_gnc_module_module")))
(use-modules (sw_gnc_module))
diff --git a/src/gnome-utils/gnome-utils.scm b/src/gnome-utils/gnome-utils.scm
index fcd922f..8b3968f 100644
--- a/src/gnome-utils/gnome-utils.scm
+++ b/src/gnome-utils/gnome-utils.scm
@@ -7,7 +7,7 @@
(guile-2
(eval-when
(compile load eval expand)
- (load-extension "libgncmod-gnome-utils.so" "scm_init_sw_gnome_utils_module")))
+ (load-extension "libgncmod-gnome-utils" "scm_init_sw_gnome_utils_module")))
(else ))
(use-modules (sw_gnome_utils))
(gnc:module-load "gnucash/app-utils" 0)
diff --git a/src/report/locale-specific/us/taxtxf.scm b/src/report/locale-specific/us/taxtxf.scm
index e0786cb..b8a274c 100644
--- a/src/report/locale-specific/us/taxtxf.scm
+++ b/src/report/locale-specific/us/taxtxf.scm
@@ -82,7 +82,7 @@
(guile-2
(eval-when
(compile load eval expand)
- (load-extension "libgncmod-gnome-utils.so" "scm_init_sw_gnome_utils_module")))
+ (load-extension "libgncmod-gnome-utils" "scm_init_sw_gnome_utils_module")))
(else ))
(use-modules (sw_gnome_utils)) ;; to get to gnc-error-dialog
diff --git a/src/report/report-gnome/report-gnome.scm b/src/report/report-gnome/report-gnome.scm
index d06fd8f..b68350b 100644
--- a/src/report/report-gnome/report-gnome.scm
+++ b/src/report/report-gnome/report-gnome.scm
@@ -17,8 +17,8 @@
(guile-2
(eval-when
(compile load eval expand)
- (load-extension "libgncmod-gnome-utils.so" "scm_init_sw_gnome_utils_module")
- (load-extension "libgncmod-report-gnome.so" "scm_init_sw_report_gnome_module")))
+ (load-extension "libgncmod-gnome-utils" "scm_init_sw_gnome_utils_module")
+ (load-extension "libgncmod-report-gnome" "scm_init_sw_report_gnome_module")))
(else ))
(use-modules (sw_report_gnome))
diff --git a/src/report/report-system/report.scm b/src/report/report-system/report.scm
index 41909e8..02a1e44 100644
--- a/src/report/report-system/report.scm
+++ b/src/report/report-system/report.scm
@@ -27,7 +27,7 @@
(guile-2
(eval-when
(compile load eval expand)
- (load-extension "libgncmod-report-system.so" "scm_init_sw_report_system_module")))
+ (load-extension "libgncmod-report-system" "scm_init_sw_report_system_module")))
(else ))
(use-modules (sw_report_system))
diff --git a/src/report/utility-reports/view-column.scm b/src/report/utility-reports/view-column.scm
index 4b7016b..780a521 100644
--- a/src/report/utility-reports/view-column.scm
+++ b/src/report/utility-reports/view-column.scm
@@ -34,7 +34,7 @@
(guile-2
(eval-when
(compile load eval expand)
- (load-extension "libgncmod-report-system.so" "scm_init_sw_report_system_module")))
+ (load-extension "libgncmod-report-system" "scm_init_sw_report_system_module")))
(else ))
(use-modules (sw_report_system))
diff --git a/src/report/utility-reports/welcome-to-gnucash.scm b/src/report/utility-reports/welcome-to-gnucash.scm
index 55b554c..9537a4e 100644
--- a/src/report/utility-reports/welcome-to-gnucash.scm
+++ b/src/report/utility-reports/welcome-to-gnucash.scm
@@ -31,7 +31,7 @@
(guile-2
(eval-when
(compile load eval expand)
- (load-extension "libgncmod-report-system.so" "scm_init_sw_report_system_module")))
+ (load-extension "libgncmod-report-system" "scm_init_sw_report_system_module")))
(else ))
(use-modules (sw_report_system))
diff --git a/src/test-core/unittest-support.scm b/src/test-core/unittest-support.scm
index 44d89ac..39678cb 100644
--- a/src/test-core/unittest-support.scm
+++ b/src/test-core/unittest-support.scm
@@ -3,9 +3,9 @@
(guile-2
(eval-when
(compile load eval expand)
- (load-extension "libtest-core-guile.so" "scm_init_unittest_support_module")))
+ (load-extension "libtest-core-guile" "scm_init_unittest_support_module")))
(else
- (load-extension "libtest-core-guile.so" "scm_init_unittest_support_module")))
+ (load-extension "libtest-core-guile" "scm_init_unittest_support_module")))
(use-modules (unittest_support))
(re-export TestErrorStruct-log-level-set)
commit c9bfaa8bb3cf803253f3ec3cfa65e3c5b38d8182
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri Oct 31 10:26:03 2014 +0100
Use one common base directory to store all scheme files and modules
This makes it easier for humans to locate a file after
installation and simplifies the build system.
diff --git a/src/app-utils/Makefile.am b/src/app-utils/Makefile.am
index 4800aff..7dcbaf4 100644
--- a/src/app-utils/Makefile.am
+++ b/src/app-utils/Makefile.am
@@ -136,7 +136,7 @@ libgncmod_app_utils_python_la_LIBADD = \
libgncmod-app-utils.la
endif
-gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
+gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash
gncscmmod_DATA = \
gettext.scm \
app-utils.scm
@@ -220,7 +220,7 @@ GUILE_COMPILE_ENV = \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<
-gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
+gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@
diff --git a/src/bin/environment.in b/src/bin/environment.in
index de40490..eef7194 100644
--- a/src/bin/environment.in
+++ b/src/bin/environment.in
@@ -49,8 +49,8 @@ GUILE_WARN_DEPRECATED=no
# Tell Guile where to find GnuCash specific guile modules
# GUILE_LIBS can be used to override the path to Guile's own modules
# GUILE_LIBS=
-GUILE_LOAD_PATH={GNC_DATA}/guile-modules;{GNC_DATA}/scm;{GUILE_LIBS};{GUILE_LOAD_PATH}
-GUILE_LOAD_COMPILED_PATH={GNC_DATA}/guile-modules/ccache/@-GUILE_EFFECTIVE_VERSION-@;{GNC_DATA}/scm/ccache/@-GUILE_EFFECTIVE_VERSION-@;{GUILE_LIBS};{GUILE_LOAD_PATH}
+GUILE_LOAD_PATH={GNC_DATA}/scm;{GUILE_LIBS};{GUILE_LOAD_PATH}
+GUILE_LOAD_COMPILED_PATH={GNC_DATA}/scm/ccache/@-GUILE_EFFECTIVE_VERSION-@;{GUILE_LIBS};{GUILE_LOAD_PATH}
# Tell Guile where to find GnuCash specific shared libraries
GNC_LIBRARY_PATH={SYS_LIB}
diff --git a/src/bin/overrides/Makefile.am b/src/bin/overrides/Makefile.am
index bacbede..2476cdf 100644
--- a/src/bin/overrides/Makefile.am
+++ b/src/bin/overrides/Makefile.am
@@ -31,7 +31,6 @@ CLEANFILES = guile
gnucash-env: gnucash-env.in ${top_builddir}/config.status Makefile
rm -f $@.tmp
sed < $< > $@.tmp \
- -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' \
diff --git a/src/bin/overrides/gnucash-env.in b/src/bin/overrides/gnucash-env.in
index cb71444..e9fc640 100644
--- a/src/bin/overrides/gnucash-env.in
+++ b/src/bin/overrides/gnucash-env.in
@@ -6,7 +6,6 @@
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}"
diff --git a/src/business/business-gnome/Makefile.am b/src/business/business-gnome/Makefile.am
index 760cfe8..0c94c37 100644
--- a/src/business/business-gnome/Makefile.am
+++ b/src/business/business-gnome/Makefile.am
@@ -83,7 +83,7 @@ libgncmod_business_gnome_la_LIBADD = \
${GLIB_LIBS} \
${EFENCE_LIBS}
-gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
+gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash
gncscmmod_DATA = business-gnome.scm
EXTRA_DIST = \
@@ -136,7 +136,7 @@ GUILE_COMPILE_ENV = \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<
-gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
+gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
endif
diff --git a/src/core-utils/Makefile.am b/src/core-utils/Makefile.am
index c63d195..5a87242 100644
--- a/src/core-utils/Makefile.am
+++ b/src/core-utils/Makefile.am
@@ -67,7 +67,7 @@ AM_CPPFLAGS = \
-I${top_builddir}/src \
-I${top_srcdir}/src
-gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
+gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash
gncscmmod_DATA = core-utils.scm
if GNUCASH_SEPARATE_BUILDDIR
@@ -122,7 +122,7 @@ GUILE_COMPILE_ENV = \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<
-gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
+gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
endif
@@ -135,7 +135,7 @@ clean-local:
CLEANFILES = $(BUILT_SOURCES) .scm-links
MAINTAINERCLEANFILES = swig-core-utils-guile.c swig-core-utils-python.c
-AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.core-utils\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.core-utils\" -DGNC_SCM_INSTALL_DIR="\"${GNC_SCM_INSTALL_DIR}\""
gncla-dir.h: gncla-dir.h.in ${top_builddir}/config.status Makefile
rm -f $@.tmp
diff --git a/src/core-utils/gnc-path.c b/src/core-utils/gnc-path.c
index c7dee88..d8f92fd 100644
--- a/src/core-utils/gnc-path.c
+++ b/src/core-utils/gnc-path.c
@@ -149,7 +149,7 @@ gchar *gnc_path_get_accountsdir()
}
/** Returns the file path to the report directory, usually
- * "$prefix/share/gnucash/guile-modules/gnucash/report".
+ * "$prefix/share/gnucash/scm/gnucash/report".
*
* @returns A newly allocated string. */
gchar *gnc_path_get_reportdir()
@@ -163,7 +163,7 @@ gchar *gnc_path_get_reportdir()
else
{
gchar *pkgdatadir = gnc_path_get_pkgdatadir ();
- result = g_build_filename (pkgdatadir, "guile-modules",
+ result = g_build_filename (GNC_SCM_INSTALL_DIR,
"gnucash", "report", (char*)NULL);
g_free (pkgdatadir);
}
@@ -173,7 +173,7 @@ gchar *gnc_path_get_reportdir()
/** Returns the file path to the standard
* reports, usually
- * "$prefix/share/gnucash/guile-modules/gnucash/report/standard-reports".
+ * "$prefix/share/gnucash/scm/gnucash/report/standard-reports".
*
* @returns A newly allocated string. */
gchar *gnc_path_get_stdreportsdir()
diff --git a/src/core-utils/gnc-path.h b/src/core-utils/gnc-path.h
index 26cc358..12cdf51 100644
--- a/src/core-utils/gnc-path.h
+++ b/src/core-utils/gnc-path.h
@@ -87,14 +87,14 @@ gchar *gnc_path_get_localedir(void);
gchar *gnc_path_get_accountsdir(void);
/** Returns the file path to the report directory, usually
- * "$prefix/share/gnucash/guile-modules/gnucash/report".
+ * "$prefix/share/gnucash/scm/gnucash/report".
*
* @returns A newly allocated string. */
gchar *gnc_path_get_reportdir(void);
/** Returns the file path to the standard
* reports, usually
- * "$prefix/share/gnucash/guile-modules/gnucash/report/standard-reports".
+ * "$prefix/share/gnucash/scm/gnucash/report/standard-reports".
*
* @returns A newly allocated string. */
gchar *gnc_path_get_stdreportsdir(void);
diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am
index 3c6b480..c3756a2 100644
--- a/src/engine/Makefile.am
+++ b/src/engine/Makefile.am
@@ -143,7 +143,7 @@ libgncmod_engine_la_LIBADD = \
${GLIB_LIBS} \
${top_builddir}/lib/libc/libc-missing.la
-gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
+gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash
gncscmmod_DATA = engine.scm \
business-core.scm
@@ -202,7 +202,7 @@ GUILE_COMPILE_ENV = \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<
-gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
+gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@
diff --git a/src/gnc-module/Makefile.am b/src/gnc-module/Makefile.am
index 17e96a3..9baafe4 100644
--- a/src/gnc-module/Makefile.am
+++ b/src/gnc-module/Makefile.am
@@ -19,7 +19,7 @@ libgnc_module_la_LIBADD = \
${GLIB_LIBS} \
${GUILE_LIBS}
-gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
+gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash
gncscmmod_DATA = gnc-module.scm
gncincludedir = ${GNC_INCLUDE_DIR}
@@ -75,7 +75,7 @@ GUILE_COMPILE_ENV = \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<
-gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
+gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
endif
diff --git a/src/gnome-utils/Makefile.am b/src/gnome-utils/Makefile.am
index 8959df0..cb8ed45 100644
--- a/src/gnome-utils/Makefile.am
+++ b/src/gnome-utils/Makefile.am
@@ -239,7 +239,7 @@ endif
endif
endif
-gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
+gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash
gncscmmod_DATA = gnome-utils.scm
gncscmdir = ${GNC_SCM_INSTALL_DIR}
@@ -289,7 +289,7 @@ GUILE_COMPILE_ENV = \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<
-gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
+gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@
diff --git a/src/import-export/qif-imp/Makefile.am b/src/import-export/qif-imp/Makefile.am
index 1e78cd2..165777d 100644
--- a/src/import-export/qif-imp/Makefile.am
+++ b/src/import-export/qif-imp/Makefile.am
@@ -28,7 +28,7 @@ libgncmod_qif_import_la_LIBADD = \
${GLIB_LIBS}
-gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/import-export
+gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/import-export
gncscmmod_DATA = qif-import.scm
gncscmdir = ${GNC_SCM_INSTALL_DIR}/qif-import
@@ -114,7 +114,7 @@ GUILE_COMPILE_ENV = \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<
-gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/import-export
+gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/import-export
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/qif-import
diff --git a/src/report/business-reports/Makefile.am b/src/report/business-reports/Makefile.am
index f2548bf..4975148 100644
--- a/src/report/business-reports/Makefile.am
+++ b/src/report/business-reports/Makefile.am
@@ -1,4 +1,4 @@
-gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report
+gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/report
gncscmmod_DATA = \
aging.scm \
customer-summary.scm \
@@ -16,7 +16,7 @@ gncscmmod_DATA = \
# Note: list these files separately because they can't be compiled by guile2
# templates are a mixture of scheme and hmtl
# css files are not scheme at all
-gncscmtpldir = ${GNC_SHAREDIR}/guile-modules/gnucash/report
+gncscmtpldir = ${GNC_SCM_INSTALL_DIR}/gnucash/report
gncscmtpl_DATA = \
taxinvoice.eguile.scm \
taxinvoice.css \
@@ -69,7 +69,7 @@ GUILE_COMPILE_ENV = \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<
-gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
+gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
endif
diff --git a/src/report/locale-specific/us/Makefile.am b/src/report/locale-specific/us/Makefile.am
index 7284e91..8bd303a 100644
--- a/src/report/locale-specific/us/Makefile.am
+++ b/src/report/locale-specific/us/Makefile.am
@@ -21,10 +21,10 @@ AM_CPPFLAGS = \
${GUILE_CFLAGS} ${GLIB_CFLAGS}
## This is unused and therefore no longer installed and/or loaded
-gncscmrptdir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/locale-specific
+gncscmrptdir = ${GNC_SCM_INSTALL_DIR}/gnucash/report/locale-specific
gncscmrpt_DATA = us.scm de_DE.scm
-gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/
+gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/report/
gncscmmod_DATA = taxtxf.scm taxtxf-de_DE.scm
if GNUCASH_SEPARATE_BUILDDIR
@@ -78,10 +78,10 @@ GUILE_COMPILE_ENV = \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<
-gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
+gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
-gncscmrptcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report/locale-specific
+gncscmrptcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report/locale-specific
gncscmrptcache_DATA = $(gncscmrpt_DATA:.scm=.go)
endif
diff --git a/src/report/report-gnome/Makefile.am b/src/report/report-gnome/Makefile.am
index 4d55c96..57a21ab 100644
--- a/src/report/report-gnome/Makefile.am
+++ b/src/report/report-gnome/Makefile.am
@@ -62,7 +62,7 @@ endif
endif
endif
-gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report
+gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/report
gncscmmod_DATA = report-gnome.scm
noinst_DATA = .scm-links
@@ -126,7 +126,7 @@ GUILE_COMPILE_ENV = \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<
-gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
+gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
endif
diff --git a/src/report/report-system/Makefile.am b/src/report/report-system/Makefile.am
index 8f103cc..c17760e 100644
--- a/src/report/report-system/Makefile.am
+++ b/src/report/report-system/Makefile.am
@@ -67,14 +67,14 @@ gncscm_DATA = \
report-utilities.scm \
report.scm
-gncmodscmdir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/report-system
+gncmodscmdir = ${GNC_SCM_INSTALL_DIR}/gnucash/report/report-system
gncmodscm_DATA = \
collectors.scm \
list-extras.scm \
report-collectors.scm
-gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/
+gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/report/
gncscmmod_DATA = \
report-system.scm \
eguile-gnc.scm \
@@ -131,10 +131,10 @@ GUILE_COMPILE_ENV = \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<
-gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
+gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
-gncmodscmcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report/report-system
+gncmodscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report/report-system
gncmodscmcache_DATA = $(gncmodscm_DATA:.scm=.go)
gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@
diff --git a/src/report/report-system/html-document.scm b/src/report/report-system/html-document.scm
index 6ca3687..9b63d09 100644
--- a/src/report/report-system/html-document.scm
+++ b/src/report/report-system/html-document.scm
@@ -155,8 +155,8 @@
(begin
;;This is the only place where <html> appears
;;with the exception of 2 reports:
- ;;./share/gnucash/guile-modules/gnucash/report/taxinvoice.eguile.scm:<html>
- ;;./share/gnucash/guile-modules/gnucash/report/balsheet-eg.eguile.scm:<html>
+ ;;./share/gnucash/scm/gnucash/report/taxinvoice.eguile.scm:<html>
+ ;;./share/gnucash/scm/gnucash/report/balsheet-eg.eguile.scm:<html>
;; Validate against XHTML 1.0 Transitional
(push "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \n\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">")
diff --git a/src/report/standard-reports/Makefile.am b/src/report/standard-reports/Makefile.am
index b940b52..1cb2bef 100644
--- a/src/report/standard-reports/Makefile.am
+++ b/src/report/standard-reports/Makefile.am
@@ -18,11 +18,11 @@ AM_CPPFLAGS = \
${GUILE_CFLAGS} \
${GLIB_CFLAGS}
-gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/
+gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/report/
gncscmmod_DATA = \
standard-reports.scm
-gncscmrptdir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/standard-reports
+gncscmrptdir = ${GNC_SCM_INSTALL_DIR}/gnucash/report/standard-reports
gncscmrpt_DATA = \
account-piecharts.scm \
account-summary.scm \
@@ -99,10 +99,10 @@ GUILE_COMPILE_ENV = \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<
-gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
+gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
-gncscmrptcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report/standard-reports
+gncscmrptcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report/standard-reports
gncscmrptcache_DATA = $(gncscmrpt_DATA:.scm=.go)
endif
diff --git a/src/report/stylesheets/Makefile.am b/src/report/stylesheets/Makefile.am
index 9882f0c..42989f2 100644
--- a/src/report/stylesheets/Makefile.am
+++ b/src/report/stylesheets/Makefile.am
@@ -33,7 +33,7 @@ AM_CPPFLAGS = \
${GLIB_CFLAGS} \
${GTK_CFLAGS}
-gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/
+gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/report/
gncscmmod_DATA = \
stylesheets.scm \
stylesheet-plain.scm \
@@ -86,7 +86,7 @@ GUILE_COMPILE_ENV = \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<
-gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
+gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
endif
diff --git a/src/report/utility-reports/Makefile.am b/src/report/utility-reports/Makefile.am
index 003fdac..8713e4d 100644
--- a/src/report/utility-reports/Makefile.am
+++ b/src/report/utility-reports/Makefile.am
@@ -16,7 +16,7 @@ AM_CPPFLAGS = \
-I${top_srcdir}/src/gnc-module \
${GUILE_CFLAGS} ${GLIB_CFLAGS}
-gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/
+gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/report/
gncscmmod_DATA = \
hello-world.scm \
utility-reports.scm \
@@ -71,7 +71,7 @@ GUILE_COMPILE_ENV = \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<
-gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
+gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
endif
diff --git a/src/scm/Makefile.am b/src/scm/Makefile.am
index 6bb04b7..6cb4486 100644
--- a/src/scm/Makefile.am
+++ b/src/scm/Makefile.am
@@ -2,7 +2,7 @@
SUBDIRS = gnumeric
gncscmdir = ${GNC_SCM_INSTALL_DIR}
-gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
+gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash
gncscmmod_DATA = main.scm price-quotes.scm printf.scm
@@ -53,7 +53,7 @@ GUILE_COMPILE_ENV = \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<
-gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
+gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@
diff --git a/src/tax/us/Makefile.am b/src/tax/us/Makefile.am
index bdfd0c7..d85e3fe 100644
--- a/src/tax/us/Makefile.am
+++ b/src/tax/us/Makefile.am
@@ -16,7 +16,7 @@ AM_CPPFLAGS = \
-I${top_srcdir}/src/gnc-module \
${GLIB_CFLAGS} ${GUILE_CFLAGS}
-gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/tax
+gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/tax
gncscmmod_DATA = us.scm de_DE.scm
gncscmdir = ${GNC_SCM_INSTALL_DIR}
@@ -62,7 +62,7 @@ GUILE_COMPILE_ENV = \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<
-gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/tax
+gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/tax
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@
diff --git a/src/test-core/Makefile.am b/src/test-core/Makefile.am
index 65da7f0..0e2257c 100644
--- a/src/test-core/Makefile.am
+++ b/src/test-core/Makefile.am
@@ -78,7 +78,7 @@ _unittest_support_la_LIBADD = \
endif
-gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
+gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash
gncscmmod_DATA = unittest-support.scm
SCM_FILES = $(gncscmmod_DATA)
@@ -107,7 +107,7 @@ GUILE_COMPILE_ENV = \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<
-gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
+gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
endif
commit be0e3581c248c0e4476e8ea550588070d28e407c
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Thu Oct 30 17:54:36 2014 +0100
Guile 2 pre-compilation improvements
1. Tell the engine to look in the build dir for the backend modules
Guile compilation loads the engine libraries for
some guile modules. This triggers the engine
initialization code which tries to load the xml backend module
and optionally the dbi module as well.
By default it looks for these modules in the installed directory
but during build they are not installed yet, so use a few
environment variables to tell the engine to look in the build
dir instead.
2. Wait for the c library to be linked before attempting to
compile the guile files. Some guile files need the library
to be available.
Note that neither fix is necessary for all directories that has
scheme files to compile. For consistency between makefiles, I have
chosen to add them to all, which won't hurt.
diff --git a/src/app-utils/Makefile.am b/src/app-utils/Makefile.am
index 2425e27..4800aff 100644
--- a/src/app-utils/Makefile.am
+++ b/src/app-utils/Makefile.am
@@ -214,7 +214,9 @@ GUILE_COMPILE_ENV = \
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/gnc-module
-%.go : %.scm .scm-links
+%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
+ GNC_UNINSTALLED=yes \
+ GNC_BUILDDIR=${top_builddir} \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<
diff --git a/src/business/business-gnome/Makefile.am b/src/business/business-gnome/Makefile.am
index 759c221..760cfe8 100644
--- a/src/business/business-gnome/Makefile.am
+++ b/src/business/business-gnome/Makefile.am
@@ -130,7 +130,9 @@ GUILE_COMPILE_ENV = \
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/gnc-module
-%.go : %.scm .scm-links
+%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
+ GNC_UNINSTALLED=yes \
+ GNC_BUILDDIR=${top_builddir} \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<
diff --git a/src/core-utils/Makefile.am b/src/core-utils/Makefile.am
index d412f2d..c63d195 100644
--- a/src/core-utils/Makefile.am
+++ b/src/core-utils/Makefile.am
@@ -116,7 +116,9 @@ if GNC_HAVE_GUILE_2
GUILE_COMPILE_ENV = \
--library-dir ${top_builddir}/src/core-utils
-%.go : %.scm .scm-links
+%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
+ GNC_UNINSTALLED=yes \
+ GNC_BUILDDIR=${top_builddir} \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<
diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am
index 723ce48..3c6b480 100644
--- a/src/engine/Makefile.am
+++ b/src/engine/Makefile.am
@@ -196,7 +196,9 @@ GUILE_COMPILE_ENV = \
--library-dir ${top_builddir}/src/engine \
--library-dir ${top_builddir}/src/gnc-module
-%.go : %.scm .scm-links
+%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
+ GNC_UNINSTALLED=yes \
+ GNC_BUILDDIR=${top_builddir} \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<
diff --git a/src/gnc-module/Makefile.am b/src/gnc-module/Makefile.am
index 5e9819c..17e96a3 100644
--- a/src/gnc-module/Makefile.am
+++ b/src/gnc-module/Makefile.am
@@ -69,7 +69,9 @@ if GNC_HAVE_GUILE_2
GUILE_COMPILE_ENV = \
--library-dir ${top_builddir}/src/gnc-module
-%.go : %.scm .scm-links
+%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
+ GNC_UNINSTALLED=yes \
+ GNC_BUILDDIR=${top_builddir} \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<
diff --git a/src/gnome-utils/Makefile.am b/src/gnome-utils/Makefile.am
index 2b02800..8959df0 100644
--- a/src/gnome-utils/Makefile.am
+++ b/src/gnome-utils/Makefile.am
@@ -283,7 +283,9 @@ GUILE_COMPILE_ENV = \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/gnome-utils
-%.go : %.scm .scm-links
+%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
+ GNC_UNINSTALLED=yes \
+ GNC_BUILDDIR=${top_builddir} \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<
diff --git a/src/import-export/qif-imp/Makefile.am b/src/import-export/qif-imp/Makefile.am
index 7bfe27b..1e78cd2 100644
--- a/src/import-export/qif-imp/Makefile.am
+++ b/src/import-export/qif-imp/Makefile.am
@@ -108,7 +108,9 @@ GUILE_COMPILE_ENV = \
--library-dir ${top_builddir}/src/gnome \
--library-dir ${top_builddir}/src/gnc-module
-%.go : %.scm .scm-links
+%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
+ GNC_UNINSTALLED=yes \
+ GNC_BUILDDIR=${top_builddir} \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<
diff --git a/src/report/business-reports/Makefile.am b/src/report/business-reports/Makefile.am
index c5f167e..f2548bf 100644
--- a/src/report/business-reports/Makefile.am
+++ b/src/report/business-reports/Makefile.am
@@ -50,6 +50,7 @@ GUILE_COMPILE_ENV = \
--gnc-module-dir ${top_builddir}/src/gnome-utils \
--gnc-module-dir ${top_builddir}/src/html \
--gnc-module-dir ${top_builddir}/src/report/report-system \
+ --gnc-module-dir ${top_builddir}/src/report/standard-reports \
--guile-load-dir ${top_builddir}/src/app-utils \
--guile-load-dir ${top_builddir}/src/core-utils \
--guile-load-dir ${top_builddir}/src/engine \
@@ -62,7 +63,9 @@ GUILE_COMPILE_ENV = \
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/gnc-module
-%.go : %.scm .scm-links
+%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
+ GNC_UNINSTALLED=yes \
+ GNC_BUILDDIR=${top_builddir} \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<
diff --git a/src/report/locale-specific/us/Makefile.am b/src/report/locale-specific/us/Makefile.am
index 1fb4dc8..7284e91 100644
--- a/src/report/locale-specific/us/Makefile.am
+++ b/src/report/locale-specific/us/Makefile.am
@@ -72,7 +72,9 @@ GUILE_COMPILE_ENV = \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/gnome-utils
-%.go : %.scm .scm-links
+%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
+ GNC_UNINSTALLED=yes \
+ GNC_BUILDDIR=${top_builddir} \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<
diff --git a/src/report/report-gnome/Makefile.am b/src/report/report-gnome/Makefile.am
index ee65689..4d55c96 100644
--- a/src/report/report-gnome/Makefile.am
+++ b/src/report/report-gnome/Makefile.am
@@ -120,7 +120,9 @@ GUILE_COMPILE_ENV = \
--library-dir ${top_builddir}/src/gnome-utils \
--library-dir ${top_builddir}/src/report/report-gnome
-%.go : %.scm .scm-links
+%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
+ GNC_UNINSTALLED=yes \
+ GNC_BUILDDIR=${top_builddir} \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<
diff --git a/src/report/report-system/Makefile.am b/src/report/report-system/Makefile.am
index d0f0f80..8f103cc 100644
--- a/src/report/report-system/Makefile.am
+++ b/src/report/report-system/Makefile.am
@@ -125,7 +125,9 @@ GUILE_COMPILE_ENV = \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/report/report-system
-%.go : %.scm .scm-links
+%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
+ GNC_UNINSTALLED=yes \
+ GNC_BUILDDIR=${top_builddir} \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<
diff --git a/src/report/standard-reports/Makefile.am b/src/report/standard-reports/Makefile.am
index 3c540bc..b940b52 100644
--- a/src/report/standard-reports/Makefile.am
+++ b/src/report/standard-reports/Makefile.am
@@ -93,7 +93,9 @@ GUILE_COMPILE_ENV = \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/report/report-system
-%.go : %.scm .scm-links
+%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
+ GNC_UNINSTALLED=yes \
+ GNC_BUILDDIR=${top_builddir} \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<
diff --git a/src/report/stylesheets/Makefile.am b/src/report/stylesheets/Makefile.am
index ecc1af6..9882f0c 100644
--- a/src/report/stylesheets/Makefile.am
+++ b/src/report/stylesheets/Makefile.am
@@ -80,7 +80,9 @@ GUILE_COMPILE_ENV = \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/gnome-utils
-%.go : %.scm .scm-links
+%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
+ GNC_UNINSTALLED=yes \
+ GNC_BUILDDIR=${top_builddir} \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<
diff --git a/src/report/utility-reports/Makefile.am b/src/report/utility-reports/Makefile.am
index cb0dcdc..003fdac 100644
--- a/src/report/utility-reports/Makefile.am
+++ b/src/report/utility-reports/Makefile.am
@@ -50,12 +50,14 @@ if GNC_HAVE_GUILE_2
GUILE_COMPILE_ENV = \
--gnc-module-dir ${top_builddir}/src/app-utils \
--gnc-module-dir ${top_builddir}/src/engine \
+ --gnc-module-dir ${top_builddir}/src/gnome-utils \
--gnc-module-dir ${top_builddir}/src/html \
--gnc-module-dir ${top_builddir}/src/report/report-system \
--guile-load-dir ${top_builddir}/src/app-utils \
--guile-load-dir ${top_builddir}/src/core-utils \
--guile-load-dir ${top_builddir}/src/engine \
--guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/gnome-utils \
--guile-load-dir ${top_builddir}/src/report/report-system \
--guile-load-dir ${top_builddir}/src/scm \
--library-dir ${top_builddir}/src/app-utils \
@@ -63,7 +65,9 @@ GUILE_COMPILE_ENV = \
--library-dir ${top_builddir}/src/gnc-module \
--library-dir ${top_builddir}/src/report/report-system
-%.go : %.scm .scm-links
+%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
+ GNC_UNINSTALLED=yes \
+ GNC_BUILDDIR=${top_builddir} \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<
diff --git a/src/tax/us/Makefile.am b/src/tax/us/Makefile.am
index 0b75b98..bdfd0c7 100644
--- a/src/tax/us/Makefile.am
+++ b/src/tax/us/Makefile.am
@@ -56,7 +56,9 @@ GUILE_COMPILE_ENV = \
--library-dir ${top_builddir}/src/core-utils \
--library-dir ${top_builddir}/src/gnc-module
-%.go : %.scm .scm-links
+%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
+ GNC_UNINSTALLED=yes \
+ GNC_BUILDDIR=${top_builddir} \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<
diff --git a/src/test-core/Makefile.am b/src/test-core/Makefile.am
index 0aea4c6..65da7f0 100644
--- a/src/test-core/Makefile.am
+++ b/src/test-core/Makefile.am
@@ -101,7 +101,9 @@ if GNC_HAVE_GUILE_2
GUILE_COMPILE_ENV = \
--library-dir ${top_builddir}/src/test-core
-%.go : %.scm .scm-links
+%.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
+ GNC_UNINSTALLED=yes \
+ GNC_BUILDDIR=${top_builddir} \
$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
$(GUILD) compile -o $@ $<
commit 97f8f39dc6c57d7b9f965e11be9b375256a71fba
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Fri Oct 31 10:07:10 2014 +0100
Pre-compile scm files when building with guile 2
With pre-compiled scm files, guile will no longer
resort to autocompilation at first startup. This avoids
bugs like downstream
https://bugzilla.redhat.com/show_bug.cgi?id=1151870
(Where autocompiled files for an older version of
gnucash are more recent than the source files installed
with the newer version)
Note that a new variable GUILE_LOAD_COMPILED_PATH is added
for this in the environment file. This variable should probably
be updated in the OSX and Windows build scrips if/when these
are building with guile 2.
Strictly speaking this new variable is only needed for guile 2.
However since guile 1.8 simply ignores the environment variable,
it's just set unconditionally regardless of the guile version
being active.
diff --git a/configure.ac b/configure.ac
index 7d1cb89..7f8f977 100644
--- a/configure.ac
+++ b/configure.ac
@@ -484,6 +484,7 @@ PKG_CHECK_MODULES(GUILE,
])
AM_CONDITIONAL(GNC_HAVE_GUILE_2, test "${gnc_have_guile_2}" = yes)
+AC_SUBST(GUILE_EFFECTIVE_VERSION)
### --------------------------------------------------------------------------
diff --git a/src/app-utils/Makefile.am b/src/app-utils/Makefile.am
index f253fa0..2425e27 100644
--- a/src/app-utils/Makefile.am
+++ b/src/app-utils/Makefile.am
@@ -202,6 +202,29 @@ if ! OS_WIN32
touch .scm-links
endif
+if GNC_HAVE_GUILE_2
+GUILE_COMPILE_ENV = \
+ --gnc-module-dir ${top_builddir}/src/engine \
+ --guile-load-dir ${top_builddir}/src/app-utils \
+ --guile-load-dir ${top_builddir}/src/core-utils \
+ --guile-load-dir ${top_builddir}/src/engine \
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/scm \
+ --library-dir ${top_builddir}/src/app-utils \
+ --library-dir ${top_builddir}/src/core-utils \
+ --library-dir ${top_builddir}/src/gnc-module
+
+%.go : %.scm .scm-links
+ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
+ $(GUILD) compile -o $@ $<
+
+gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
+gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
+
+gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@
+gncscmcache_DATA = $(gncscm_DATA:.scm=.go)
+endif
+
clean-local:
rm -rf gnucash
diff --git a/src/app-utils/app-utils.scm b/src/app-utils/app-utils.scm
index 20f2c8d..a8388cf 100644
--- a/src/app-utils/app-utils.scm
+++ b/src/app-utils/app-utils.scm
@@ -16,6 +16,12 @@
;; Boston, MA 02110-1301, USA gnu at gnu.org
(define-module (gnucash app-utils))
+(cond-expand
+ (guile-2
+ (eval-when
+ (compile load eval expand)
+ (load-extension "libgncmod-app-utils.so" "scm_init_sw_app_utils_module")))
+ (else ))
(use-modules (sw_app_utils))
(use-modules (srfi srfi-1))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index cc0ce00..db2ecef 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -73,7 +73,8 @@ gnucash-valgrind: gnucash-valgrind.in ${top_builddir}/config.status Makefile
environment: environment.in ${top_builddir}/config.status Makefile
rm -f $@.tmp
sed < $< > $@.tmp \
- -e '/@-NOTE.*-@/ D'
+ -e '/@-NOTE.*-@/ D' \
+ -e "s#@-GUILE_EFFECTIVE_VERSION-@#@GUILE_EFFECTIVE_VERSION@#g"
if CUSTOM_GNC_DBD_DIR
echo 'GNC_DBD_DIR=@GNC_DBD_DIR@' >> $@.tmp
endif
diff --git a/src/bin/environment.in b/src/bin/environment.in
index 400369b..de40490 100644
--- a/src/bin/environment.in
+++ b/src/bin/environment.in
@@ -50,6 +50,7 @@ GUILE_WARN_DEPRECATED=no
# GUILE_LIBS can be used to override the path to Guile's own modules
# GUILE_LIBS=
GUILE_LOAD_PATH={GNC_DATA}/guile-modules;{GNC_DATA}/scm;{GUILE_LIBS};{GUILE_LOAD_PATH}
+GUILE_LOAD_COMPILED_PATH={GNC_DATA}/guile-modules/ccache/@-GUILE_EFFECTIVE_VERSION-@;{GNC_DATA}/scm/ccache/@-GUILE_EFFECTIVE_VERSION-@;{GUILE_LIBS};{GUILE_LOAD_PATH}
# Tell Guile where to find GnuCash specific shared libraries
GNC_LIBRARY_PATH={SYS_LIB}
diff --git a/src/business/business-gnome/Makefile.am b/src/business/business-gnome/Makefile.am
index 07fe94a..759c221 100644
--- a/src/business/business-gnome/Makefile.am
+++ b/src/business/business-gnome/Makefile.am
@@ -109,6 +109,35 @@ if ! OS_WIN32
touch .scm-links
endif
+if GNC_HAVE_GUILE_2
+GUILE_COMPILE_ENV = \
+ --gnc-module-dir ${top_builddir}/src/app-utils \
+ --gnc-module-dir ${top_builddir}/src/engine \
+ --gnc-module-dir ${top_builddir}/src/html \
+ --gnc-module-dir ${top_builddir}/src/gnome-utils \
+ --gnc-module-dir ${top_builddir}/src/report/report-system \
+ --gnc-module-dir ${top_builddir}/src/report/standard-reports \
+ --guile-load-dir ${top_builddir}/src/app-utils \
+ --guile-load-dir ${top_builddir}/src/core-utils \
+ --guile-load-dir ${top_builddir}/src/engine \
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/gnome-utils \
+ --guile-load-dir ${top_builddir}/src/report/business-reports \
+ --guile-load-dir ${top_builddir}/src/report/report-system \
+ --guile-load-dir ${top_builddir}/src/report/standard-reports \
+ --guile-load-dir ${top_builddir}/src/scm \
+ --library-dir ${top_builddir}/src/app-utils \
+ --library-dir ${top_builddir}/src/core-utils \
+ --library-dir ${top_builddir}/src/gnc-module
+
+%.go : %.scm .scm-links
+ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
+ $(GUILD) compile -o $@ $<
+
+gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
+gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
+endif
+
noinst_DATA = .scm-links
clean-local:
rm -rf gnucash
diff --git a/src/core-utils/Makefile.am b/src/core-utils/Makefile.am
index f7985d6..d412f2d 100644
--- a/src/core-utils/Makefile.am
+++ b/src/core-utils/Makefile.am
@@ -112,6 +112,18 @@ if ! OS_WIN32
touch .scm-links
endif
+if GNC_HAVE_GUILE_2
+GUILE_COMPILE_ENV = \
+ --library-dir ${top_builddir}/src/core-utils
+
+%.go : %.scm .scm-links
+ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
+ $(GUILD) compile -o $@ $<
+
+gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
+gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
+endif
+
noinst_DATA = .scm-links
BUILT_SOURCES = gncla-dir.h gnc-version.h
EXTRA_DIST = $(gncscmmod_DATA) core-utils.i gncla-dir.h.in gnc-scm-info.h
diff --git a/src/core-utils/core-utils.scm b/src/core-utils/core-utils.scm
index 8e45e3c..b11198c 100644
--- a/src/core-utils/core-utils.scm
+++ b/src/core-utils/core-utils.scm
@@ -12,9 +12,9 @@
(guile-2
(eval-when
(compile load eval expand)
- (load-extension "libgnc-core-utils" "scm_init_sw_core_utils_module")))
+ (load-extension "libgnc-core-utils.so" "scm_init_sw_core_utils_module")))
(else
- (load-extension "libgnc-core-utils" "scm_init_sw_core_utils_module")))
+ (load-extension "libgnc-core-utils.so" "scm_init_sw_core_utils_module")))
(use-modules (sw_core_utils))
diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am
index f51f1e8..723ce48 100644
--- a/src/engine/Makefile.am
+++ b/src/engine/Makefile.am
@@ -190,6 +190,23 @@ if ! OS_WIN32
touch .scm-links
endif
+if GNC_HAVE_GUILE_2
+GUILE_COMPILE_ENV = \
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --library-dir ${top_builddir}/src/engine \
+ --library-dir ${top_builddir}/src/gnc-module
+
+%.go : %.scm .scm-links
+ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
+ $(GUILD) compile -o $@ $<
+
+gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
+gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
+
+gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@
+gncscmcache_DATA = $(gncscm_DATA:.scm=.go)
+endif
+
noinst_DATA = .scm-links
if BUILDING_FROM_SCM
diff --git a/src/engine/engine.scm b/src/engine/engine.scm
index c60b150..1772b33 100644
--- a/src/engine/engine.scm
+++ b/src/engine/engine.scm
@@ -1,5 +1,11 @@
(define-module (gnucash engine))
+(cond-expand
+ (guile-2
+ (eval-when
+ (compile load eval expand)
+ (load-extension "libgncmod-engine.so" "scm_init_sw_engine_module")))
+ (else ))
(use-modules (sw_engine))
(export GNC-RND-FLOOR)
diff --git a/src/gnc-module/Makefile.am b/src/gnc-module/Makefile.am
index 94abe1a..5e9819c 100644
--- a/src/gnc-module/Makefile.am
+++ b/src/gnc-module/Makefile.am
@@ -65,6 +65,18 @@ if ! OS_WIN32
touch .scm-links
endif
+if GNC_HAVE_GUILE_2
+GUILE_COMPILE_ENV = \
+ --library-dir ${top_builddir}/src/gnc-module
+
+%.go : %.scm .scm-links
+ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
+ $(GUILD) compile -o $@ $<
+
+gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
+gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
+endif
+
clean-local:
rm -rf gnucash
diff --git a/src/gnc-module/gnc-module.scm b/src/gnc-module/gnc-module.scm
index 666faea..fb90ca1 100644
--- a/src/gnc-module/gnc-module.scm
+++ b/src/gnc-module/gnc-module.scm
@@ -13,9 +13,9 @@
(guile-2
(eval-when
(compile load eval expand)
- (load-extension "libgnc-module" "scm_init_sw_gnc_module_module")))
+ (load-extension "libgnc-module.so" "scm_init_sw_gnc_module_module")))
(else
- (load-extension "libgnc-module" "scm_init_sw_gnc_module_module")))
+ (load-extension "libgnc-module.so" "scm_init_sw_gnc_module_module")))
(use-modules (sw_gnc_module))
diff --git a/src/gnc-test-env.in b/src/gnc-test-env.in
index 085fbb6..596dd3a 100755
--- a/src/gnc-test-env.in
+++ b/src/gnc-test-env.in
@@ -109,6 +109,10 @@ exec @GUILE@ -s $0 "$@"
(display
(adapt-dirsep
+ (get-dir-adder "GUILE_LOAD_COMPILED_PATH" guile-load-dirs "" path-sep-str)))
+
+(display
+ (adapt-dirsep
(get-dir-adder "LD_LIBRARY_PATH" library-dirs "/.libs" path-sep-str)))
(display
@@ -124,6 +128,7 @@ exec @GUILE@ -s $0 "$@"
(display "; ")
(display " export GNC_MODULE_PATH;")
(display " export GUILE_LOAD_PATH;")
+ (display " export GUILE_LOAD_COMPILED_PATH;")
(display " export LD_LIBRARY_PATH;")
(display " export DYLD_LIBRARY_PATH;")
(if is-windows?
diff --git a/src/gnome-utils/Makefile.am b/src/gnome-utils/Makefile.am
index 7533819..2b02800 100644
--- a/src/gnome-utils/Makefile.am
+++ b/src/gnome-utils/Makefile.am
@@ -274,6 +274,26 @@ if ! OS_WIN32
touch .scm-links
endif
+if GNC_HAVE_GUILE_2
+GUILE_COMPILE_ENV = \
+ --guile-load-dir ${top_builddir}/src/core-utils \
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/scm \
+ --library-dir ${top_builddir}/src/core-utils \
+ --library-dir ${top_builddir}/src/gnc-module \
+ --library-dir ${top_builddir}/src/gnome-utils
+
+%.go : %.scm .scm-links
+ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
+ $(GUILD) compile -o $@ $<
+
+gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
+gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
+
+gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@
+gncscmcache_DATA = $(gncscm_DATA:.scm=.go)
+endif
+
noinst_DATA = .scm-links
clean-local:
rm -rf gnucash
diff --git a/src/gnome-utils/gnome-utils.scm b/src/gnome-utils/gnome-utils.scm
index fb7a9b2..fcd922f 100644
--- a/src/gnome-utils/gnome-utils.scm
+++ b/src/gnome-utils/gnome-utils.scm
@@ -3,6 +3,12 @@
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (gnucash gnc-module))
+(cond-expand
+ (guile-2
+ (eval-when
+ (compile load eval expand)
+ (load-extension "libgncmod-gnome-utils.so" "scm_init_sw_gnome_utils_module")))
+ (else ))
(use-modules (sw_gnome_utils))
(gnc:module-load "gnucash/app-utils" 0)
diff --git a/src/import-export/qif-imp/Makefile.am b/src/import-export/qif-imp/Makefile.am
index 9823149..7bfe27b 100644
--- a/src/import-export/qif-imp/Makefile.am
+++ b/src/import-export/qif-imp/Makefile.am
@@ -99,6 +99,26 @@ if ! OS_WIN32
touch .scm-links
endif
+if GNC_HAVE_GUILE_2
+GUILE_COMPILE_ENV = \
+ --guile-load-dir ${top_builddir}/src/core-utils \
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/scm \
+ --library-dir ${top_builddir}/src/core-utils \
+ --library-dir ${top_builddir}/src/gnome \
+ --library-dir ${top_builddir}/src/gnc-module
+
+%.go : %.scm .scm-links
+ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
+ $(GUILD) compile -o $@ $<
+
+gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/import-export
+gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
+
+gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/qif-import
+gncscmcache_DATA = $(gncscm_DATA:.scm=.go)
+endif
+
clean-local:
$(RM) -rf gnucash qif-import
diff --git a/src/report/business-reports/Makefile.am b/src/report/business-reports/Makefile.am
index 4f736db..c5f167e 100644
--- a/src/report/business-reports/Makefile.am
+++ b/src/report/business-reports/Makefile.am
@@ -1,24 +1,31 @@
gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report
gncscmmod_DATA = \
aging.scm \
- business-reports.scm \
customer-summary.scm \
easy-invoice.scm \
fancy-invoice.scm \
taxinvoice.scm \
- taxinvoice.eguile.scm \
- taxinvoice.css \
invoice.scm \
job-report.scm \
owner-report.scm \
payables.scm \
receivables.scm \
+ balsheet-eg.scm \
+ business-reports.scm
+
+# Note: list these files separately because they can't be compiled by guile2
+# templates are a mixture of scheme and hmtl
+# css files are not scheme at all
+gncscmtpldir = ${GNC_SHAREDIR}/guile-modules/gnucash/report
+gncscmtpl_DATA = \
+ taxinvoice.eguile.scm \
+ taxinvoice.css \
balsheet-eg.css \
- balsheet-eg.eguile.scm \
- balsheet-eg.scm
+ balsheet-eg.eguile.scm
if GNUCASH_SEPARATE_BUILDDIR
-SCM_FILE_LINKS = ${gncscmmod_DATA}
+SCM_FILE_LINKS = ${gncscmmod_DATA} \
+ ${gncscmtpl_DATA}
endif
.scm-links:
@@ -36,13 +43,41 @@ if ! OS_WIN32
touch .scm-links
endif
+if GNC_HAVE_GUILE_2
+GUILE_COMPILE_ENV = \
+ --gnc-module-dir ${top_builddir}/src/app-utils \
+ --gnc-module-dir ${top_builddir}/src/engine \
+ --gnc-module-dir ${top_builddir}/src/gnome-utils \
+ --gnc-module-dir ${top_builddir}/src/html \
+ --gnc-module-dir ${top_builddir}/src/report/report-system \
+ --guile-load-dir ${top_builddir}/src/app-utils \
+ --guile-load-dir ${top_builddir}/src/core-utils \
+ --guile-load-dir ${top_builddir}/src/engine \
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/gnome-utils \
+ --guile-load-dir ${top_builddir}/src/report/report-system \
+ --guile-load-dir ${top_builddir}/src/report/standard-reports \
+ --guile-load-dir ${top_builddir}/src/scm \
+ --library-dir ${top_builddir}/src/app-utils \
+ --library-dir ${top_builddir}/src/core-utils \
+ --library-dir ${top_builddir}/src/gnc-module
+
+%.go : %.scm .scm-links
+ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
+ $(GUILD) compile -o $@ $<
+
+gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
+gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
+endif
+
clean-local:
$(RM) -rf gnucash
noinst_DATA = .scm-links
EXTRA_DIST = \
- ${gncscmmod_DATA}
+ ${gncscmmod_DATA} \
+ ${gncscmtpl_DATA}
CLEANFILES = .scm-links
DISTCLEANFILES = ${SCM_FILE_LINKS}
diff --git a/src/report/locale-specific/us/Makefile.am b/src/report/locale-specific/us/Makefile.am
index ea55df0..1fb4dc8 100644
--- a/src/report/locale-specific/us/Makefile.am
+++ b/src/report/locale-specific/us/Makefile.am
@@ -51,6 +51,38 @@ if ! OS_WIN32
touch .scm-links
endif
+if GNC_HAVE_GUILE_2
+GUILE_COMPILE_ENV = \
+ --gnc-module-dir ${top_builddir}/src/app-utils \
+ --gnc-module-dir ${top_builddir}/src/engine \
+ --gnc-module-dir ${top_builddir}/src/gnome-utils \
+ --gnc-module-dir ${top_builddir}/src/html \
+ --gnc-module-dir ${top_builddir}/src/report/report-system \
+ --gnc-module-dir ${top_builddir}/src/tax/us \
+ --guile-load-dir ${top_builddir}/src/app-utils \
+ --guile-load-dir ${top_builddir}/src/core-utils \
+ --guile-load-dir ${top_builddir}/src/engine \
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/gnome-utils \
+ --guile-load-dir ${top_builddir}/src/report/report-system \
+ --guile-load-dir ${top_builddir}/src/scm \
+ --guile-load-dir ${top_builddir}/src/tax/us \
+ --library-dir ${top_builddir}/src/app-utils \
+ --library-dir ${top_builddir}/src/core-utils \
+ --library-dir ${top_builddir}/src/gnc-module \
+ --library-dir ${top_builddir}/src/gnome-utils
+
+%.go : %.scm .scm-links
+ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
+ $(GUILD) compile -o $@ $<
+
+gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
+gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
+
+gncscmrptcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report/locale-specific
+gncscmrptcache_DATA = $(gncscmrpt_DATA:.scm=.go)
+endif
+
clean-local:
$(RM) -rf gnucash
diff --git a/src/report/locale-specific/us/taxtxf.scm b/src/report/locale-specific/us/taxtxf.scm
index 76dcece..e0786cb 100644
--- a/src/report/locale-specific/us/taxtxf.scm
+++ b/src/report/locale-specific/us/taxtxf.scm
@@ -77,6 +77,13 @@
(use-modules (srfi srfi-1))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))
+
+(cond-expand
+ (guile-2
+ (eval-when
+ (compile load eval expand)
+ (load-extension "libgncmod-gnome-utils.so" "scm_init_sw_gnome_utils_module")))
+ (else ))
(use-modules (sw_gnome_utils)) ;; to get to gnc-error-dialog
(use-modules (gnucash printf))
diff --git a/src/report/report-gnome/Makefile.am b/src/report/report-gnome/Makefile.am
index 66417a6..ee65689 100644
--- a/src/report/report-gnome/Makefile.am
+++ b/src/report/report-gnome/Makefile.am
@@ -104,6 +104,30 @@ if ! OS_WIN32
touch .scm-links
endif
+if GNC_HAVE_GUILE_2
+GUILE_COMPILE_ENV = \
+ --gnc-module-dir ${top_builddir}/src/app-utils \
+ --gnc-module-dir ${top_builddir}/src/engine \
+ --guile-load-dir ${top_builddir}/src/app-utils \
+ --guile-load-dir ${top_builddir}/src/core-utils \
+ --guile-load-dir ${top_builddir}/src/engine \
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/gnome-utils \
+ --guile-load-dir ${top_builddir}/src/scm \
+ --library-dir ${top_builddir}/src/app-utils \
+ --library-dir ${top_builddir}/src/core-utils \
+ --library-dir ${top_builddir}/src/gnc-module \
+ --library-dir ${top_builddir}/src/gnome-utils \
+ --library-dir ${top_builddir}/src/report/report-gnome
+
+%.go : %.scm .scm-links
+ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
+ $(GUILD) compile -o $@ $<
+
+gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
+gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
+endif
+
clean-local:
rm -rf gnucash
diff --git a/src/report/report-gnome/report-gnome.scm b/src/report/report-gnome/report-gnome.scm
index 52de518..d06fd8f 100644
--- a/src/report/report-gnome/report-gnome.scm
+++ b/src/report/report-gnome/report-gnome.scm
@@ -13,6 +13,13 @@
(use-modules (gnucash printf))
+(cond-expand
+ (guile-2
+ (eval-when
+ (compile load eval expand)
+ (load-extension "libgncmod-gnome-utils.so" "scm_init_sw_gnome_utils_module")
+ (load-extension "libgncmod-report-gnome.so" "scm_init_sw_report_gnome_module")))
+ (else ))
(use-modules (sw_report_gnome))
(gnc:module-load "gnucash/gnome-utils" 0)
diff --git a/src/report/report-system/Makefile.am b/src/report/report-system/Makefile.am
index 3a5ecc7..d0f0f80 100644
--- a/src/report/report-system/Makefile.am
+++ b/src/report/report-system/Makefile.am
@@ -68,7 +68,6 @@ gncscm_DATA = \
report.scm
gncmodscmdir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/report-system
-
gncmodscm_DATA = \
collectors.scm \
list-extras.scm \
@@ -108,6 +107,38 @@ if ! OS_WIN32
touch .scm-links
endif
+if GNC_HAVE_GUILE_2
+GUILE_COMPILE_ENV = \
+ --gnc-module-dir ${top_builddir}/src/app-utils \
+ --gnc-module-dir ${top_builddir}/src/engine \
+ --gnc-module-dir ${top_builddir}/src/html \
+ --gnc-module-dir ${top_builddir}/src/gnome-utils \
+ --gnc-module-dir ${top_builddir}/src/report/report-system \
+ --guile-load-dir ${top_builddir}/src/app-utils \
+ --guile-load-dir ${top_builddir}/src/core-utils \
+ --guile-load-dir ${top_builddir}/src/engine \
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/gnome-utils \
+ --guile-load-dir ${top_builddir}/src/scm \
+ --library-dir ${top_builddir}/src/app-utils \
+ --library-dir ${top_builddir}/src/core-utils \
+ --library-dir ${top_builddir}/src/gnc-module \
+ --library-dir ${top_builddir}/src/report/report-system
+
+%.go : %.scm .scm-links
+ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
+ $(GUILD) compile -o $@ $<
+
+gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
+gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
+
+gncmodscmcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report/report-system
+gncmodscmcache_DATA = $(gncmodscm_DATA:.scm=.go)
+
+gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@
+gncscmcache_DATA = $(gncscm_DATA:.scm=.go)
+endif
+
noinst_DATA = .scm-links
EXTRA_DIST = report-system.i ${gncscmmod_DATA} ${gncscm_DATA} ${gncmodscm_DATA}
diff --git a/src/report/report-system/report.scm b/src/report/report-system/report.scm
index cb475f8..41909e8 100644
--- a/src/report/report-system/report.scm
+++ b/src/report/report-system/report.scm
@@ -23,6 +23,12 @@
(use-modules (gnucash main))
(use-modules (gnucash printf))
(use-modules (gnucash gettext))
+(cond-expand
+ (guile-2
+ (eval-when
+ (compile load eval expand)
+ (load-extension "libgncmod-report-system.so" "scm_init_sw_report_system_module")))
+ (else ))
(use-modules (sw_report_system))
;; Terminology in this file:
diff --git a/src/report/standard-reports/Makefile.am b/src/report/standard-reports/Makefile.am
index 30c2d6a..3c540bc 100644
--- a/src/report/standard-reports/Makefile.am
+++ b/src/report/standard-reports/Makefile.am
@@ -74,6 +74,36 @@ if ! OS_WIN32
touch .scm-links
endif
+if GNC_HAVE_GUILE_2
+GUILE_COMPILE_ENV = \
+ --gnc-module-dir ${top_builddir}/src/app-utils \
+ --gnc-module-dir ${top_builddir}/src/engine \
+ --gnc-module-dir ${top_builddir}/src/gnome-utils \
+ --gnc-module-dir ${top_builddir}/src/html \
+ --gnc-module-dir ${top_builddir}/src/report/report-system \
+ --guile-load-dir ${top_builddir}/src/app-utils \
+ --guile-load-dir ${top_builddir}/src/core-utils \
+ --guile-load-dir ${top_builddir}/src/engine \
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/gnome-utils \
+ --guile-load-dir ${top_builddir}/src/report/report-system \
+ --guile-load-dir ${top_builddir}/src/scm \
+ --library-dir ${top_builddir}/src/app-utils \
+ --library-dir ${top_builddir}/src/core-utils \
+ --library-dir ${top_builddir}/src/gnc-module \
+ --library-dir ${top_builddir}/src/report/report-system
+
+%.go : %.scm .scm-links
+ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
+ $(GUILD) compile -o $@ $<
+
+gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
+gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
+
+gncscmrptcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report/standard-reports
+gncscmrptcache_DATA = $(gncscmrpt_DATA:.scm=.go)
+endif
+
clean-local:
$(RM) -rf gnucash
diff --git a/src/report/stylesheets/Makefile.am b/src/report/stylesheets/Makefile.am
index 1964d8c..ecc1af6 100644
--- a/src/report/stylesheets/Makefile.am
+++ b/src/report/stylesheets/Makefile.am
@@ -61,6 +61,33 @@ if ! OS_WIN32
touch .scm-links
endif
+if GNC_HAVE_GUILE_2
+GUILE_COMPILE_ENV = \
+ --gnc-module-dir ${top_builddir}/src/app-utils \
+ --gnc-module-dir ${top_builddir}/src/engine \
+ --gnc-module-dir ${top_builddir}/src/html \
+ --gnc-module-dir ${top_builddir}/src/gnome-utils \
+ --gnc-module-dir ${top_builddir}/src/report/report-system \
+ --guile-load-dir ${top_builddir}/src/app-utils \
+ --guile-load-dir ${top_builddir}/src/core-utils \
+ --guile-load-dir ${top_builddir}/src/engine \
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/gnome-utils \
+ --guile-load-dir ${top_builddir}/src/report/report-system \
+ --guile-load-dir ${top_builddir}/src/scm \
+ --library-dir ${top_builddir}/src/app-utils \
+ --library-dir ${top_builddir}/src/core-utils \
+ --library-dir ${top_builddir}/src/gnc-module \
+ --library-dir ${top_builddir}/src/gnome-utils
+
+%.go : %.scm .scm-links
+ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
+ $(GUILD) compile -o $@ $<
+
+gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
+gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
+endif
+
clean-local:
$(RM) -rf gnucash
diff --git a/src/report/utility-reports/Makefile.am b/src/report/utility-reports/Makefile.am
index b55b3c6..cb0dcdc 100644
--- a/src/report/utility-reports/Makefile.am
+++ b/src/report/utility-reports/Makefile.am
@@ -46,6 +46,31 @@ if ! OS_WIN32
touch .scm-links
endif
+if GNC_HAVE_GUILE_2
+GUILE_COMPILE_ENV = \
+ --gnc-module-dir ${top_builddir}/src/app-utils \
+ --gnc-module-dir ${top_builddir}/src/engine \
+ --gnc-module-dir ${top_builddir}/src/html \
+ --gnc-module-dir ${top_builddir}/src/report/report-system \
+ --guile-load-dir ${top_builddir}/src/app-utils \
+ --guile-load-dir ${top_builddir}/src/core-utils \
+ --guile-load-dir ${top_builddir}/src/engine \
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/report/report-system \
+ --guile-load-dir ${top_builddir}/src/scm \
+ --library-dir ${top_builddir}/src/app-utils \
+ --library-dir ${top_builddir}/src/core-utils \
+ --library-dir ${top_builddir}/src/gnc-module \
+ --library-dir ${top_builddir}/src/report/report-system
+
+%.go : %.scm .scm-links
+ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
+ $(GUILD) compile -o $@ $<
+
+gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
+gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
+endif
+
clean-local:
$(RM) -rf gnucash
diff --git a/src/report/utility-reports/view-column.scm b/src/report/utility-reports/view-column.scm
index 9cac6f0..4b7016b 100644
--- a/src/report/utility-reports/view-column.scm
+++ b/src/report/utility-reports/view-column.scm
@@ -30,6 +30,12 @@
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))
+(cond-expand
+ (guile-2
+ (eval-when
+ (compile load eval expand)
+ (load-extension "libgncmod-report-system.so" "scm_init_sw_report_system_module")))
+ (else ))
(use-modules (sw_report_system))
(use-modules (gnucash printf))
diff --git a/src/report/utility-reports/welcome-to-gnucash.scm b/src/report/utility-reports/welcome-to-gnucash.scm
index 4afb550..55b554c 100644
--- a/src/report/utility-reports/welcome-to-gnucash.scm
+++ b/src/report/utility-reports/welcome-to-gnucash.scm
@@ -27,6 +27,12 @@
(use-modules (gnucash core-utils)) ; for gnc:version
(use-modules (gnucash gettext))
(use-modules (gnucash gnc-module))
+(cond-expand
+ (guile-2
+ (eval-when
+ (compile load eval expand)
+ (load-extension "libgncmod-report-system.so" "scm_init_sw_report_system_module")))
+ (else ))
(use-modules (sw_report_system))
(gnc:module-load "gnucash/report/report-system" 0)
diff --git a/src/scm/Makefile.am b/src/scm/Makefile.am
index 45b5feb..6bb04b7 100644
--- a/src/scm/Makefile.am
+++ b/src/scm/Makefile.am
@@ -41,6 +41,25 @@ if ! OS_WIN32
touch .scm-links
endif
+if GNC_HAVE_GUILE_2
+GUILE_COMPILE_ENV = \
+ --guile-load-dir ${top_builddir}/src/core-utils \
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/scm \
+ --library-dir ${top_builddir}/src/core-utils \
+ --library-dir ${top_builddir}/src/gnc-module
+
+%.go : %.scm .scm-links
+ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
+ $(GUILD) compile -o $@ $<
+
+gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
+gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
+
+gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@
+gncscmcache_DATA = $(gncscm_DATA:.scm=.go)
+endif
+
clean-local:
$(RM) -rf gnucash
diff --git a/src/scm/gnumeric/Makefile.am b/src/scm/gnumeric/Makefile.am
index 60ebac4..dc55ab5 100644
--- a/src/scm/gnumeric/Makefile.am
+++ b/src/scm/gnumeric/Makefile.am
@@ -19,6 +19,15 @@ if ! OS_WIN32
touch .scm-links
endif
+if GNC_HAVE_GUILE_2
+%.go : %.scm .scm-links
+ $(GUILD) compile \
+ -o $@ $<
+
+gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnumeric
+gncscmcache_DATA = $(gncscm_DATA:.scm=.go)
+endif
+
noinst_DATA = .scm-links
EXTRA_DIST = \
diff --git a/src/tax/us/Makefile.am b/src/tax/us/Makefile.am
index 1b2f041..0b75b98 100644
--- a/src/tax/us/Makefile.am
+++ b/src/tax/us/Makefile.am
@@ -44,6 +44,29 @@ if ! OS_WIN32
touch .scm-links
endif
+if GNC_HAVE_GUILE_2
+GUILE_COMPILE_ENV = \
+ --gnc-module-dir ${top_builddir}/src/engine \
+ --guile-load-dir ${top_builddir}/src/app-utils \
+ --guile-load-dir ${top_builddir}/src/core-utils \
+ --guile-load-dir ${top_builddir}/src/engine \
+ --guile-load-dir ${top_builddir}/src/gnc-module \
+ --guile-load-dir ${top_builddir}/src/scm \
+ --library-dir ${top_builddir}/src/app-utils \
+ --library-dir ${top_builddir}/src/core-utils \
+ --library-dir ${top_builddir}/src/gnc-module
+
+%.go : %.scm .scm-links
+ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
+ $(GUILD) compile -o $@ $<
+
+gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/tax
+gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
+
+gncscmcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@
+gncscmcache_DATA = $(gncscm_DATA:.scm=.go)
+endif
+
clean-local:
$(RM) -rf gnucash
diff --git a/src/test-core/Makefile.am b/src/test-core/Makefile.am
index 7c7ca57..0aea4c6 100644
--- a/src/test-core/Makefile.am
+++ b/src/test-core/Makefile.am
@@ -97,6 +97,18 @@ if ! OS_WIN32
touch .scm-links
endif
+if GNC_HAVE_GUILE_2
+GUILE_COMPILE_ENV = \
+ --library-dir ${top_builddir}/src/test-core
+
+%.go : %.scm .scm-links
+ $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
+ $(GUILD) compile -o $@ $<
+
+gncscmmodcachedir = ${GNC_SHAREDIR}/guile-modules/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
+gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
+endif
+
clean-local:
$(RM) -rf gnucash
diff --git a/src/test-core/unittest-support.scm b/src/test-core/unittest-support.scm
index 5d5c69b..44d89ac 100644
--- a/src/test-core/unittest-support.scm
+++ b/src/test-core/unittest-support.scm
@@ -1,5 +1,11 @@
(define-module (gnucash unittest-support))
-(load-extension "libtest-core-guile" "scm_init_unittest_support_module")
+(cond-expand
+ (guile-2
+ (eval-when
+ (compile load eval expand)
+ (load-extension "libtest-core-guile.so" "scm_init_unittest_support_module")))
+ (else
+ (load-extension "libtest-core-guile.so" "scm_init_unittest_support_module")))
(use-modules (unittest_support))
(re-export TestErrorStruct-log-level-set)
commit 2a6fcf1cd585e74fe8d450c92068944948f7ac50
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Oct 28 22:37:01 2014 +0100
Guile module structure cleanup
- fix circular dependency between business-reports.scm and owner-report.scm
- split out gettext routines to properly handle N_ for all files that use it
- remove some unused module inclusions
- tax module depends on app-utils -> fix build order
diff --git a/src/Makefile.am b/src/Makefile.am
index f736254..acc4ac5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,8 +10,7 @@ NONGUI_SUBDIRS = \
engine \
backend \
scm \
- quotes \
- tax
+ quotes
if WITH_PYTHON
PYTHON_DIR = python
@@ -22,6 +21,7 @@ endif
# app-utils. It should go away in the long run, though.
ALMOST_NONGUI_SUBDIRS = \
app-utils \
+ tax \
${PYTHON_DIR}
# These directories contain the code with gtk dependency
diff --git a/src/app-utils/Makefile.am b/src/app-utils/Makefile.am
index 7744e5d..f253fa0 100644
--- a/src/app-utils/Makefile.am
+++ b/src/app-utils/Makefile.am
@@ -137,7 +137,9 @@ libgncmod_app_utils_python_la_LIBADD = \
endif
gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
-gncscmmod_DATA = app-utils.scm
+gncscmmod_DATA = \
+ gettext.scm \
+ app-utils.scm
gncscmdir = ${GNC_SCM_INSTALL_DIR}
gncscm_DATA = \
diff --git a/src/app-utils/app-utils.scm b/src/app-utils/app-utils.scm
index 85755f5..20f2c8d 100644
--- a/src/app-utils/app-utils.scm
+++ b/src/app-utils/app-utils.scm
@@ -20,7 +20,7 @@
(use-modules (srfi srfi-1))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (gnucash gnc-module))
-(use-modules (ice-9 syncase))
+(use-modules (gnucash gettext))
;; Guile 2 needs to find the symbols from the c module at compile time already
(cond-expand
@@ -31,6 +31,11 @@
(else
(gnc:module-load "gnucash/engine" 0)))
+;; gettext.scm
+(re-export gnc:gettext)
+(re-export _)
+(re-export N_)
+
;; c-interface.scm
(export gnc:error->string)
(export gnc:make-string-database)
@@ -279,27 +284,6 @@
(define gnc:*kvp-option-path* (list KVP-OPTION-PATH))
(export gnc:*kvp-option-path*)
-;; gettext functions
-(define gnc:gettext gnc-gettext-helper)
-(define _ gnc:gettext)
-(define-syntax N_
- (syntax-rules ()
- ((_ x) x)))
-
-(export gnc:gettext)
-(export _)
-
-(if (< (string->number (major-version)) 2)
- (export-syntax N_))
-
-;; A lot of Gnucash's code uses procedural interfaces to load modules.
-;; This normally works, for procedures -- but for values that need to be
-;; known at expand time, like macros, it doesn't work (in Guile 2.0 at
-;; least). So instead of auditing all the code, since N_ is really the
-;; only Gnucash-defined macro in use, the surgical solution is just to
-;; make N_ available everywhere.
-(module-define! the-root-module 'N_ (module-ref (current-module) 'N_))
-
(load-from-path "c-interface")
(load-from-path "config-var")
(load-from-path "options")
diff --git a/src/app-utils/business-prefs.scm b/src/app-utils/business-prefs.scm
index ff53845..248ee3f 100644
--- a/src/app-utils/business-prefs.scm
+++ b/src/app-utils/business-prefs.scm
@@ -19,6 +19,8 @@
;; 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652
;; Boston, MA 02110-1301, USA gnu at gnu.org
+(use-modules (gnucash gettext))
+
(define gnc:*option-section-counters* (N_ "Counters"))
;; This defines all available counter types to show options for. This a
diff --git a/src/app-utils/date-utilities.scm b/src/app-utils/date-utilities.scm
index 4dc4c23..940a651 100644
--- a/src/app-utils/date-utilities.scm
+++ b/src/app-utils/date-utilities.scm
@@ -21,7 +21,8 @@
;; Boston, MA 02110-1301, USA gnu at gnu.org
(use-modules (gnucash core-utils)
- (gnucash printf))
+ (gnucash printf)
+ (gnucash gettext))
(define gnc:reldate-list '())
diff --git a/src/app-utils/gettext.scm b/src/app-utils/gettext.scm
new file mode 100644
index 0000000..1dd82fb
--- /dev/null
+++ b/src/app-utils/gettext.scm
@@ -0,0 +1,46 @@
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2 of
+;; the License, or (at your option) any later version.
+;;
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program; if not, contact:
+;;
+;; Free Software Foundation Voice: +1-617-542-5942
+;; 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652
+;; Boston, MA 02110-1301, USA gnu at gnu.org
+
+(define-module (gnucash gettext))
+
+;; Load a few different modules depending on the version of guile
+(cond-expand
+ (guile-2
+ ;; Our app-utils gnc module must be evaluated at compile time
+ ;; Without it sw_app_utils can't be evaluated below
+ (eval-when
+ (compile load eval expand)
+ (load-extension "libgncmod-app-utils.so" "scm_init_sw_app_utils_module")))
+ (else
+ ;; Syncase is deprecated and redundant in guile 2
+ (use-modules (ice-9 syncase))))
+(use-modules (sw_app_utils))
+
+;; gettext functions
+(define gnc:gettext gnc-gettext-helper)
+(define _ gnc:gettext)
+(define-syntax N_
+ (syntax-rules ()
+ ((_ x) x)))
+
+
+(if (< (string->number (major-version)) 2)
+ (export-syntax N_))
+
+(export gnc:gettext)
+(export _)
+(export N_)
\ No newline at end of file
diff --git a/src/app-utils/prefs.scm b/src/app-utils/prefs.scm
index a0ee256..d3f1ea6 100644
--- a/src/app-utils/prefs.scm
+++ b/src/app-utils/prefs.scm
@@ -52,7 +52,7 @@
;; #f)))
;; eq?
;; #f))
-
+(use-modules (gnucash gettext))
;; Old-school config files depend on this API
(define (gnc:config-file-format-version version) #t)
diff --git a/src/app-utils/test/test-load-module b/src/app-utils/test/test-load-module
index 3d38bff..ea4ac23 100755
--- a/src/app-utils/test/test-load-module
+++ b/src/app-utils/test/test-load-module
@@ -37,7 +37,7 @@ exec ${GUILE} -s "$0"
(display "Failed - procedure gnc-default-currency not found\n")
(set! exit-code -1)))
-(if (macro? (module-ref the-root-module 'N_))
+(if (macro? (module-ref (current-module) 'N_))
(display "Macro N_ defined\n")
(begin
(display "Failed - macro N_ not defined\n")
diff --git a/src/report/business-reports/aging.scm b/src/report/business-reports/aging.scm
index 6484204..d141b03 100644
--- a/src/report/business-reports/aging.scm
+++ b/src/report/business-reports/aging.scm
@@ -29,6 +29,7 @@
(use-modules (gnucash main))
(use-modules (gnucash printf))
(use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
(gnc:module-load "gnucash/report/report-system" 0)
diff --git a/src/report/business-reports/balsheet-eg.scm b/src/report/business-reports/balsheet-eg.scm
index 23ddfff..bc30d4a 100644
--- a/src/report/business-reports/balsheet-eg.scm
+++ b/src/report/business-reports/balsheet-eg.scm
@@ -34,7 +34,7 @@
(define-module (gnucash report balsheet-eg))
(use-modules (gnucash main))
(use-modules (gnucash gnc-module))
-(use-modules (gnucash app-utils))
+(use-modules (gnucash gettext))
(use-modules (gnucash report eguile-gnc))
(use-modules (gnucash report eguile-utilities))
diff --git a/src/report/business-reports/business-reports.scm b/src/report/business-reports/business-reports.scm
index 3c689c5..7b2bcf2 100644
--- a/src/report/business-reports/business-reports.scm
+++ b/src/report/business-reports/business-reports.scm
@@ -25,23 +25,13 @@
(define-module (gnucash report business-reports))
(use-modules (gnucash gnc-module))
+(use-modules (gnucash app-utils))
+(use-modules (gnucash report report-system))
(gnc:module-load "gnucash/report/standard-reports" 0)
-(gnc:module-load "gnucash/app-utils" 0)
;; to define gnc-build-url
(gnc:module-load "gnucash/html" 0)
-;; Guile 2 needs to find this macro at compile time already
-(cond-expand
- (guile-2
- (eval-when
- (compile load eval expand)
- (define gnc:menuname-business-reports (N_ "_Business"))))
- (else
- (define gnc:menuname-business-reports (N_ "_Business"))))
-
-(define gnc:optname-invoice-number (N_ "Invoice Number"))
-
(define (guid-ref idstr type guid)
(gnc-build-url type (string-append idstr guid) ""))
@@ -120,8 +110,6 @@
0
))
-(export gnc:menuname-business-reports gnc:optname-invoice-number)
-
(use-modules (gnucash report fancy-invoice))
(use-modules (gnucash report invoice))
(use-modules (gnucash report easy-invoice))
@@ -139,8 +127,14 @@
(define (gnc:receivables-report-create account title show-zeros?)
(receivables-report-create-internal account title show-zeros?))
+(define (gnc:owner-report-create owner account)
+ ; Figure out an account to use if nothing exists here.
+ (if (null? account)
+ (set! account (find-first-account-for-owner owner)))
+ (owner-report-create owner account))
+
(export gnc:invoice-report-create
gnc:customer-anchor-text gnc:job-anchor-text gnc:vendor-anchor-text
gnc:invoice-anchor-text gnc:owner-anchor-text gnc:owner-report-text
- gnc:payables-report-create gnc:receivables-report-create)
-(re-export gnc:owner-report-create)
+ gnc:payables-report-create gnc:receivables-report-create
+ gnc:owner-report-create)
diff --git a/src/report/business-reports/customer-summary.scm b/src/report/business-reports/customer-summary.scm
index d094894..00592c1 100644
--- a/src/report/business-reports/customer-summary.scm
+++ b/src/report/business-reports/customer-summary.scm
@@ -32,10 +32,9 @@
(use-modules (gnucash gnc-module))
(use-modules (gnucash printf))
(use-modules (gnucash main)) ; for gnc:debug
+(use-modules (gnucash gettext))
(gnc:module-load "gnucash/report/report-system" 0)
-(gnc:module-load "gnucash/app-utils" 0)
-
(use-modules (gnucash report standard-reports))
(use-modules (gnucash report business-reports))
diff --git a/src/report/business-reports/easy-invoice.scm b/src/report/business-reports/easy-invoice.scm
index 20ea500..65c4f45 100644
--- a/src/report/business-reports/easy-invoice.scm
+++ b/src/report/business-reports/easy-invoice.scm
@@ -33,10 +33,9 @@
(use-modules (srfi srfi-1))
(use-modules (gnucash printf))
(use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
(gnc:module-load "gnucash/report/report-system" 0)
-(gnc:module-load "gnucash/app-utils" 0)
-
(use-modules (gnucash report standard-reports))
(use-modules (gnucash report business-reports))
diff --git a/src/report/business-reports/fancy-invoice.scm b/src/report/business-reports/fancy-invoice.scm
index 7c61f7b..4aa23cf 100644
--- a/src/report/business-reports/fancy-invoice.scm
+++ b/src/report/business-reports/fancy-invoice.scm
@@ -51,10 +51,9 @@
(use-modules (srfi srfi-1))
(use-modules (gnucash printf))
(use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
(gnc:module-load "gnucash/report/report-system" 0)
-(gnc:module-load "gnucash/app-utils" 0)
-
(use-modules (gnucash report standard-reports))
(use-modules (gnucash report business-reports))
diff --git a/src/report/business-reports/invoice.scm b/src/report/business-reports/invoice.scm
index 1007351..6090c74 100644
--- a/src/report/business-reports/invoice.scm
+++ b/src/report/business-reports/invoice.scm
@@ -27,10 +27,9 @@
(use-modules (srfi srfi-1))
(use-modules (gnucash printf))
(use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
(gnc:module-load "gnucash/report/report-system" 0)
-(gnc:module-load "gnucash/app-utils" 0)
-
(use-modules (gnucash report standard-reports))
(use-modules (gnucash report business-reports))
diff --git a/src/report/business-reports/job-report.scm b/src/report/business-reports/job-report.scm
index d6eb45c..eb5f158 100644
--- a/src/report/business-reports/job-report.scm
+++ b/src/report/business-reports/job-report.scm
@@ -30,10 +30,9 @@
(use-modules (gnucash printf))
(use-modules (gnucash gnc-module))
(use-modules (gnucash main)) ; for gnc:debug
+(use-modules (gnucash gettext))
(gnc:module-load "gnucash/report/report-system" 0)
-(gnc:module-load "gnucash/app-utils" 0)
-
(use-modules (gnucash report standard-reports))
(use-modules (gnucash report business-reports))
diff --git a/src/report/business-reports/owner-report.scm b/src/report/business-reports/owner-report.scm
index bfaa086..84c61fe 100644
--- a/src/report/business-reports/owner-report.scm
+++ b/src/report/business-reports/owner-report.scm
@@ -29,10 +29,9 @@
(use-modules (srfi srfi-1))
(use-modules (gnucash gnc-module))
(use-modules (gnucash main)) ; for gnc:debug
+(use-modules (gnucash gettext))
(gnc:module-load "gnucash/report/report-system" 0)
-(gnc:module-load "gnucash/app-utils" 0)
-
(use-modules (gnucash report standard-reports))
(use-modules (gnucash report business-reports))
@@ -866,13 +865,6 @@
(else #f))))
-(define (gnc:owner-report-create owner account)
- ; Figure out an account to use if nothing exists here.
- (if (null? account)
- (set! account (find-first-account-for-owner owner)))
-
- (owner-report-create owner account))
-
(define (gnc:owner-report-create-internal
account split query journal? double? title
debit-string credit-string)
@@ -893,4 +885,4 @@
(gnc:register-report-hook ACCT-TYPE-PAYABLE #t
gnc:owner-report-create-internal)
-(export gnc:owner-report-create)
+(export find-first-account-for-owner owner-report-create)
diff --git a/src/report/business-reports/payables.scm b/src/report/business-reports/payables.scm
index 5247455..a1c87b6 100644
--- a/src/report/business-reports/payables.scm
+++ b/src/report/business-reports/payables.scm
@@ -27,9 +27,9 @@
(use-modules (gnucash main))
(use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
(gnc:module-load "gnucash/report/report-system" 0)
-(gnc:module-load "gnucash/app-utils" 0)
(use-modules (gnucash report aging))
(use-modules (gnucash report standard-reports))
diff --git a/src/report/business-reports/receivables.scm b/src/report/business-reports/receivables.scm
index f2205a3..75adf36 100644
--- a/src/report/business-reports/receivables.scm
+++ b/src/report/business-reports/receivables.scm
@@ -27,9 +27,9 @@
(use-modules (gnucash main))
(use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
(gnc:module-load "gnucash/report/report-system" 0)
-(gnc:module-load "gnucash/app-utils" 0)
(use-modules (gnucash report aging))
(use-modules (gnucash report standard-reports))
diff --git a/src/report/business-reports/taxinvoice.scm b/src/report/business-reports/taxinvoice.scm
index 106f8d7..05ddd15 100644
--- a/src/report/business-reports/taxinvoice.scm
+++ b/src/report/business-reports/taxinvoice.scm
@@ -30,9 +30,8 @@
(else ))
(use-modules (gnucash main))
(use-modules (gnucash gnc-module))
-(use-modules (gnucash app-utils))
+(use-modules (gnucash gettext))
(gnc:module-load "gnucash/report/report-system" 0)
-(gnc:module-load "gnucash/app-utils" 0)
(gnc:module-load "gnucash/html" 0)
(gnc:module-load "gnucash/engine" 0)
diff --git a/src/report/locale-specific/us/taxtxf-de_DE.scm b/src/report/locale-specific/us/taxtxf-de_DE.scm
index 1eb130b..c50b6e9 100644
--- a/src/report/locale-specific/us/taxtxf-de_DE.scm
+++ b/src/report/locale-specific/us/taxtxf-de_DE.scm
@@ -52,6 +52,7 @@
(use-modules (srfi srfi-1))
(use-modules (gnucash printf))
(use-modules (gnucash core-utils)) ; for gnc:version
+(use-modules (gnucash gettext))
(use-modules (gnucash gnc-module))
(gnc:module-load "gnucash/tax/de_DE" 0)
diff --git a/src/report/locale-specific/us/taxtxf.scm b/src/report/locale-specific/us/taxtxf.scm
index 146c6e8..76dcece 100644
--- a/src/report/locale-specific/us/taxtxf.scm
+++ b/src/report/locale-specific/us/taxtxf.scm
@@ -76,6 +76,7 @@
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (srfi srfi-1))
(use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
(use-modules (sw_gnome_utils)) ;; to get to gnc-error-dialog
(use-modules (gnucash printf))
diff --git a/src/report/report-gnome/report-gnome.scm b/src/report/report-gnome/report-gnome.scm
index 4a67f92..52de518 100644
--- a/src/report/report-gnome/report-gnome.scm
+++ b/src/report/report-gnome/report-gnome.scm
@@ -9,6 +9,7 @@
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (gnucash gnc-module))
(use-modules (gnucash gnome-utils))
+(use-modules (gnucash gettext))
(use-modules (gnucash printf))
diff --git a/src/report/report-system/eguile-html-utilities.scm b/src/report/report-system/eguile-html-utilities.scm
index c90d76c..716299c 100644
--- a/src/report/report-system/eguile-html-utilities.scm
+++ b/src/report/report-system/eguile-html-utilities.scm
@@ -31,8 +31,6 @@
(use-modules (gnucash app-utils))
(gnc:module-load "gnucash/report/report-system" 0)
(gnc:module-load "gnucash/app-utils" 0)
-(use-modules (gnucash report standard-reports))
-(use-modules (gnucash report business-reports))
(use-modules (ice-9 regex)) ; for regular expressions
(use-modules (srfi srfi-13)) ; for extra string functions
diff --git a/src/report/report-system/eguile-utilities.scm b/src/report/report-system/eguile-utilities.scm
index 945f684..a582cae 100644
--- a/src/report/report-system/eguile-utilities.scm
+++ b/src/report/report-system/eguile-utilities.scm
@@ -32,8 +32,6 @@
(use-modules (gnucash core-utils))
(gnc:module-load "gnucash/report/report-system" 0)
(gnc:module-load "gnucash/app-utils" 0)
-(use-modules (gnucash report standard-reports))
-(use-modules (gnucash report business-reports))
; Syncase is deprecated and redundant in guile 2
(cond-expand
(guile-2 )
diff --git a/src/report/report-system/html-fonts.scm b/src/report/report-system/html-fonts.scm
index 4fb9a31..2b0c701 100644
--- a/src/report/report-system/html-fonts.scm
+++ b/src/report/report-system/html-fonts.scm
@@ -6,6 +6,8 @@
;; Copyright (c) Phil Longstaff <plongstaff at rogers.com>
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(use-modules (gnucash gettext))
+
;; Converts a font name to css style information
(define (font-name-to-style-info font-name)
(let*
diff --git a/src/report/report-system/html-style-sheet.scm b/src/report/report-system/html-style-sheet.scm
index 25bb961..fc7f60b 100644
--- a/src/report/report-system/html-style-sheet.scm
+++ b/src/report/report-system/html-style-sheet.scm
@@ -21,6 +21,7 @@
;; Boston, MA 02110-1301, USA gnu at gnu.org
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(use-modules (gnucash gettext))
(define *gnc:_style-sheet-templates_* (make-hash-table 23))
(define *gnc:_style-sheets_* (make-hash-table 23))
diff --git a/src/report/report-system/options-utilities.scm b/src/report/report-system/options-utilities.scm
index 20f4a91..f5e288f 100644
--- a/src/report/report-system/options-utilities.scm
+++ b/src/report/report-system/options-utilities.scm
@@ -21,6 +21,7 @@
;; Boston, MA 02110-1301, USA gnu at gnu.org
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(use-modules (gnucash gettext))
;; These are just a bunch of options which were useful in several
;; reports and hence they got defined in a seperate function.
diff --git a/src/report/report-system/report-system.scm b/src/report/report-system/report-system.scm
index ff74462..9af2efc 100644
--- a/src/report/report-system/report-system.scm
+++ b/src/report/report-system/report-system.scm
@@ -109,10 +109,12 @@
(export gnc:menuname-taxes)
(export gnc:menuname-utility)
(export gnc:menuname-custom)
+(export gnc:menuname-business-reports)
(export gnc:pagename-general)
(export gnc:pagename-accounts)
(export gnc:pagename-display)
(export gnc:optname-reportname)
+(export gnc:optname-invoice-number)
(export gnc:define-report)
(export <report>)
diff --git a/src/report/report-system/report.scm b/src/report/report-system/report.scm
index e743db4..cb475f8 100644
--- a/src/report/report-system/report.scm
+++ b/src/report/report-system/report.scm
@@ -22,6 +22,7 @@
(use-modules (gnucash main))
(use-modules (gnucash printf))
+(use-modules (gnucash gettext))
(use-modules (sw_report_system))
;; Terminology in this file:
@@ -66,6 +67,8 @@
(define gnc:pagename-display (N_ "Display"))
(define gnc:optname-reportname (N_ "Report name"))
(define gnc:optname-stylesheet (N_ "Stylesheet"))
+(define gnc:menuname-business-reports (N_ "_Business"))
+(define gnc:optname-invoice-number (N_ "Invoice Number"))
;; We want to warn users if they've got an old-style, non-guid custom
;; report-template, but only once
diff --git a/src/report/standard-reports/account-piecharts.scm b/src/report/standard-reports/account-piecharts.scm
index 874bd3a..74fcae5 100644
--- a/src/report/standard-reports/account-piecharts.scm
+++ b/src/report/standard-reports/account-piecharts.scm
@@ -29,6 +29,7 @@
(use-modules (srfi srfi-1))
(use-modules (ice-9 regex))
(use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
(use-modules (gnucash printf))
diff --git a/src/report/standard-reports/account-summary.scm b/src/report/standard-reports/account-summary.scm
index 739fc9e..53af64a 100644
--- a/src/report/standard-reports/account-summary.scm
+++ b/src/report/standard-reports/account-summary.scm
@@ -53,6 +53,7 @@
(use-modules (srfi srfi-1))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
(gnc:module-load "gnucash/report/report-system" 0)
diff --git a/src/report/standard-reports/advanced-portfolio.scm b/src/report/standard-reports/advanced-portfolio.scm
index 101b0f2..57db443 100644
--- a/src/report/standard-reports/advanced-portfolio.scm
+++ b/src/report/standard-reports/advanced-portfolio.scm
@@ -30,6 +30,7 @@
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (srfi srfi-1))
(use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
(use-modules (gnucash printf))
diff --git a/src/report/standard-reports/average-balance.scm b/src/report/standard-reports/average-balance.scm
index 0534bb0..c379048 100644
--- a/src/report/standard-reports/average-balance.scm
+++ b/src/report/standard-reports/average-balance.scm
@@ -11,6 +11,7 @@
(use-modules (srfi srfi-1))
(use-modules (gnucash main))
(use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
(gnc:module-load "gnucash/report/report-system" 0)
(define reportname (N_ "Average Balance"))
diff --git a/src/report/standard-reports/balance-sheet.scm b/src/report/standard-reports/balance-sheet.scm
index cfaa882..d40bc16 100644
--- a/src/report/standard-reports/balance-sheet.scm
+++ b/src/report/standard-reports/balance-sheet.scm
@@ -65,7 +65,7 @@
(define-module (gnucash report standard-reports balance-sheet))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (gnucash gnc-module))
-(use-modules (gnucash app-utils))
+(use-modules (gnucash gettext))
(gnc:module-load "gnucash/report/report-system" 0)
diff --git a/src/report/standard-reports/budget-balance-sheet.scm b/src/report/standard-reports/budget-balance-sheet.scm
index 3298028..266324f 100644
--- a/src/report/standard-reports/budget-balance-sheet.scm
+++ b/src/report/standard-reports/budget-balance-sheet.scm
@@ -31,7 +31,7 @@
(define-module (gnucash report standard-reports budget-balance-sheet))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (gnucash gnc-module))
-(use-modules (gnucash app-utils))
+(use-modules (gnucash gettext))
(gnc:module-load "gnucash/report/report-system" 0)
diff --git a/src/report/standard-reports/budget-barchart.scm b/src/report/standard-reports/budget-barchart.scm
index d85d719..9620255 100644
--- a/src/report/standard-reports/budget-barchart.scm
+++ b/src/report/standard-reports/budget-barchart.scm
@@ -29,6 +29,7 @@
(use-modules (srfi srfi-1))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
(use-modules (gnucash printf))
diff --git a/src/report/standard-reports/budget-flow.scm b/src/report/standard-reports/budget-flow.scm
index 7ff087d..fd65a9d 100644
--- a/src/report/standard-reports/budget-flow.scm
+++ b/src/report/standard-reports/budget-flow.scm
@@ -28,6 +28,7 @@
(define-module (gnucash report standard-reports budget-flow))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
(use-modules (gnucash printf))
diff --git a/src/report/standard-reports/budget-income-statement.scm b/src/report/standard-reports/budget-income-statement.scm
index bb110f4..aa5052c 100644
--- a/src/report/standard-reports/budget-income-statement.scm
+++ b/src/report/standard-reports/budget-income-statement.scm
@@ -44,7 +44,7 @@
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (gnucash printf))
(use-modules (gnucash gnc-module))
-(use-modules (gnucash app-utils))
+(use-modules (gnucash gettext))
(gnc:module-load "gnucash/report/report-system" 0)
diff --git a/src/report/standard-reports/budget.scm b/src/report/standard-reports/budget.scm
index 33e3323..ab59e67 100644
--- a/src/report/standard-reports/budget.scm
+++ b/src/report/standard-reports/budget.scm
@@ -28,6 +28,7 @@
(define-module (gnucash report standard-reports budget))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
(use-modules (gnucash printf))
diff --git a/src/report/standard-reports/cash-flow.scm b/src/report/standard-reports/cash-flow.scm
index 764d270..4c57d15 100644
--- a/src/report/standard-reports/cash-flow.scm
+++ b/src/report/standard-reports/cash-flow.scm
@@ -30,6 +30,7 @@
(define-module (gnucash report standard-reports cash-flow))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
(use-modules (gnucash printf))
diff --git a/src/report/standard-reports/category-barchart.scm b/src/report/standard-reports/category-barchart.scm
index f30ba73..45f7f92 100644
--- a/src/report/standard-reports/category-barchart.scm
+++ b/src/report/standard-reports/category-barchart.scm
@@ -30,6 +30,7 @@
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (ice-9 regex))
(use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
(use-modules (gnucash printf))
diff --git a/src/report/standard-reports/daily-reports.scm b/src/report/standard-reports/daily-reports.scm
index 0a6dbcb..0c00638 100644
--- a/src/report/standard-reports/daily-reports.scm
+++ b/src/report/standard-reports/daily-reports.scm
@@ -32,6 +32,7 @@
(use-modules (srfi srfi-1))
(use-modules (ice-9 regex))
(use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
(use-modules (gnucash printf))
diff --git a/src/report/standard-reports/equity-statement.scm b/src/report/standard-reports/equity-statement.scm
index 841c2ff..8c1b2b3 100644
--- a/src/report/standard-reports/equity-statement.scm
+++ b/src/report/standard-reports/equity-statement.scm
@@ -48,7 +48,7 @@
(define-module (gnucash report standard-reports equity-statement))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (gnucash gnc-module))
-(use-modules (gnucash app-utils))
+(use-modules (gnucash gettext))
(use-modules (gnucash printf))
diff --git a/src/report/standard-reports/general-journal.scm b/src/report/standard-reports/general-journal.scm
index e9b7509..4653165 100644
--- a/src/report/standard-reports/general-journal.scm
+++ b/src/report/standard-reports/general-journal.scm
@@ -30,6 +30,7 @@
(export gnc:make-general-journal-report)
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
(gnc:module-load "gnucash/report/report-system" 0)
diff --git a/src/report/standard-reports/general-ledger.scm b/src/report/standard-reports/general-ledger.scm
index 5f02896..1035c15 100644
--- a/src/report/standard-reports/general-ledger.scm
+++ b/src/report/standard-reports/general-ledger.scm
@@ -33,6 +33,7 @@
(export gnc:make-general-ledger-report)
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
(gnc:module-load "gnucash/report/report-system" 0)
diff --git a/src/report/standard-reports/income-statement.scm b/src/report/standard-reports/income-statement.scm
index 2ade73f..7c40395 100644
--- a/src/report/standard-reports/income-statement.scm
+++ b/src/report/standard-reports/income-statement.scm
@@ -45,7 +45,7 @@
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (gnucash printf))
(use-modules (gnucash gnc-module))
-(use-modules (gnucash app-utils))
+(use-modules (gnucash gettext))
(gnc:module-load "gnucash/report/report-system" 0)
diff --git a/src/report/standard-reports/net-barchart.scm b/src/report/standard-reports/net-barchart.scm
index 1934c97..18be873 100644
--- a/src/report/standard-reports/net-barchart.scm
+++ b/src/report/standard-reports/net-barchart.scm
@@ -29,6 +29,7 @@
(use-modules (srfi srfi-1))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
(use-modules (gnucash printf))
(use-modules (gnucash report report-system report-collectors))
diff --git a/src/report/standard-reports/net-linechart.scm b/src/report/standard-reports/net-linechart.scm
index dd5cb34..20ade88 100644
--- a/src/report/standard-reports/net-linechart.scm
+++ b/src/report/standard-reports/net-linechart.scm
@@ -30,6 +30,7 @@
(use-modules (srfi srfi-1))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
(use-modules (gnucash printf))
(use-modules (gnucash report report-system report-collectors))
diff --git a/src/report/standard-reports/portfolio.scm b/src/report/standard-reports/portfolio.scm
index c80d9ab..1e321c7 100644
--- a/src/report/standard-reports/portfolio.scm
+++ b/src/report/standard-reports/portfolio.scm
@@ -26,6 +26,7 @@
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (srfi srfi-1))
(use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
(use-modules (gnucash printf))
diff --git a/src/report/standard-reports/price-scatter.scm b/src/report/standard-reports/price-scatter.scm
index 80d9014..24740ee 100644
--- a/src/report/standard-reports/price-scatter.scm
+++ b/src/report/standard-reports/price-scatter.scm
@@ -28,6 +28,7 @@
(use-modules (srfi srfi-1))
(use-modules (gnucash gnc-module))
(use-modules (gnucash core-utils))
+(use-modules (gnucash gettext))
(use-modules (gnucash printf))
diff --git a/src/report/standard-reports/register.scm b/src/report/standard-reports/register.scm
index 1c32803..bd09dee 100644
--- a/src/report/standard-reports/register.scm
+++ b/src/report/standard-reports/register.scm
@@ -6,6 +6,7 @@
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (srfi srfi-1))
(use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
(gnc:module-load "gnucash/report/report-system" 0)
diff --git a/src/report/standard-reports/sx-summary.scm b/src/report/standard-reports/sx-summary.scm
index 9206dc4..800c4dd 100644
--- a/src/report/standard-reports/sx-summary.scm
+++ b/src/report/standard-reports/sx-summary.scm
@@ -37,6 +37,7 @@
(use-modules (gnucash main))
(use-modules (gnucash printf))
(use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
(gnc:module-load "gnucash/report/report-system" 0)
diff --git a/src/report/standard-reports/transaction.scm b/src/report/standard-reports/transaction.scm
index 84345eb..a8b2e60 100644
--- a/src/report/standard-reports/transaction.scm
+++ b/src/report/standard-reports/transaction.scm
@@ -34,6 +34,7 @@
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (srfi srfi-1))
(use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
(use-modules (gnucash printf))
diff --git a/src/report/standard-reports/trial-balance.scm b/src/report/standard-reports/trial-balance.scm
index 1147058..fd7d9ad 100644
--- a/src/report/standard-reports/trial-balance.scm
+++ b/src/report/standard-reports/trial-balance.scm
@@ -54,7 +54,7 @@
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (gnucash printf))
(use-modules (gnucash gnc-module))
-(use-modules (gnucash app-utils))
+(use-modules (gnucash gettext))
(gnc:module-load "gnucash/report/report-system" 0)
diff --git a/src/report/stylesheets/stylesheet-easy.scm b/src/report/stylesheets/stylesheet-easy.scm
index 94f5bf2..25be3d9 100644
--- a/src/report/stylesheets/stylesheet-easy.scm
+++ b/src/report/stylesheets/stylesheet-easy.scm
@@ -31,6 +31,7 @@
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
(gnc:module-load "gnucash/html" 0) ; added for 'gnc-html-engine-supports-css'
(gnc:module-load "gnucash/report/report-system" 0)
diff --git a/src/report/stylesheets/stylesheet-fancy.scm b/src/report/stylesheets/stylesheet-fancy.scm
index d06d386..a4b4bc8 100644
--- a/src/report/stylesheets/stylesheet-fancy.scm
+++ b/src/report/stylesheets/stylesheet-fancy.scm
@@ -25,6 +25,7 @@
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
(gnc:module-load "gnucash/html" 0) ; added for 'gnc-html-engine-supports-css'
(gnc:module-load "gnucash/report/report-system" 0)
diff --git a/src/report/stylesheets/stylesheet-footer.scm b/src/report/stylesheets/stylesheet-footer.scm
index b0b34f2..5192bab 100644
--- a/src/report/stylesheets/stylesheet-footer.scm
+++ b/src/report/stylesheets/stylesheet-footer.scm
@@ -36,6 +36,7 @@
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
(gnc:module-load "gnucash/html" 0) ; added for 'gnc-html-engine-supports-css'
(gnc:module-load "gnucash/report/report-system" 0)
diff --git a/src/report/stylesheets/stylesheet-plain.scm b/src/report/stylesheets/stylesheet-plain.scm
index 6435500..d5d6f6e 100644
--- a/src/report/stylesheets/stylesheet-plain.scm
+++ b/src/report/stylesheets/stylesheet-plain.scm
@@ -27,7 +27,7 @@
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (gnucash gnc-module))
(use-modules (gnucash core-utils))
-(use-modules (gnucash report report-system))
+(use-modules (gnucash gettext))
(use-modules (srfi srfi-13))
(use-modules (srfi srfi-14))
diff --git a/src/report/utility-reports/hello-world.scm b/src/report/utility-reports/hello-world.scm
index 12e3386..5cc6741 100644
--- a/src/report/utility-reports/hello-world.scm
+++ b/src/report/utility-reports/hello-world.scm
@@ -7,6 +7,7 @@
(define-module (gnucash report hello-world))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
;; 'debug is deprecated and unused since guile 2
(cond-expand
diff --git a/src/report/utility-reports/view-column.scm b/src/report/utility-reports/view-column.scm
index 61ece51..9cac6f0 100644
--- a/src/report/utility-reports/view-column.scm
+++ b/src/report/utility-reports/view-column.scm
@@ -29,6 +29,7 @@
(define-module (gnucash report view-column))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
(use-modules (sw_report_system))
(use-modules (gnucash printf))
diff --git a/src/report/utility-reports/welcome-to-gnucash.scm b/src/report/utility-reports/welcome-to-gnucash.scm
index 9897acb..4afb550 100644
--- a/src/report/utility-reports/welcome-to-gnucash.scm
+++ b/src/report/utility-reports/welcome-to-gnucash.scm
@@ -25,6 +25,7 @@
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (gnucash core-utils)) ; for gnc:version
+(use-modules (gnucash gettext))
(use-modules (gnucash gnc-module))
(use-modules (sw_report_system))
diff --git a/src/tax/us/de_DE.scm b/src/tax/us/de_DE.scm
index 186919c..19474c1 100644
--- a/src/tax/us/de_DE.scm
+++ b/src/tax/us/de_DE.scm
@@ -1,7 +1,7 @@
(define-module (gnucash tax de_DE))
(use-modules (gnucash gnc-module))
-(gnc:module-load "gnucash/app-utils" 0)
+(use-modules (gnucash gettext))
(export gnc:txf-get-payer-name-source)
(export gnc:txf-get-form)
diff --git a/src/tax/us/txf-de_DE.scm b/src/tax/us/txf-de_DE.scm
index 0718393..4add1ba 100644
--- a/src/tax/us/txf-de_DE.scm
+++ b/src/tax/us/txf-de_DE.scm
@@ -26,6 +26,8 @@
;; http://www.felfri.de/winston/schnittstellen.htm
;;
+(use-modules (gnucash gettext))
+
(define txf-tax-entity-types
(list
(cons 'Ind #("Individual, Joint, etc." "Umsatzsteuer-Kennzahlen"))
commit 9f15bb19fd0171b8fc1aa6d093139b161a958bc3
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Oct 28 21:22:01 2014 +0100
Fix a few deprecation warnings when building and testing with guile 2
diff --git a/src/gnc-test-env.in b/src/gnc-test-env.in
index 847364d..085fbb6 100755
--- a/src/gnc-test-env.in
+++ b/src/gnc-test-env.in
@@ -7,8 +7,12 @@ exec @GUILE@ -s $0 "$@"
;; library-dirs
(use-modules (srfi srfi-13) (srfi srfi-14)) ;; for string-tokenize
+;; 'debug is deprecated and unused since guile 2
+(cond-expand
+ (guile-2 )
+ (else
+ (debug-enable 'debug)))
(debug-enable 'backtrace)
-(debug-enable 'debug)
(read-enable 'positions)
;; Are we on MS Windows here? If yes, make this a #t.
diff --git a/src/report/report-system/eguile-utilities.scm b/src/report/report-system/eguile-utilities.scm
index e4054cb..945f684 100644
--- a/src/report/report-system/eguile-utilities.scm
+++ b/src/report/report-system/eguile-utilities.scm
@@ -34,7 +34,11 @@
(gnc:module-load "gnucash/app-utils" 0)
(use-modules (gnucash report standard-reports))
(use-modules (gnucash report business-reports))
-(use-modules (ice-9 syncase)) ; for define-syntax
+; Syncase is deprecated and redundant in guile 2
+(cond-expand
+ (guile-2 )
+ (else
+ (use-modules (ice-9 syncase)))) ; for define-syntax
;(use-modules (srfi srfi-13)) ; for extra string functions
diff --git a/src/report/utility-reports/hello-world.scm b/src/report/utility-reports/hello-world.scm
index 448db2e..12e3386 100644
--- a/src/report/utility-reports/hello-world.scm
+++ b/src/report/utility-reports/hello-world.scm
@@ -8,7 +8,11 @@
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (gnucash gnc-module))
-(debug-enable 'debug)
+;; 'debug is deprecated and unused since guile 2
+(cond-expand
+ (guile-2 )
+ (else
+ (debug-enable 'debug)))
(debug-enable 'backtrace)
(gnc:module-load "gnucash/report/report-system" 0)
diff --git a/src/scm/main.scm b/src/scm/main.scm
index b29baff..040f289 100644
--- a/src/scm/main.scm
+++ b/src/scm/main.scm
@@ -62,13 +62,17 @@
;; 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.
;; These are needed for a guile 1.3.4 bug
-(debug-enable 'debug)
(debug-enable 'backtrace)
(read-enable 'positions)
-;; maxdepth doesn't exist in guile 2 and onwards:
-(if (< (string->number (major-version)) 2)
- (debug-set! maxdepth 100000))
+;; These options should only be set for guile < 2.0
+;; 'debug (deprecated and unused since guile 2)
+;; maxdepth (removed since guile 2)
+(cond-expand
+ (guile-2 )
+ (else
+ (debug-enable 'debug)
+ (debug-set! maxdepth 100000)))
(debug-set! stack 200000)
;; Initalialize localization, otherwise reports may output
commit 4e61f0fc9fc342f8580b3d3e5191945e0cc15d57
Author: Geert Janssens <janssens-geert at telenet.be>
Date: Tue Oct 28 20:40:21 2014 +0100
Harmonize variable names used to refer to guile modules in all makefiles
This makes the makefiles more similar and hence
easier to understand and maintain
diff --git a/src/app-utils/Makefile.am b/src/app-utils/Makefile.am
index 8627c5d..7744e5d 100644
--- a/src/app-utils/Makefile.am
+++ b/src/app-utils/Makefile.am
@@ -136,10 +136,10 @@ libgncmod_app_utils_python_la_LIBADD = \
libgncmod-app-utils.la
endif
-gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
-gncmod_DATA = app-utils.scm
+gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
+gncscmmod_DATA = app-utils.scm
-gncscmdir = ${GNC_SHAREDIR}/scm
+gncscmdir = ${GNC_SCM_INSTALL_DIR}
gncscm_DATA = \
business-options.scm \
business-prefs.scm \
@@ -168,7 +168,7 @@ noinst_HEADERS = \
EXTRA_DIST = \
swig-app-utils-python.c \
app-utils.i \
- ${gncmod_DATA} \
+ ${gncscmmod_DATA} \
${gncscm_DATA} \
${prefsmigration_DATA}
@@ -182,7 +182,7 @@ endif
if GNUCASH_SEPARATE_BUILDDIR
#For executing test cases
SCM_FILE_LINKS = \
- ${gncmod_DATA} \
+ ${gncscmmod_DATA} \
${gncscm_DATA}
endif
@@ -194,7 +194,7 @@ if GNUCASH_SEPARATE_BUILDDIR
$(LN_S) -f ${srcdir}/$$X . ; \
done
endif
- ( cd gnucash; for A in $(gncmod_DATA) ; do $(LN_S) -f ../$$A . ; done )
+ ( cd gnucash; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../$$A . ; done )
if ! OS_WIN32
# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567).
touch .scm-links
diff --git a/src/business/business-gnome/Makefile.am b/src/business/business-gnome/Makefile.am
index 0eaed9d..07fe94a 100644
--- a/src/business/business-gnome/Makefile.am
+++ b/src/business/business-gnome/Makefile.am
@@ -83,21 +83,16 @@ libgncmod_business_gnome_la_LIBADD = \
${GLIB_LIBS} \
${EFENCE_LIBS}
-# For Business Reports
-gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/
-gncscmmod_DATA =
-
-gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
-gncmod_DATA = business-gnome.scm
+gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
+gncscmmod_DATA = business-gnome.scm
EXTRA_DIST = \
- ${gncmod_DATA} \
${gncscmmod_DATA}
if GNUCASH_SEPARATE_BUILDDIR
#Only needed when srcdir and builddir are different
#for running
-SCM_FILE_LINKS = ${gncmod_DATA}
+SCM_FILE_LINKS = ${gncscmmod_DATA}
endif
.scm-links:
@@ -108,7 +103,7 @@ if GNUCASH_SEPARATE_BUILDDIR
$(LN_S) -f ${srcdir}/$$X . ; \
done
endif
- ( cd gnucash; for A in $(gncmod_DATA) ; do $(LN_S) -f ../$$A . ; done )
+ ( cd gnucash; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../$$A . ; done )
if ! OS_WIN32
# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567).
touch .scm-links
diff --git a/src/core-utils/Makefile.am b/src/core-utils/Makefile.am
index b067e88..f7985d6 100644
--- a/src/core-utils/Makefile.am
+++ b/src/core-utils/Makefile.am
@@ -67,13 +67,13 @@ AM_CPPFLAGS = \
-I${top_builddir}/src \
-I${top_srcdir}/src
-gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
-gncmod_DATA = core-utils.scm
+gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
+gncscmmod_DATA = core-utils.scm
if GNUCASH_SEPARATE_BUILDDIR
#Only needed when srcdir and builddir are different
#for running
-SCM_FILE_LINKS = ${gncmod_DATA}
+SCM_FILE_LINKS = ${gncscmmod_DATA}
endif
if WITH_PYTHON
@@ -106,7 +106,7 @@ if GNUCASH_SEPARATE_BUILDDIR
$(LN_S) -f ${srcdir}/$$X . ; \
done
endif
- ( cd gnucash; for A in $(gncmod_DATA) ; do $(LN_S) -f ../$$A . ; done )
+ ( cd gnucash; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../$$A . ; done )
if ! OS_WIN32
# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567).
touch .scm-links
@@ -114,7 +114,7 @@ endif
noinst_DATA = .scm-links
BUILT_SOURCES = gncla-dir.h gnc-version.h
-EXTRA_DIST = $(gncmod_DATA) core-utils.i gncla-dir.h.in gnc-scm-info.h
+EXTRA_DIST = $(gncscmmod_DATA) core-utils.i gncla-dir.h.in gnc-scm-info.h
clean-local:
rm -rf gnucash
diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am
index a0147c2..f51f1e8 100644
--- a/src/engine/Makefile.am
+++ b/src/engine/Makefile.am
@@ -143,11 +143,11 @@ libgncmod_engine_la_LIBADD = \
${GLIB_LIBS} \
${top_builddir}/lib/libc/libc-missing.la
-gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
-gncmod_DATA = engine.scm \
+gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
+gncscmmod_DATA = engine.scm \
business-core.scm
-gncscmdir = ${GNC_SHAREDIR}/scm
+gncscmdir = ${GNC_SCM_INSTALL_DIR}
gncscm_DATA = \
commodity-table.scm \
engine-interface.scm \
@@ -164,7 +164,7 @@ EXTRA_DIST = \
SX-book-p.h \
engine.i \
business-core.i \
- ${gncmod_DATA} \
+ ${gncscmmod_DATA} \
${gncscm_DATA}
if GNUCASH_SEPARATE_BUILDDIR
@@ -172,7 +172,7 @@ if GNUCASH_SEPARATE_BUILDDIR
SCM_FILE_LINKS = iso-4217-currencies.scm
#For executing test cases
SCM_FILE_LINKS += \
- ${gncmod_DATA} \
+ ${gncscmmod_DATA} \
${gncscm_DATA}
endif
@@ -184,7 +184,7 @@ if GNUCASH_SEPARATE_BUILDDIR
$(LN_S) -f ${srcdir}/$$X . ; \
done
endif
- ( cd gnucash; for A in $(gncmod_DATA) ; do $(LN_S) -f ../$$A . ; done )
+ ( cd gnucash; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../$$A . ; done )
if ! OS_WIN32
# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567).
touch .scm-links
diff --git a/src/gnc-module/Makefile.am b/src/gnc-module/Makefile.am
index 7ee546b..94abe1a 100644
--- a/src/gnc-module/Makefile.am
+++ b/src/gnc-module/Makefile.am
@@ -19,8 +19,8 @@ libgnc_module_la_LIBADD = \
${GLIB_LIBS} \
${GUILE_LIBS}
-gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
-gncmod_DATA = gnc-module.scm
+gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
+gncscmmod_DATA = gnc-module.scm
gncincludedir = ${GNC_INCLUDE_DIR}
gncinclude_HEADERS = \
@@ -43,12 +43,12 @@ endif
endif
EXTRA_DIST = \
- ${gncmod_DATA} \
+ ${gncscmmod_DATA} \
gnc-module.i
if GNUCASH_SEPARATE_BUILDDIR
#For executing test cases
-SCM_FILE_LINKS = ${gncmod_DATA}
+SCM_FILE_LINKS = ${gncscmmod_DATA}
endif
.scm-links:
@@ -59,7 +59,7 @@ if GNUCASH_SEPARATE_BUILDDIR
$(LN_S) -f ${srcdir}/$$X . ; \
done
endif
- ( cd gnucash; for A in $(gncmod_DATA) ; do $(LN_S) -f ../$$A . ; done )
+ ( cd gnucash; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../$$A . ; done )
if ! OS_WIN32
# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567).
touch .scm-links
diff --git a/src/gnome-utils/Makefile.am b/src/gnome-utils/Makefile.am
index 739ff25..7533819 100644
--- a/src/gnome-utils/Makefile.am
+++ b/src/gnome-utils/Makefile.am
@@ -239,24 +239,24 @@ endif
endif
endif
-gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
-gncmod_DATA = gnome-utils.scm
+gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
+gncscmmod_DATA = gnome-utils.scm
-gncscmdir = ${GNC_SHAREDIR}/scm
+gncscmdir = ${GNC_SCM_INSTALL_DIR}
gncscm_DATA = gnc-menu-extensions.scm
EXTRA_DIST = \
gnome-utils.i \
make-gnc-warnings-c.xsl \
make-gnc-warnings-h.xsl \
- ${gncmod_DATA} \
+ ${gncscmmod_DATA} \
${gncscm_DATA}
if GNUCASH_SEPARATE_BUILDDIR
#For executing test cases
SCM_FILE_LINKS = \
- ${gncmod_DATA} \
+ ${gncscmmod_DATA} \
${gncscm_DATA}
endif
@@ -268,7 +268,7 @@ if GNUCASH_SEPARATE_BUILDDIR
$(LN_S) -f ${srcdir}/$$X . ; \
done
endif
- ( cd gnucash; for A in $(gncmod_DATA) ; do $(LN_S) -f ../$$A . ; done )
+ ( cd gnucash; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../$$A . ; done )
if ! OS_WIN32
# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567).
touch .scm-links
diff --git a/src/report/locale-specific/us/Makefile.am b/src/report/locale-specific/us/Makefile.am
index 333571a..ea55df0 100644
--- a/src/report/locale-specific/us/Makefile.am
+++ b/src/report/locale-specific/us/Makefile.am
@@ -21,17 +21,17 @@ AM_CPPFLAGS = \
${GUILE_CFLAGS} ${GLIB_CFLAGS}
## This is unused and therefore no longer installed and/or loaded
-gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/locale-specific
-gncscmmod_DATA = us.scm de_DE.scm
+gncscmrptdir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/locale-specific
+gncscmrpt_DATA = us.scm de_DE.scm
-gncscmothermoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/
-gncscmothermod_DATA = taxtxf.scm taxtxf-de_DE.scm
+gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/
+gncscmmod_DATA = taxtxf.scm taxtxf-de_DE.scm
if GNUCASH_SEPARATE_BUILDDIR
#For executing test cases
SCM_FILE_LINKS = \
- ${gncscmmod_DATA} \
- ${gncscmothermod_DATA}
+ ${gncscmrpt_DATA} \
+ ${gncscmmod_DATA}
endif
.scm-links:
@@ -44,8 +44,8 @@ if GNUCASH_SEPARATE_BUILDDIR
$(LN_S) -f ${srcdir}/$$X . ; \
done
endif
- ( cd gnucash/report/locale-specific; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../../../$$A . ; done )
- ( cd gnucash/report; for A in $(gncscmothermod_DATA) ; do $(LN_S) -f ../../$$A . ; done )
+ ( cd gnucash/report/locale-specific; for A in $(gncscmrpt_DATA) ; do $(LN_S) -f ../../../$$A . ; done )
+ ( cd gnucash/report; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../../$$A . ; done )
if ! OS_WIN32
# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567).
touch .scm-links
@@ -57,8 +57,8 @@ clean-local:
noinst_DATA = .scm-links
EXTRA_DIST = \
- ${gncscmothermod_DATA} \
- ${gncscmmod_DATA}
+ ${gncscmmod_DATA} \
+ ${gncscmrpt_DATA}
CLEANFILES = .scm-links
DISTCLEANFILES = ${SCM_FILE_LINKS}
diff --git a/src/report/report-gnome/Makefile.am b/src/report/report-gnome/Makefile.am
index 5f65a0e..66417a6 100644
--- a/src/report/report-gnome/Makefile.am
+++ b/src/report/report-gnome/Makefile.am
@@ -62,8 +62,8 @@ endif
endif
endif
-gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report
-gncmod_DATA = report-gnome.scm
+gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report
+gncscmmod_DATA = report-gnome.scm
noinst_DATA = .scm-links
@@ -80,13 +80,13 @@ ui_DATA = \
EXTRA_DIST = \
report-gnome.i \
${gtkbuilder_DATA} \
- ${gncmod_DATA} \
+ ${gncscmmod_DATA} \
${ui_DATA}
if GNUCASH_SEPARATE_BUILDDIR
#Only needed when srcdir and builddir are different
# for running
-SCM_FILE_LINKS = ${gncmod_DATA}
+SCM_FILE_LINKS = ${gncscmmod_DATA}
endif
.scm-links:
@@ -98,7 +98,7 @@ if GNUCASH_SEPARATE_BUILDDIR
$(LN_S) -f ${srcdir}/$$X . ; \
done
endif
- ( cd gnucash/report; for A in $(gncmod_DATA) ; do $(LN_S) -f ../../$$A . ; done )
+ ( cd gnucash/report; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../../$$A . ; done )
if ! OS_WIN32
# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567).
touch .scm-links
diff --git a/src/report/report-system/Makefile.am b/src/report/report-system/Makefile.am
index 6b12984..3a5ecc7 100644
--- a/src/report/report-system/Makefile.am
+++ b/src/report/report-system/Makefile.am
@@ -47,7 +47,7 @@ AM_CPPFLAGS = \
${GTK_CFLAGS} \
${GUILE_CFLAGS}
-gncscmdir = ${GNC_SHAREDIR}/scm
+gncscmdir = ${GNC_SCM_INSTALL_DIR}
gncscm_DATA = \
commodity-utilities.scm \
html-acct-table.scm \
@@ -67,8 +67,6 @@ gncscm_DATA = \
report-utilities.scm \
report.scm
-gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report-system
-
gncmodscmdir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/report-system
gncmodscm_DATA = \
diff --git a/src/report/standard-reports/Makefile.am b/src/report/standard-reports/Makefile.am
index 4e90547..30c2d6a 100644
--- a/src/report/standard-reports/Makefile.am
+++ b/src/report/standard-reports/Makefile.am
@@ -22,8 +22,8 @@ gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/
gncscmmod_DATA = \
standard-reports.scm
-gncscmreportmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/standard-reports
-gncscmreportmod_DATA = \
+gncscmrptdir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/standard-reports
+gncscmrpt_DATA = \
account-piecharts.scm \
account-summary.scm \
advanced-portfolio.scm \
@@ -54,7 +54,7 @@ gncscmreportmod_DATA = \
if GNUCASH_SEPARATE_BUILDDIR
#For executing test cases
-SCM_FILE_LINKS = ${gncscmmod_DATA} ${gncscmreportmod_DATA}
+SCM_FILE_LINKS = ${gncscmmod_DATA} ${gncscmrpt_DATA}
endif
.scm-links:
@@ -68,7 +68,7 @@ if GNUCASH_SEPARATE_BUILDDIR
done
endif
( cd gnucash/report; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../../$$A . ; done )
- ( cd gnucash/report/standard-reports; for A in $(gncscmreportmod_DATA) ; do $(LN_S) -f ../../../$$A . ; done )
+ ( cd gnucash/report/standard-reports; for A in $(gncscmrpt_DATA) ; do $(LN_S) -f ../../../$$A . ; done )
if ! OS_WIN32
# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567).
touch .scm-links
@@ -79,7 +79,7 @@ clean-local:
noinst_DATA = .scm-links
-EXTRA_DIST = ${gncscmmod_DATA} ${gncscmreportmod_DATA}
+EXTRA_DIST = ${gncscmmod_DATA} ${gncscmrpt_DATA}
CLEANFILES = .scm-links ${SCM_FILE_LINKS}
DISTCLEANFILES =
diff --git a/src/tax/us/Makefile.am b/src/tax/us/Makefile.am
index ea02a6c..1b2f041 100644
--- a/src/tax/us/Makefile.am
+++ b/src/tax/us/Makefile.am
@@ -19,7 +19,7 @@ AM_CPPFLAGS = \
gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/tax
gncscmmod_DATA = us.scm de_DE.scm
-gncscmdir = ${GNC_SHAREDIR}/scm
+gncscmdir = ${GNC_SCM_INSTALL_DIR}
gncscm_DATA = txf.scm txf-help.scm txf-de_DE.scm txf-help-de_DE.scm
if GNUCASH_SEPARATE_BUILDDIR
diff --git a/src/test-core/Makefile.am b/src/test-core/Makefile.am
index 8ed78a4..7c7ca57 100644
--- a/src/test-core/Makefile.am
+++ b/src/test-core/Makefile.am
@@ -77,10 +77,11 @@ _unittest_support_la_LIBADD = \
libtest-core.la
endif
-SCM_FILES = unittest-support.scm
-gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
-gncmod_DATA = $(SCM_FILES)
+gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
+gncscmmod_DATA = unittest-support.scm
+
+SCM_FILES = $(gncscmmod_DATA)
.scm-links:
$(RM) -rf gnucash
@@ -90,7 +91,7 @@ if GNUCASH_SEPARATE_BUILDDIR
$(LN_S) -f ${srcdir}/$$X . ; \
done
endif
- ( cd gnucash; for A in $(SCM_FILES) ; do $(LN_S) -f ../$$A . ; done )
+ ( cd gnucash; for A in $(gncscmmod_DATA) ; do $(LN_S) -f ../$$A . ; done )
if ! OS_WIN32
# Windows knows no "ln -s" but uses "cp": must copy every time (see bug #566567).
touch .scm-links
Summary of changes:
configure.ac | 1 +
src/Makefile.am | 4 +-
src/app-utils/Makefile.am | 39 +++++++++++++---
src/app-utils/app-utils.scm | 34 +++++---------
src/app-utils/business-prefs.scm | 2 +
src/app-utils/date-utilities.scm | 3 +-
.../engine-utilities.scm => app-utils/gettext.scm} | 38 ++++++++++-----
src/app-utils/prefs.scm | 2 +-
src/app-utils/test/test-load-module | 2 +-
src/bin/Makefile.am | 3 +-
src/bin/environment.in | 3 +-
src/bin/overrides/Makefile.am | 1 -
src/bin/overrides/gnucash-env.in | 1 -
src/business/business-gnome/Makefile.am | 44 ++++++++++++++----
src/core-utils/Makefile.am | 26 ++++++++---
src/core-utils/gnc-path.c | 6 +--
src/core-utils/gnc-path.h | 4 +-
src/engine/Makefile.am | 31 ++++++++++---
src/engine/engine.scm | 6 +++
src/gnc-module/Makefile.am | 24 ++++++++--
src/gnc-test-env.in | 11 ++++-
src/gnome-utils/Makefile.am | 34 +++++++++++---
src/gnome-utils/gnome-utils.scm | 6 +++
src/import-export/qif-imp/Makefile.am | 24 +++++++++-
src/report/business-reports/Makefile.am | 54 ++++++++++++++++++----
src/report/business-reports/aging.scm | 1 +
src/report/business-reports/balsheet-eg.scm | 2 +-
src/report/business-reports/business-reports.scm | 26 ++++-------
src/report/business-reports/customer-summary.scm | 3 +-
src/report/business-reports/easy-invoice.scm | 3 +-
src/report/business-reports/fancy-invoice.scm | 3 +-
src/report/business-reports/invoice.scm | 3 +-
src/report/business-reports/job-report.scm | 3 +-
src/report/business-reports/owner-report.scm | 12 +----
src/report/business-reports/payables.scm | 2 +-
src/report/business-reports/receivables.scm | 2 +-
src/report/business-reports/taxinvoice.scm | 3 +-
src/report/locale-specific/us/Makefile.am | 54 ++++++++++++++++++----
src/report/locale-specific/us/taxtxf-de_DE.scm | 1 +
src/report/locale-specific/us/taxtxf.scm | 8 ++++
src/report/report-gnome/Makefile.am | 36 +++++++++++++--
src/report/report-gnome/report-gnome.scm | 8 ++++
src/report/report-system/Makefile.am | 43 ++++++++++++++---
src/report/report-system/eguile-html-utilities.scm | 2 -
src/report/report-system/eguile-utilities.scm | 8 ++--
src/report/report-system/html-document.scm | 4 +-
src/report/report-system/html-fonts.scm | 2 +
src/report/report-system/html-style-sheet.scm | 1 +
src/report/report-system/options-utilities.scm | 1 +
src/report/report-system/report-system.scm | 2 +
src/report/report-system/report.scm | 9 ++++
src/report/standard-reports/Makefile.am | 44 +++++++++++++++---
src/report/standard-reports/account-piecharts.scm | 1 +
src/report/standard-reports/account-summary.scm | 1 +
src/report/standard-reports/advanced-portfolio.scm | 1 +
src/report/standard-reports/average-balance.scm | 1 +
src/report/standard-reports/balance-sheet.scm | 2 +-
.../standard-reports/budget-balance-sheet.scm | 2 +-
src/report/standard-reports/budget-barchart.scm | 1 +
src/report/standard-reports/budget-flow.scm | 1 +
.../standard-reports/budget-income-statement.scm | 2 +-
src/report/standard-reports/budget.scm | 1 +
src/report/standard-reports/cash-flow.scm | 1 +
src/report/standard-reports/category-barchart.scm | 1 +
src/report/standard-reports/daily-reports.scm | 1 +
src/report/standard-reports/equity-statement.scm | 2 +-
src/report/standard-reports/general-journal.scm | 1 +
src/report/standard-reports/general-ledger.scm | 1 +
src/report/standard-reports/income-statement.scm | 2 +-
src/report/standard-reports/net-barchart.scm | 1 +
src/report/standard-reports/net-linechart.scm | 1 +
src/report/standard-reports/portfolio.scm | 1 +
src/report/standard-reports/price-scatter.scm | 1 +
src/report/standard-reports/register.scm | 1 +
src/report/standard-reports/sx-summary.scm | 1 +
src/report/standard-reports/transaction.scm | 1 +
src/report/standard-reports/trial-balance.scm | 2 +-
src/report/stylesheets/Makefile.am | 31 ++++++++++++-
src/report/stylesheets/stylesheet-easy.scm | 1 +
src/report/stylesheets/stylesheet-fancy.scm | 1 +
src/report/stylesheets/stylesheet-footer.scm | 1 +
src/report/stylesheets/stylesheet-plain.scm | 2 +-
src/report/utility-reports/Makefile.am | 31 ++++++++++++-
src/report/utility-reports/hello-world.scm | 7 ++-
src/report/utility-reports/view-column.scm | 7 +++
src/report/utility-reports/welcome-to-gnucash.scm | 7 +++
src/scm/Makefile.am | 21 ++++++++-
src/scm/gnumeric/Makefile.am | 9 ++++
src/scm/main.scm | 12 +++--
src/tax/us/Makefile.am | 29 +++++++++++-
src/tax/us/de_DE.scm | 2 +-
src/tax/us/txf-de_DE.scm | 2 +
src/test-core/Makefile.am | 23 +++++++--
src/test-core/unittest-support.scm | 8 +++-
94 files changed, 721 insertions(+), 193 deletions(-)
copy src/{engine/engine-utilities.scm => app-utils/gettext.scm} (56%)
More information about the gnucash-changes
mailing list