Periodic merge of branch 'maint'

Fixed conflicts:
	src/test-core/Makefile.am

Most important changes:
* precompile scm files in case guile 2 is detected
* several new and updated translations
* several bugfixes since the 2.6.4 release

configure.ac

@@ -93,7 +93,7 @@ AC_DEFINE_UNQUOTED(GNUCASH_LATEST_STABLE_SERIES, "$GNUCASH_LATEST_STABLE_SERIES"
     [Most recent stable GnuCash series])
 
 dnl Set of available languages.
-ALL_LINGUAS="ar bg brx ca cs da de doi el en_GB es_NI es eu fa fi fr he hi hu it ja ko kok ks lt lv mr nb ne nl pl pt_BR pt ro ru rw sk sv ta te tr uk ur vi zh_CN zh_TW"
+ALL_LINGUAS="ar as bg brx ca cs da de doi el en_GB es_NI es eu fa fi fr gu he hi hu it ja kn ko kok kok@latin ks lt lv mr nb ne nl pl pt_BR pt ro ru rw sk sv ta te tr uk ur vi zh_CN zh_TW"
 
 GETTEXT_PACKAGE=gnucash
 AC_SUBST(GETTEXT_PACKAGE)
@@ -500,6 +500,7 @@ PKG_CHECK_MODULES(GUILE,
 ])
 
 AM_CONDITIONAL(GNC_HAVE_GUILE_2, test "${gnc_have_guile_2}" = yes)
+AC_SUBST(GUILE_EFFECTIVE_VERSION)
 
 
 ### --------------------------------------------------------------------------

po/bg.po

@@ -21423,7 +21423,6 @@ msgstr "Име на файл с лого за отчета"
 
 #. src/report/business-reports/taxinvoice.scm
 #: ../intl-scm/guile-strings.c:1772
-#, c-format
 msgid ""
 "Width of the logo in CSS format, e.g. 10% or 32px. Leave blank to display "
 "the logo at its natural width. The height of the logo will be scaled "

po/es.po

@@ -13,7 +13,7 @@ msgstr ""
 "PO-Revision-Date: 2011-03-26 18:12+0100\n"
 "Last-Translator: Francisco Javier F. Serrador <fserrador@gmail.com>\n"
 "Language-Team: spanish <es@li.org>\n"
-"Language: \n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/fi.po

@@ -11,7 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2012-01-22 20:59+0200\n"
 "Last-Translator: Jyri-Petteri Paloposki <jyri-petteri.paloposki@iki.fi>\n"
 "Language-Team: UNKNOWN\n"
-"Language: \n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/he.po

@@ -12,7 +12,7 @@ msgstr ""
 "PO-Revision-Date: 2009-04-21 14:37+0200\n"
 "Last-Translator: Ori Hoch <ori@uumpa.com>\n"
 "Language-Team: Hebrew\n"
-"Language: \n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/hu.po

@@ -13,7 +13,7 @@ msgstr ""
 "PO-Revision-Date: 2011-07-30 16:57+0100\n"
 "Last-Translator: Takó Kornél <takokornel@gmail.com>\n"
 "Language-Team: Hungarian\n"
-"Language: \n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/ro.po

@@ -13,7 +13,7 @@ msgstr ""
 "PO-Revision-Date: 2008-08-21 12:22+0200\n"
 "Last-Translator: Nicolae Turcan <nicturcan@gmail.com>\n"
 "Language-Team: American English <kde-i18n-doc@lists.kde.org>\n"
-"Language: \n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/ru.po

@@ -15,7 +15,7 @@ msgstr ""
 "PO-Revision-Date: 2011-02-10 23:25+0300\n"
 "Last-Translator: Dmitry Pavlov <zeldigas@gmail.com>\n"
 "Language-Team: russian <ru@li.org>\n"
-"Language: \n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/tr.po

@@ -11,7 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2010-10-05 12:46+0200\n"
 "Last-Translator: Seyfi Duyan <seyfi.duyan@gmail.com>\n"
 "Language-Team: \n"
-"Language: \n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

src/Makefile.am

@@ -10,8 +10,7 @@ NONGUI_SUBDIRS = \
   engine \
   backend \
   scm \
-  quotes \
+  quotes
-  tax
 
 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

src/app-utils/Makefile.am

@@ -136,10 +136,12 @@ libgncmod_app_utils_python_la_LIBADD = \
   libgncmod-app-utils.la
 endif
 
-gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
+gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash
-gncmod_DATA = app-utils.scm 
+gncscmmod_DATA = \
+  gettext.scm \
+  app-utils.scm
 
-gncscmdir = ${GNC_SHAREDIR}/scm
+gncscmdir = ${GNC_SCM_INSTALL_DIR}
 gncscm_DATA = \
   business-options.scm \
   business-prefs.scm \
@@ -168,7 +170,7 @@ noinst_HEADERS = \
 EXTRA_DIST = \
   swig-app-utils-python.c \
   app-utils.i \
-  ${gncmod_DATA} \
+  ${gncscmmod_DATA} \
   ${gncscm_DATA} \
   ${prefsmigration_DATA}
 
@@ -182,7 +184,7 @@ endif
 if GNUCASH_SEPARATE_BUILDDIR
 #For executing test cases
 SCM_FILE_LINKS = \
-  ${gncmod_DATA} \
+  ${gncscmmod_DATA} \
   ${gncscm_DATA}
 endif
 
@@ -194,12 +196,37 @@ 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
 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 $(pkglib_LTLIBRARIES)
+	GNC_UNINSTALLED=yes \
+	GNC_BUILDDIR=${top_builddir} \
+	$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
+	$(GUILD) compile -o $@ $<
+
+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@
+gncscmcache_DATA = $(gncscm_DATA:.scm=.go)
+endif
+
 clean-local:
 	rm -rf gnucash
 

src/app-utils/app-utils.scm

@@ -16,11 +16,17 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 
 (define-module (gnucash app-utils))
+(cond-expand
+  (guile-2
+    (eval-when
+      (compile load eval expand)
+      (load-extension "libgncmod-app-utils" "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.
 (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 +37,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,34 +290,13 @@
 (define gnc:*kvp-option-path* (list KVP-OPTION-PATH))
 (export gnc:*kvp-option-path*)
 
-;; gettext functions
+(load-from-path "c-interface")
-(define gnc:gettext gnc-gettext-helper)
+(load-from-path "config-var")
-(define _ gnc:gettext)
+(load-from-path "options")
-(define-syntax N_
+(load-from-path "hooks")
-  (syntax-rules ()
+(load-from-path "prefs")
-    ((_ x) x)))
+(load-from-path "date-utilities")
-
+(load-from-path "simple-obj")
-(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.scm")
-(load-from-path "config-var.scm")
-(load-from-path "options.scm")
-(load-from-path "hooks.scm")
-(load-from-path "prefs.scm")
-(load-from-path "date-utilities.scm")
-(load-from-path "simple-obj.scm")
 
 ;; Business options
 (define gnc:*business-label* (N_ "Business"))
@@ -343,5 +333,5 @@
 
 (export gnc:*option-section-budgeting* gnc:*option-name-default-budget*)
 
-(load-from-path "business-options.scm")
+(load-from-path "business-options")
-(load-from-path "business-prefs.scm")
+(load-from-path "business-prefs")

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@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

src/app-utils/date-utilities.scm

@@ -21,7 +21,8 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 
 (use-modules (gnucash core-utils)
-             (gnucash printf))
+             (gnucash printf)
+             (gnucash gettext))
 
 (define gnc:reldate-list '())
 

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@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" "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_)

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)

src/app-utils/test/Makefile.am

@@ -37,7 +37,7 @@ TESTS_ENVIRONMENT = \
   GUILE_WARN_DEPRECATED=no \
   GUILE="${GUILE}" \
   SRCDIR=${srcdir} \
-  GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
+  GNC_BUILDDIR="${abs_top_builddir}" \
   $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
 
 LDADD = \

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")

src/backend/xml/test/Makefile.am

@@ -216,7 +216,7 @@ TESTS_ENVIRONMENT = \
   GNC_ACCOUNT_PATH=${top_srcdir}/accounts/C \
   GNC_TEST_FILES=test-files/xml2 \
   SRCDIR=${srcdir} \
-  GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
+  GNC_BUILDDIR="${abs_top_builddir}" \
   $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
 
 check_LTLIBRARIES = libgnc-test-file-stuff.la

src/bin/Makefile.am

@@ -77,7 +77,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

src/bin/environment.in

@@ -49,7 +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_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}

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' \

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}"

src/business/business-gnome/Makefile.am

@@ -83,21 +83,16 @@ libgncmod_business_gnome_la_LIBADD = \
   ${GLIB_LIBS} \
   ${EFENCE_LIBS}
 
-# For Business Reports
+gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash
-gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/
+gncscmmod_DATA = business-gnome.scm
-gncscmmod_DATA =
-
-gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
-gncmod_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,12 +103,43 @@ 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
 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 $(pkglib_LTLIBRARIES)
+	GNC_UNINSTALLED=yes \
+	GNC_BUILDDIR=${top_builddir} \
+	$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
+	$(GUILD) compile -o $@ $<
+
+gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
+gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
+endif
+
 noinst_DATA = .scm-links
 clean-local:
 	rm -rf gnucash

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
+gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash
-gncmod_DATA = core-utils.scm
+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,22 +106,36 @@ 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
 endif
 
+if GNC_HAVE_GUILE_2
+GUILE_COMPILE_ENV = \
+  --library-dir    ${top_builddir}/src/core-utils
+
+%.go : %.scm .scm-links $(lib_LTLIBRARIES)
+	GNC_UNINSTALLED=yes \
+	GNC_BUILDDIR=${top_builddir} \
+	$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV})  \
+	$(GUILD) compile -o $@ $<
+
+gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/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 = $(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
 
 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

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()

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);

src/engine/Makefile.am

@@ -145,11 +145,11 @@ libgncmod_engine_la_LIBADD = \
   ${GLIB_LIBS} \
   ${top_builddir}/lib/libc/libc-missing.la
 
-gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
+gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash
-gncmod_DATA = engine.scm \
+gncscmmod_DATA = engine.scm \
   business-core.scm
 
-gncscmdir = ${GNC_SHAREDIR}/scm
+gncscmdir = ${GNC_SCM_INSTALL_DIR}
 gncscm_DATA = \
   commodity-table.scm \
   engine-interface.scm \
@@ -166,7 +166,7 @@ EXTRA_DIST = \
   SX-book-p.h \
   engine.i \
   business-core.i \
-  ${gncmod_DATA} \
+  ${gncscmmod_DATA} \
   ${gncscm_DATA}
 
 if GNUCASH_SEPARATE_BUILDDIR
@@ -174,7 +174,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
 
@@ -186,12 +186,31 @@ 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
 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 $(pkglib_LTLIBRARIES)
+	GNC_UNINSTALLED=yes \
+	GNC_BUILDDIR=${top_builddir} \
+	$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
+	$(GUILD) compile -o $@ $<
+
+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@
+gncscmcache_DATA = $(gncscm_DATA:.scm=.go)
+endif
+
 noinst_DATA = .scm-links
 
 if BUILDING_FROM_SCM

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" "scm_init_sw_engine_module")))
+  (else ))
 (use-modules (sw_engine))
 
 (export GNC-RND-FLOOR)
@@ -94,7 +100,7 @@
 (export trans-splits)
 (export gnc:transaction-scm-onto-transaction)
 
-(load-from-path "gnc-numeric.scm")
+(load-from-path "gnc-numeric")
-(load-from-path "commodity-table.scm")
+(load-from-path "commodity-table")
-(load-from-path "engine-interface.scm")
+(load-from-path "engine-interface")
-(load-from-path "engine-utilities.scm")
+(load-from-path "engine-utilities")

src/engine/gnc-budget.c

@@ -583,7 +583,8 @@ gnc_budget_get_account_period_value(const GncBudget *budget, const Account *acco
 Timespec
 gnc_budget_get_period_start_date(const GncBudget *budget, guint period_num)
 {
-    Timespec ts;
+    Timespec ts = {0, 0};
+    g_return_val_if_fail (GNC_IS_BUDGET(budget), ts);
     timespecFromTime64(
         &ts, recurrenceGetPeriodTime(&GET_PRIVATE(budget)->recurrence,
                                      period_num, FALSE));
@@ -593,7 +594,8 @@ gnc_budget_get_period_start_date(const GncBudget *budget, guint period_num)
 Timespec
 gnc_budget_get_period_end_date(const GncBudget *budget, guint period_num)
 {
-    Timespec ts;
+    Timespec ts = {0, 0};
+    g_return_val_if_fail (GNC_IS_BUDGET(budget), ts);
     timespecFromTime64(
         &ts,  recurrenceGetPeriodTime(&GET_PRIVATE(budget)->recurrence, period_num, TRUE));
     return ts;

src/engine/test/Makefile.am

@@ -69,7 +69,7 @@ TESTS_ENVIRONMENT = \
   GUILE_WARN_DEPRECATED=no \
   GUILE="${GUILE}" \
   SRCDIR=${srcdir} \
-  GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
+  GNC_BUILDDIR="${abs_top_builddir}" \
   $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
 
 check_PROGRAMS = ${TEST_GROUP_1} ${TEST_GROUP_2}

src/gnc-module/Makefile.am

@@ -19,8 +19,8 @@ libgnc_module_la_LIBADD = \
   ${GLIB_LIBS} \
   ${GUILE_LIBS}
 
-gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
+gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash
-gncmod_DATA = gnc-module.scm
+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,12 +59,26 @@ 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
 endif
 
+if GNC_HAVE_GUILE_2
+GUILE_COMPILE_ENV = \
+  --library-dir    ${top_builddir}/src/gnc-module
+
+%.go : %.scm .scm-links $(lib_LTLIBRARIES)
+	GNC_UNINSTALLED=yes \
+	GNC_BUILDDIR=${top_builddir} \
+	$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
+	$(GUILD) compile -o $@ $<
+
+gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
+gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
+endif
+
 clean-local:
 	rm -rf gnucash
 

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.
@@ -103,6 +107,10 @@ exec @GUILE@ -s $0 "$@"
  (adapt-dirsep
   (get-dir-adder "GUILE_LOAD_PATH" guile-load-dirs "" path-sep-str)))
 
+(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)))
@@ -120,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?

src/gnome-utils/Makefile.am

@@ -239,24 +239,24 @@ endif
 endif
 endif
 
-gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
+gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash
-gncmod_DATA = gnome-utils.scm 
+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,12 +268,34 @@ 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
 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 $(pkglib_LTLIBRARIES)
+	GNC_UNINSTALLED=yes \
+	GNC_BUILDDIR=${top_builddir} \
+	$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
+	$(GUILD) compile -o $@ $<
+
+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@
+gncscmcache_DATA = $(gncscm_DATA:.scm=.go)
+endif
+
 noinst_DATA = .scm-links
 clean-local:
 	rm -rf gnucash

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" "scm_init_sw_gnome_utils_module")))
+  (else ))
 (use-modules (sw_gnome_utils))
 (gnc:module-load "gnucash/app-utils" 0)
 
@@ -19,7 +25,7 @@
 
 (export gnc:kvp-option-dialog)
 
-(load-from-path "gnc-menu-extensions.scm")
+(load-from-path "gnc-menu-extensions")
 
 (define (gnc:kvp-option-dialog id-type slots title changed_cb)
   (let* ((options (gnc-make-kvp-options id-type))

src/gnome-utils/test/Makefile.am

@@ -30,7 +30,7 @@ TESTS_ENVIRONMENT = \
   GUILE_WARN_DEPRECATED=no \
   GUILE="${GUILE}" \
   SRCDIR=${srcdir} \
-  GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
+  GNC_BUILDDIR="${abs_top_builddir}" \
   $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
 
 check_PROGRAMS = \

src/gnome/dialog-sx-since-last-run.c

@@ -537,7 +537,7 @@ gsslrtma_populate_tree_store(GncSxSlrTreeModelAdapter *model)
                                            SLR_MODEL_COL_VARAIBLE_VALUE, tmp_str->str,
                                            SLR_MODEL_COL_INSTANCE_VISIBILITY, FALSE,
                                            SLR_MODEL_COL_VARIABLE_VISIBILITY, TRUE,
-                                           SLR_MODEL_COL_INSTANCE_STATE_SENSITIVITY, FALSE
+                                           SLR_MODEL_COL_INSTANCE_STATE_SENSITIVITY, FALSE,
                                            -1);
                         g_string_free(tmp_str, TRUE);
                     }

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
@@ -99,6 +99,28 @@ 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 $(pkglib_LTLIBRARIES)
+	GNC_UNINSTALLED=yes \
+	GNC_BUILDDIR=${top_builddir} \
+	$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
+	$(GUILD) compile -o $@ $<
+
+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
+gncscmcache_DATA = $(gncscm_DATA:.scm=.go)
+endif
+
 clean-local:
 	$(RM) -rf gnucash qif-import
 

src/import-export/qif-imp/assistant-qif-import.c

@@ -1309,8 +1309,17 @@ void
 gnc_ui_qif_import_cancel_cb(GtkAssistant *gtkassistant, gpointer user_data)
 {
     QIFImportWindow  *wind = user_data;
+    gint currentpage = gtk_assistant_get_current_page(gtkassistant);
+    GtkWidget *mypage = gtk_assistant_get_nth_page (gtkassistant, currentpage);
+    const char *pagename = gtk_buildable_get_name(GTK_BUILDABLE(mypage));
 
-    if (wind->busy)
+    if (!g_strcmp0 (pagename, "summary_page"))
+    {
+        /* Hitting the window close button on the summary page should not
+           invoke a cancel action. The import has finised at that point. */
+        gnc_ui_qif_import_close_cb(gtkassistant, user_data);
+    }
+    else if (wind->busy)
     {
         /* Cancel any long-running Scheme operation. */
         scm_c_eval_string("(qif-import:cancel)");

src/import-export/qif-imp/qif-import.scm

@@ -31,14 +31,14 @@
 (gnc:module-load "gnucash/app-utils" 0)
 (gnc:module-load "gnucash/gnome-utils" 0)
 
-(load-from-path "qif-import/qif-objects.scm")      ;; class definitions
+(load-from-path "qif-import/qif-objects")      ;; class definitions
-(load-from-path "qif-import/qif-parse.scm")        ;; string-to-value
+(load-from-path "qif-import/qif-parse")        ;; string-to-value
-(load-from-path "qif-import/qif-utils.scm")
+(load-from-path "qif-import/qif-utils")
-(load-from-path "qif-import/qif-file.scm")         ;; actual file reading
+(load-from-path "qif-import/qif-file")         ;; actual file reading
-(load-from-path "qif-import/qif-dialog-utils.scm") ;; build displays
+(load-from-path "qif-import/qif-dialog-utils") ;; build displays
-(load-from-path "qif-import/qif-guess-map.scm")    ;; build acct mappings
+(load-from-path "qif-import/qif-guess-map")    ;; build acct mappings
-(load-from-path "qif-import/qif-to-gnc.scm")       ;; conv QIF xtns to GNC
+(load-from-path "qif-import/qif-to-gnc")       ;; conv QIF xtns to GNC
-(load-from-path "qif-import/qif-merge-groups.scm") ;; merge into user's acct
+(load-from-path "qif-import/qif-merge-groups") ;; merge into user's acct
 
 (export make-qif-file)
 (export make-ticker-map)

src/import-export/test/Makefile.am

@@ -47,7 +47,7 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
 
 TESTS_ENVIRONMENT = \
   GUILE_WARN_DEPRECATED=no \
-  GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
+  GNC_BUILDDIR="${abs_top_builddir}" \
   $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
 
 check_PROGRAMS = \

src/optional/python-bindings/tests/Makefile.am

@@ -15,7 +15,7 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
   --library-dir    ${top_builddir}/src/test-core
   
 TESTS_ENVIRONMENT = \
-  GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
+  GNC_BUILDDIR="${abs_top_builddir}" \
   PYTHON=${PYTHON} \
   PYTHONPATH=$$PYTHONPATH:$(top_builddir)/src/optional/python-bindings \
   PYTHONPATH=$$PYTHONPATH:$(top_builddir)/src/optional/python-bindings/.libs \

src/report/business-reports/Makefile.am

@@ -1,24 +1,31 @@
-gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report
+gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/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_SCM_INSTALL_DIR}/gnucash/report
+gncscmtpl_DATA = \
+   taxinvoice.eguile.scm \
+   taxinvoice.css \
    balsheet-eg.css \
-   balsheet-eg.eguile.scm \
+   balsheet-eg.eguile.scm
-   balsheet-eg.scm
 
 if GNUCASH_SEPARATE_BUILDDIR
-SCM_FILE_LINKS = ${gncscmmod_DATA}
+SCM_FILE_LINKS = ${gncscmmod_DATA} \
+  ${gncscmtpl_DATA}
 endif
 
 .scm-links:
@@ -36,13 +43,44 @@ 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/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/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 $(pkglib_LTLIBRARIES)
+	GNC_UNINSTALLED=yes \
+	GNC_BUILDDIR=${top_builddir} \
+	$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
+	$(GUILD) compile -o $@ $<
+
+gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/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}

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)
 

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))
 

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)
+	gnc:payables-report-create gnc:receivables-report-create
-(re-export gnc:owner-report-create)
+	gnc:owner-report-create)

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))
 

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))
 

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))
 

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))
 

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))
 

src/report/business-reports/owner-report.scm

@@ -30,10 +30,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))
 
@@ -922,13 +921,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)
@@ -949,4 +941,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)

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))

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))

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)
 

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
+gncscmrptdir = ${GNC_SCM_INSTALL_DIR}/gnucash/report/locale-specific
-gncscmmod_DATA = us.scm de_DE.scm
+gncscmrpt_DATA = us.scm de_DE.scm
 
-gncscmothermoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/
+gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/report/
-gncscmothermod_DATA = taxtxf.scm taxtxf-de_DE.scm
+gncscmmod_DATA = taxtxf.scm taxtxf-de_DE.scm
 
 if GNUCASH_SEPARATE_BUILDDIR
 #For executing test cases
 SCM_FILE_LINKS = \
-  ${gncscmmod_DATA} \
+  ${gncscmrpt_DATA} \
-  ${gncscmothermod_DATA}
+  ${gncscmmod_DATA}
 endif
 
 .scm-links:
@@ -44,21 +44,55 @@ 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/locale-specific; for A in $(gncscmrpt_DATA) ; do $(LN_S) -f ../../../$$A . ; done )
-	( cd gnucash/report; for A in $(gncscmothermod_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
 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 $(pkglib_LTLIBRARIES)
+	GNC_UNINSTALLED=yes \
+	GNC_BUILDDIR=${top_builddir} \
+	$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
+	$(GUILD) compile -o $@ $<
+
+gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
+gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
+
+gncscmrptcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report/locale-specific
+gncscmrptcache_DATA = $(gncscmrpt_DATA:.scm=.go)
+endif
+
 clean-local:
 	$(RM) -rf gnucash
 
 noinst_DATA = .scm-links
 
 EXTRA_DIST = \
-  ${gncscmothermod_DATA} \
+  ${gncscmmod_DATA} \
-  ${gncscmmod_DATA} 
+  ${gncscmrpt_DATA}
 
 CLEANFILES = .scm-links
 DISTCLEANFILES = ${SCM_FILE_LINKS}

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)

src/report/locale-specific/us/taxtxf.scm

@@ -76,6 +76,14 @@
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (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" "scm_init_sw_gnome_utils_module")))
+  (else ))
 (use-modules (sw_gnome_utils)) ;; to get to gnc-error-dialog
 
 (use-modules (gnucash printf))

src/report/report-gnome/Makefile.am

@@ -62,8 +62,8 @@ endif
 endif
 endif
 
-gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report
+gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash/report
-gncmod_DATA = report-gnome.scm
+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,12 +98,38 @@ 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
 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 $(pkglib_LTLIBRARIES)
+	GNC_UNINSTALLED=yes \
+	GNC_BUILDDIR=${top_builddir} \
+	$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
+	$(GUILD) compile -o $@ $<
+
+gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
+gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
+endif
+
 clean-local:
 	rm -rf gnucash
 

src/report/report-gnome/report-gnome.scm

@@ -9,9 +9,17 @@
 (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))
 
+(cond-expand
+  (guile-2
+    (eval-when
+      (compile load eval expand)
+      (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))
 
 (gnc:module-load "gnucash/gnome-utils" 0)

src/report/report-gnome/test/Makefile.am

@@ -52,7 +52,7 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \
 TESTS_ENVIRONMENT = \
   GUILE_WARN_DEPRECATED=no \
   GUILE="${GUILE}" \
-  GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
+  GNC_BUILDDIR="${abs_top_builddir}" \
   $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
 
 

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,17 +67,14 @@ gncscm_DATA = \
      report-utilities.scm \
      report.scm
 
-gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report-system
+gncmodscmdir = ${GNC_SCM_INSTALL_DIR}/gnucash/report/report-system
-
-gncmodscmdir = ${GNC_SHAREDIR}/guile-modules/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 \
@@ -110,6 +107,40 @@ 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 $(pkglib_LTLIBRARIES)
+	GNC_UNINSTALLED=yes \
+	GNC_BUILDDIR=${top_builddir} \
+	$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
+	$(GUILD) compile -o $@ $<
+
+gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
+gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
+
+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@
+gncscmcache_DATA = $(gncscm_DATA:.scm=.go)
+endif
+
 noinst_DATA = .scm-links
 
 EXTRA_DIST = report-system.i ${gncscmmod_DATA} ${gncscm_DATA} ${gncmodscm_DATA}

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

src/report/report-system/eguile-utilities.scm

@@ -32,9 +32,11 @@
 (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))
+; Syncase is deprecated and redundant in guile 2
-(use-modules (gnucash report business-reports))
+(cond-expand
-(use-modules (ice-9 syncase)) ; for define-syntax
+  (guile-2 )
+  (else
+    (use-modules (ice-9 syncase)))) ; for define-syntax
 
 
 ;(use-modules (srfi srfi-13)) ; for extra string functions

src/report/report-system/html-barchart.scm

@@ -21,7 +21,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(load-from-path "html-jqplot.scm")
+(load-from-path "html-jqplot")
 
 (define <html-barchart>
   (make-record-type "<html-barchart>"
@@ -359,12 +359,12 @@
                          (push "var d")
                          (push series-index)
                          (push " = [];\n")))
-         (series-data-add (lambda (series-index date y)
+         (series-data-add (lambda (series-index x y)
                          (push (string-append
                                "  d"
                                (number->string series-index)
                                ".push(["
-                               "\"" date "\""
+                               (number->string x)
                                ", "
                                (number->string y)
                                "]);\n"))))
@@ -386,7 +386,7 @@
             (push (gnc:html-js-include "jqplot/jquery.jqplot.js"))
             (push (gnc:html-js-include "jqplot/jqplot.barRenderer.js"))
             (push (gnc:html-js-include "jqplot/jqplot.cursor.js"))
-            (push (gnc:html-js-include "jqplot/jqplot.dateAxisRenderer.js"))
+            (push (gnc:html-js-include "jqplot/jqplot.categoryAxisRenderer.js"))
             (push (gnc:html-js-include "jqplot/jqplot.highlighter.js"))
             (push (gnc:html-js-include "jqplot/jqplot.canvasTextRenderer.js"))
             (push (gnc:html-js-include "jqplot/jqplot.canvasAxisTickRenderer.js"))
@@ -406,15 +406,15 @@
             (if (and data (list? data))
               (let ((rows (length data))
                     (cols 0))
-                (let loop ((col 0) (rowcnt 0))
+                (let loop ((col 0) (rowcnt 1))
                   (series-data-start col)
                   (if (list? (car data))
                       (begin 
                         (set! cols (length (car data)))))    
                   (for-each
                     (lambda (row)
-                      (if (< rowcnt rows)
+                      (if (<= rowcnt rows)
-                        (series-data-add col (list-ref (gnc:html-barchart-row-labels barchart) rowcnt)
+                        (series-data-add col rowcnt
                                        (ensure-numeric (list-ref-safe row col)))
                       )
                       (set! rowcnt (+ rowcnt 1)))
@@ -445,7 +445,7 @@
                    },
                    axes: {
                        xaxis: {
-                           renderer:$.jqplot.DateAxisRenderer,
+                           renderer:$.jqplot.CategoryAxisRenderer,
                            tickRenderer: $.jqplot.CanvasAxisTickRenderer,
                            tickOptions: {
                                angle: -30,
@@ -456,10 +456,14 @@
                            autoscale: true,
                        },
                    },
+                   highlighter: {
+                       tooltipContentEditor: formatTooltip,
+                   },
                    cursor:{
                        show: true,
-                       zoom: true
+                       showTooltip: false,
-                   }
+                       zoom: true,
+                   },
                 };\n")
 
             (push "  options.stackSeries = ")
@@ -489,9 +493,18 @@
                 (push "  options.axes.yaxis.label = \"")
                 (push y-label)
                 (push "\";\n")))
+            (if (and (string? row-labels) (> (string-length row-labels) 0))
+              (begin 
+                (push "  options.axes.xaxis.ticks = [")
+                (for-each (lambda (val)
+                        (push "\"")
+                        (push val)
+                        (push "\","))
+                    (gnc:html-barchart-row-labels barchart))
+                (push "];\n")))
 
 
-            (push "$.jqplot.config.enablePlugins = true;")
+            (push "$.jqplot.config.enablePlugins = true;\n")
             (push "var plot = $.jqplot('")(push chart-id)(push"', data, options);
 
   function formatTooltip(str, seriesIndex, pointIndex) {
@@ -500,7 +513,7 @@
       else
           x = pointIndex;
       y = data[seriesIndex][pointIndex][1].toFixed(2);
-      return options.series[seriesIndex].label + ' ' + x + '<br><b>' + y + '</b>';
+      return options.series[seriesIndex].label + '<br/>' + x + '<br/><b>' + y + '</b>';
   }\n") 
 
             (push "});\n</script>")

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/scm/gnucash/report/taxinvoice.eguile.scm:<html>
-                ;;./share/gnucash/guile-modules/gnucash/report/balsheet-eg.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\">")

src/report/report-system/html-fonts.scm

@@ -6,6 +6,8 @@
 ;;  Copyright (c) Phil Longstaff <plongstaff@rogers.com>
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(use-modules (gnucash gettext))
+
 ;; Converts a font name to css style information
 (define (font-name-to-style-info font-name)
     (let*

src/report/report-system/html-piechart.scm

@@ -21,7 +21,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(load-from-path "html-jqplot.scm")
+(load-from-path "html-jqplot")
 
 (define <html-piechart>
   (make-record-type "<html-piechart>"

src/report/report-system/html-scatter.scm

@@ -24,7 +24,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(load-from-path "html-jqplot.scm")
+(load-from-path "html-jqplot")
 
 (define <html-scatter>
   (make-record-type "<html-scatter>"

src/report/report-system/html-style-sheet.scm

@@ -21,6 +21,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(use-modules (gnucash gettext))
 
 (define *gnc:_style-sheet-templates_* (make-hash-table 23))
 (define *gnc:_style-sheets_* (make-hash-table 23))

src/report/report-system/options-utilities.scm

@@ -21,6 +21,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@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.

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>)
@@ -700,22 +702,22 @@
 (export gnc:get-assoc-account-balances-total)
 (export make-file-url)
 
-(load-from-path "commodity-utilities.scm")
+(load-from-path "commodity-utilities")
-(load-from-path "html-barchart.scm")
+(load-from-path "html-barchart")
-(load-from-path "html-document.scm")
+(load-from-path "html-document")
-(load-from-path "html-piechart.scm")
+(load-from-path "html-piechart")
-(load-from-path "html-scatter.scm")
+(load-from-path "html-scatter")
-(load-from-path "html-linechart.scm")
+(load-from-path "html-linechart")
-(load-from-path "html-style-info.scm")
+(load-from-path "html-style-info")
-(load-from-path "html-fonts.scm")
+(load-from-path "html-fonts")
 
-(load-from-path "html-style-sheet.scm")
+(load-from-path "html-style-sheet")
-(load-from-path "html-table.scm")
+(load-from-path "html-table")
-(load-from-path "html-text.scm")
+(load-from-path "html-text")
-(load-from-path "html-acct-table.scm")
+(load-from-path "html-acct-table")
-(load-from-path "html-utilities.scm")
+(load-from-path "html-utilities")
-(load-from-path "options-utilities.scm")
+(load-from-path "options-utilities")
-(load-from-path "report-utilities.scm")
+(load-from-path "report-utilities")
-(load-from-path "report.scm")
+(load-from-path "report")
 
 (gnc-hook-add-scm-dangler HOOK-SAVE-OPTIONS gnc:save-style-sheet-options)

src/report/report-system/report.scm

@@ -22,6 +22,13 @@
 
 (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" "scm_init_sw_report_system_module")))
+  (else ))
 (use-modules (sw_report_system))
 
 ;; Terminology in this file:
@@ -66,6 +73,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

src/report/report-system/test/Makefile.am

@@ -57,7 +57,7 @@ $(SCM_TESTS): %: $(srcdir)/%.scm Makefile .scm-links
 TESTS_ENVIRONMENT = \
   GUILE_WARN_DEPRECATED=no \
   GUILE="${GUILE}" \
-  GNC_BUILDDIR=`\cd ${top_builddir} && pwd` \
+  GNC_BUILDDIR="${abs_top_builddir}" \
   $(shell ${top_builddir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
 
 

src/report/standard-reports/Makefile.am

@@ -18,12 +18,12 @@ 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
 
-gncscmreportmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/standard-reports
+gncscmrptdir = ${GNC_SCM_INSTALL_DIR}/gnucash/report/standard-reports
-gncscmreportmod_DATA = \
+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,18 +68,50 @@ 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
 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 $(pkglib_LTLIBRARIES)
+	GNC_UNINSTALLED=yes \
+	GNC_BUILDDIR=${top_builddir} \
+	$(shell ${top_builddir}/src/gnc-test-env --no-exports ${GUILE_COMPILE_ENV}) \
+	$(GUILD) compile -o $@ $<
+
+gncscmmodcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report
+gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
+
+gncscmrptcachedir = ${GNC_SCM_INSTALL_DIR}/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash/report/standard-reports
+gncscmrptcache_DATA = $(gncscmrpt_DATA:.scm=.go)
+endif
+
 clean-local:
 	$(RM) -rf gnucash
 
 noinst_DATA = .scm-links
 
-EXTRA_DIST = ${gncscmmod_DATA} ${gncscmreportmod_DATA}
+EXTRA_DIST = ${gncscmmod_DATA} ${gncscmrpt_DATA}
 
 CLEANFILES = .scm-links ${SCM_FILE_LINKS}
 DISTCLEANFILES =

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))
 

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)
 

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))
 

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"))

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)
 

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)
 

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))
 
@@ -36,7 +37,7 @@
 
 ;; included since Bug726449
 (use-modules (ice-9 regex)) ;; for regexp-substitute/global, used by jpqplot
-(load-from-path "html-jqplot.scm") ;; for jqplot-escape-string
+(load-from-path "html-jqplot") ;; for jqplot-escape-string
 
 (define reportname (N_ "Budget Chart"))
 

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))
 

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)
 

src/report/standard-reports/budget.scm

@@ -29,6 +29,7 @@
 
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (gnucash gnc-module))
+(use-modules (gnucash gettext))
 
 (use-modules (gnucash printf))
 

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))
 

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))
 
@@ -37,7 +38,7 @@
 
 ;; included since Bug726449
 (use-modules (ice-9 regex)) ;; for regexp-substitute/global, used by jpqplot
-(load-from-path "html-jqplot.scm") ;; for jqplot-escape-string
+(load-from-path "html-jqplot") ;; for jqplot-escape-string
 
 ;; The option names are defined here to 1. save typing and 2. avoid
 ;; spelling errors. The *reportnames* are defined here (and not only

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))
 

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))
 

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)
 

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)
 

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)
 

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))
@@ -39,7 +40,7 @@
 
 ;; included since Bug726449
 (use-modules (ice-9 regex)) ;; for regexp-substitute/global, used by jpqplot
-(load-from-path "html-jqplot.scm") ;; for jqplot-escape-string
+(load-from-path "html-jqplot") ;; for jqplot-escape-string
 
 (define reportname (N_ "Income/Expense Chart"))
 

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))