r18253 - gnucash/trunk/src - Reports are now automatically picked up at startup time. Each file in the directory
Phil Longstaff
plongstaff at code.gnucash.org
Sat Aug 15 20:50:33 EDT 2009
Author: plongstaff
Date: 2009-08-15 20:50:33 -0400 (Sat, 15 Aug 2009)
New Revision: 18253
Trac: http://svn.gnucash.org/trac/changeset/18253
Modified:
gnucash/trunk/src/bin/Makefile.am
gnucash/trunk/src/bin/gnucash-setup-env-osx.in
gnucash/trunk/src/bin/gnucash-setup-env.in
gnucash/trunk/src/report/standard-reports/Makefile.am
gnucash/trunk/src/report/standard-reports/account-piecharts.scm
gnucash/trunk/src/report/standard-reports/account-summary.scm
gnucash/trunk/src/report/standard-reports/advanced-portfolio.scm
gnucash/trunk/src/report/standard-reports/average-balance.scm
gnucash/trunk/src/report/standard-reports/balance-sheet.scm
gnucash/trunk/src/report/standard-reports/budget-balance-sheet.scm
gnucash/trunk/src/report/standard-reports/budget-barchart.scm
gnucash/trunk/src/report/standard-reports/budget-flow.scm
gnucash/trunk/src/report/standard-reports/budget-income-statement.scm
gnucash/trunk/src/report/standard-reports/budget.scm
gnucash/trunk/src/report/standard-reports/cash-flow.scm
gnucash/trunk/src/report/standard-reports/category-barchart.scm
gnucash/trunk/src/report/standard-reports/daily-reports.scm
gnucash/trunk/src/report/standard-reports/equity-statement.scm
gnucash/trunk/src/report/standard-reports/general-journal.scm
gnucash/trunk/src/report/standard-reports/general-ledger.scm
gnucash/trunk/src/report/standard-reports/income-statement.scm
gnucash/trunk/src/report/standard-reports/net-barchart.scm
gnucash/trunk/src/report/standard-reports/portfolio.scm
gnucash/trunk/src/report/standard-reports/price-scatter.scm
gnucash/trunk/src/report/standard-reports/register.scm
gnucash/trunk/src/report/standard-reports/standard-reports.scm
gnucash/trunk/src/report/standard-reports/transaction.scm
gnucash/trunk/src/report/standard-reports/trial-balance.scm
Log:
Reports are now automatically picked up at startup time. Each file in the directory
share/gnucash/guile-modules/gnucash/report/standard-reports is assumed to be an SCM file which
defines a module which generates a report.
The business reports have not yet been converted. A new element 'standard-reports' needs to be
added to the module definition. I assume the business-reports.scm file sets up some resources
that the business reports use (e.g. the Business submenu under Reports).
Modified: gnucash/trunk/src/bin/Makefile.am
===================================================================
--- gnucash/trunk/src/bin/Makefile.am 2009-08-15 21:09:47 UTC (rev 18252)
+++ gnucash/trunk/src/bin/Makefile.am 2009-08-16 00:50:33 UTC (rev 18253)
@@ -59,6 +59,7 @@
sed < $< > $@.tmp \
-e 's#@-BIN_DIR-@#${bindir}#g' \
-e 's#@-GNC_DBD_DIR-@#${GNC_DBD_DIR}#g' \
+ -e 's#@-GNC_STANDARD_REPORTS_DIR-@#${GNC_SHAREDIR}/guile-modules/gnucash/report/standard-reports#g' \
-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}#' \
Modified: gnucash/trunk/src/bin/gnucash-setup-env-osx.in
===================================================================
--- gnucash/trunk/src/bin/gnucash-setup-env-osx.in 2009-08-15 21:09:47 UTC (rev 18252)
+++ gnucash/trunk/src/bin/gnucash-setup-env-osx.in 2009-08-16 00:50:33 UTC (rev 18253)
@@ -22,12 +22,14 @@
LD_LIBRARY_PATH="${EXTRA_LIBS}@-PATH_SEPARATOR-@${LD_LIBRARY_PATH}"
DYLD_LIBRARY_PATH="${EXTRA_LIBS}@-PATH_SEPARATOR-@${DYLD_LIBRARY_PATH}"
+GNC_STANDARD_REPORTS_DIR="@-GNC_STANDARD_REPORTS_DIR-@"
export GNC_MODULE_PATH
export GUILE_LOAD_PATH
export LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH
+export GNC_STANDARD_REPORTS_DIR
if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
eval `dbus-launch --sh-syntax --exit-with-session --config-file=@-PREFIX-@/etc/dbus-1/session.conf`
-fi
\ No newline at end of file
+fi
Modified: gnucash/trunk/src/bin/gnucash-setup-env.in
===================================================================
--- gnucash/trunk/src/bin/gnucash-setup-env.in 2009-08-15 21:09:47 UTC (rev 18252)
+++ gnucash/trunk/src/bin/gnucash-setup-env.in 2009-08-16 00:50:33 UTC (rev 18253)
@@ -21,9 +21,11 @@
LD_LIBRARY_PATH="${EXTRA_LIBS}@-PATH_SEPARATOR-@${LD_LIBRARY_PATH}"
DYLD_LIBRARY_PATH="${EXTRA_LIBS}@-PATH_SEPARATOR-@${DYLD_LIBRARY_PATH}"
GNC_DBD_DIR="@-GNC_DBD_DIR-@"
+GNC_STANDARD_REPORTS_DIR="@-GNC_STANDARD_REPORTS_DIR-@"
export GNC_MODULE_PATH
export GUILE_LOAD_PATH
export LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH
export GNC_DBD_DIR
+export GNC_STANDARD_REPORTS_DIR
Modified: gnucash/trunk/src/report/standard-reports/Makefile.am
===================================================================
--- gnucash/trunk/src/report/standard-reports/Makefile.am 2009-08-15 21:09:47 UTC (rev 18252)
+++ gnucash/trunk/src/report/standard-reports/Makefile.am 2009-08-16 00:50:33 UTC (rev 18253)
@@ -15,10 +15,15 @@
AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/gnc-module \
- ${GUILE_INCS} ${GLIB_CFLAGS}
+ ${GUILE_INCS} \
+ ${GLIB_CFLAGS}
gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/
gncscmmod_DATA = \
+ standard-reports.scm
+
+gncscmreportmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/standard-reports
+gncscmreportmod_DATA = \
account-piecharts.scm \
account-summary.scm \
advanced-portfolio.scm \
@@ -38,7 +43,6 @@
portfolio.scm \
price-scatter.scm \
register.scm \
- standard-reports.scm \
trial-balance.scm \
general-journal.scm \
general-ledger.scm \
@@ -69,7 +73,7 @@
noinst_DATA = .scm-links
-EXTRA_DIST = ${gncscmmod_DATA}
+EXTRA_DIST = ${gncscmmod_DATA} ${gncscmreportmod_DATA}
CLEANFILES = .scm-links
DISTCLEANFILES = ${SCM_FILE_LINKS}
Modified: gnucash/trunk/src/report/standard-reports/account-piecharts.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/account-piecharts.scm 2009-08-15 21:09:47 UTC (rev 18252)
+++ gnucash/trunk/src/report/standard-reports/account-piecharts.scm 2009-08-16 00:50:33 UTC (rev 18253)
@@ -23,7 +23,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report account-piecharts))
+(define-module (gnucash report standard-reports account-piecharts))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (srfi srfi-1))
Modified: gnucash/trunk/src/report/standard-reports/account-summary.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/account-summary.scm 2009-08-15 21:09:47 UTC (rev 18252)
+++ gnucash/trunk/src/report/standard-reports/account-summary.scm 2009-08-16 00:50:33 UTC (rev 18253)
@@ -48,7 +48,7 @@
;; Boston, MA 02110-1301, USA gnu at gnu.org
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report account-summary))
+(define-module (gnucash report standard-reports account-summary))
(use-modules (srfi srfi-1))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
Modified: gnucash/trunk/src/report/standard-reports/advanced-portfolio.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/advanced-portfolio.scm 2009-08-15 21:09:47 UTC (rev 18252)
+++ gnucash/trunk/src/report/standard-reports/advanced-portfolio.scm 2009-08-16 00:50:33 UTC (rev 18253)
@@ -25,7 +25,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report advanced-portfolio))
+(define-module (gnucash report standard-reports advanced-portfolio))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (srfi srfi-1))
Modified: gnucash/trunk/src/report/standard-reports/average-balance.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/average-balance.scm 2009-08-15 21:09:47 UTC (rev 18252)
+++ gnucash/trunk/src/report/standard-reports/average-balance.scm 2009-08-16 00:50:33 UTC (rev 18253)
@@ -7,7 +7,7 @@
;; or indirect losses incurred as a result of using this software.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report average-balance))
+(define-module (gnucash report standard-reports average-balance))
(use-modules (srfi srfi-1))
(use-modules (ice-9 slib))
Modified: gnucash/trunk/src/report/standard-reports/balance-sheet.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/balance-sheet.scm 2009-08-15 21:09:47 UTC (rev 18252)
+++ gnucash/trunk/src/report/standard-reports/balance-sheet.scm 2009-08-16 00:50:33 UTC (rev 18253)
@@ -62,7 +62,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report balance-sheet))
+(define-module (gnucash report standard-reports balance-sheet))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (ice-9 slib))
(use-modules (gnucash gnc-module))
Modified: gnucash/trunk/src/report/standard-reports/budget-balance-sheet.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/budget-balance-sheet.scm 2009-08-15 21:09:47 UTC (rev 18252)
+++ gnucash/trunk/src/report/standard-reports/budget-balance-sheet.scm 2009-08-16 00:50:33 UTC (rev 18253)
@@ -28,7 +28,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report budget-balance-sheet))
+(define-module (gnucash report standard-reports budget-balance-sheet))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (ice-9 slib))
(use-modules (gnucash gnc-module))
Modified: gnucash/trunk/src/report/standard-reports/budget-barchart.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/budget-barchart.scm 2009-08-15 21:09:47 UTC (rev 18252)
+++ gnucash/trunk/src/report/standard-reports/budget-barchart.scm 2009-08-16 00:50:33 UTC (rev 18253)
@@ -24,7 +24,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report budget-barchart))
+(define-module (gnucash report standard-reports budget-barchart))
(use-modules (srfi srfi-1))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
Modified: gnucash/trunk/src/report/standard-reports/budget-flow.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/budget-flow.scm 2009-08-15 21:09:47 UTC (rev 18252)
+++ gnucash/trunk/src/report/standard-reports/budget-flow.scm 2009-08-16 00:50:33 UTC (rev 18253)
@@ -25,7 +25,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report budget-flow))
+(define-module (gnucash report standard-reports budget-flow))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (ice-9 slib))
(use-modules (gnucash gnc-module))
Modified: gnucash/trunk/src/report/standard-reports/budget-income-statement.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/budget-income-statement.scm 2009-08-15 21:09:47 UTC (rev 18252)
+++ gnucash/trunk/src/report/standard-reports/budget-income-statement.scm 2009-08-16 00:50:33 UTC (rev 18253)
@@ -40,7 +40,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report budget-income-statement))
+(define-module (gnucash report standard-reports budget-income-statement))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (ice-9 slib))
(use-modules (gnucash gnc-module))
Modified: gnucash/trunk/src/report/standard-reports/budget.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/budget.scm 2009-08-15 21:09:47 UTC (rev 18252)
+++ gnucash/trunk/src/report/standard-reports/budget.scm 2009-08-16 00:50:33 UTC (rev 18253)
@@ -25,7 +25,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report budget))
+(define-module (gnucash report standard-reports budget))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (ice-9 slib))
(use-modules (gnucash gnc-module))
Modified: gnucash/trunk/src/report/standard-reports/cash-flow.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/cash-flow.scm 2009-08-15 21:09:47 UTC (rev 18252)
+++ gnucash/trunk/src/report/standard-reports/cash-flow.scm 2009-08-16 00:50:33 UTC (rev 18253)
@@ -27,7 +27,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report cash-flow))
+(define-module (gnucash report standard-reports cash-flow))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (ice-9 slib))
(use-modules (gnucash gnc-module))
Modified: gnucash/trunk/src/report/standard-reports/category-barchart.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/category-barchart.scm 2009-08-15 21:09:47 UTC (rev 18252)
+++ gnucash/trunk/src/report/standard-reports/category-barchart.scm 2009-08-16 00:50:33 UTC (rev 18253)
@@ -23,7 +23,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; depends must be outside module scope -- and should eventually go away.
-(define-module (gnucash report category-barchart))
+(define-module (gnucash report standard-reports category-barchart))
(use-modules (srfi srfi-1))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (ice-9 slib))
Modified: gnucash/trunk/src/report/standard-reports/daily-reports.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/daily-reports.scm 2009-08-15 21:09:47 UTC (rev 18252)
+++ gnucash/trunk/src/report/standard-reports/daily-reports.scm 2009-08-16 00:50:33 UTC (rev 18253)
@@ -26,7 +26,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report daily-reports))
+(define-module (gnucash report standard-reports daily-reports))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (srfi srfi-1))
Modified: gnucash/trunk/src/report/standard-reports/equity-statement.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/equity-statement.scm 2009-08-15 21:09:47 UTC (rev 18252)
+++ gnucash/trunk/src/report/standard-reports/equity-statement.scm 2009-08-16 00:50:33 UTC (rev 18253)
@@ -45,7 +45,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report equity-statement))
+(define-module (gnucash report standard-reports equity-statement))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (ice-9 slib))
(use-modules (gnucash gnc-module))
Modified: gnucash/trunk/src/report/standard-reports/general-journal.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/general-journal.scm 2009-08-15 21:09:47 UTC (rev 18252)
+++ gnucash/trunk/src/report/standard-reports/general-journal.scm 2009-08-16 00:50:33 UTC (rev 18253)
@@ -26,7 +26,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report general-journal))
+(define-module (gnucash report standard-reports general-journal))
(export gnc:make-general-journal-report)
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (ice-9 slib))
Modified: gnucash/trunk/src/report/standard-reports/general-ledger.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/general-ledger.scm 2009-08-15 21:09:47 UTC (rev 18252)
+++ gnucash/trunk/src/report/standard-reports/general-ledger.scm 2009-08-16 00:50:33 UTC (rev 18253)
@@ -29,7 +29,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report general-ledger))
+(define-module (gnucash report standard-reports general-ledger))
(export gnc:make-general-ledger-report)
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (ice-9 slib))
Modified: gnucash/trunk/src/report/standard-reports/income-statement.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/income-statement.scm 2009-08-15 21:09:47 UTC (rev 18252)
+++ gnucash/trunk/src/report/standard-reports/income-statement.scm 2009-08-16 00:50:33 UTC (rev 18253)
@@ -41,7 +41,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report income-statement))
+(define-module (gnucash report standard-reports income-statement))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (ice-9 slib))
(use-modules (gnucash gnc-module))
Modified: gnucash/trunk/src/report/standard-reports/net-barchart.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/net-barchart.scm 2009-08-15 21:09:47 UTC (rev 18252)
+++ gnucash/trunk/src/report/standard-reports/net-barchart.scm 2009-08-16 00:50:33 UTC (rev 18253)
@@ -24,7 +24,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report net-barchart))
+(define-module (gnucash report standard-reports net-barchart))
(use-modules (srfi srfi-1))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
Modified: gnucash/trunk/src/report/standard-reports/portfolio.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/portfolio.scm 2009-08-15 21:09:47 UTC (rev 18252)
+++ gnucash/trunk/src/report/standard-reports/portfolio.scm 2009-08-16 00:50:33 UTC (rev 18253)
@@ -21,7 +21,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report portfolio))
+(define-module (gnucash report standard-reports portfolio))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (srfi srfi-1))
Modified: gnucash/trunk/src/report/standard-reports/price-scatter.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/price-scatter.scm 2009-08-15 21:09:47 UTC (rev 18252)
+++ gnucash/trunk/src/report/standard-reports/price-scatter.scm 2009-08-16 00:50:33 UTC (rev 18253)
@@ -22,7 +22,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report price-scatter))
+(define-module (gnucash report standard-reports price-scatter))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (srfi srfi-1))
Modified: gnucash/trunk/src/report/standard-reports/register.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/register.scm 2009-08-15 21:09:47 UTC (rev 18252)
+++ gnucash/trunk/src/report/standard-reports/register.scm 2009-08-16 00:50:33 UTC (rev 18253)
@@ -1,7 +1,7 @@
;; -*-scheme-*-
;; register.scm
-(define-module (gnucash report register))
+(define-module (gnucash report standard-reports register))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (srfi srfi-1))
Modified: gnucash/trunk/src/report/standard-reports/standard-reports.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/standard-reports.scm 2009-08-15 21:09:47 UTC (rev 18252)
+++ gnucash/trunk/src/report/standard-reports/standard-reports.scm 2009-08-16 00:50:33 UTC (rev 18253)
@@ -7,6 +7,7 @@
(define-module (gnucash report standard-reports))
(use-modules (ice-9 slib))
+(use-modules (srfi srfi-13))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(export gnc:register-report-create)
@@ -65,30 +66,97 @@
(begin (gnc:debug "get-non-split...") (get-non-split type-info)))
#f)))
-(use-modules (gnucash report account-piecharts))
-(use-modules (gnucash report account-summary))
-(use-modules (gnucash report advanced-portfolio))
-(use-modules (gnucash report average-balance))
-(use-modules (gnucash report balance-sheet))
-(use-modules (gnucash report equity-statement))
-(use-modules (gnucash report general-journal))
-(use-modules (gnucash report general-ledger))
-(use-modules (gnucash report cash-flow))
-(use-modules (gnucash report budget))
-(use-modules (gnucash report budget-balance-sheet))
-(use-modules (gnucash report budget-barchart))
-(use-modules (gnucash report budget-flow))
-(use-modules (gnucash report budget-income-statement))
-(use-modules (gnucash report category-barchart))
-(use-modules (gnucash report daily-reports))
-(use-modules (gnucash report net-barchart))
-(use-modules (gnucash report income-statement))
-(use-modules (gnucash report portfolio))
-(use-modules (gnucash report price-scatter))
-(use-modules (gnucash report register))
-(use-modules (gnucash report trial-balance))
-(use-modules (gnucash report transaction))
+;(use-modules (gnucash report account-piecharts))
+;(use-modules (gnucash report account-summary))
+;(use-modules (gnucash report advanced-portfolio))
+;(use-modules (gnucash report average-balance))
+;(use-modules (gnucash report balance-sheet))
+;(use-modules (gnucash report equity-statement))
+;(use-modules (gnucash report general-journal))
+;(use-modules (gnucash report general-ledger))
+;(use-modules (gnucash report cash-flow))
+;(use-modules (gnucash report budget))
+;(use-modules (gnucash report budget-balance-sheet))
+;(use-modules (gnucash report budget-barchart))
+;(use-modules (gnucash report budget-flow))
+;(use-modules (gnucash report budget-income-statement))
+;(use-modules (gnucash report category-barchart))
+;(use-modules (gnucash report daily-reports))
+;(use-modules (gnucash report net-barchart))
+;(use-modules (gnucash report income-statement))
+;(use-modules (gnucash report portfolio))
+;(use-modules (gnucash report price-scatter))
+;(use-modules (gnucash report register))
+;(use-modules (gnucash report trial-balance))
+;(use-modules (gnucash report transaction))
+(define (directory-files dir)
+ (let ((dir-stream (opendir dir)))
+ (let loop ((new (readdir dir-stream))
+ (acc '())
+ )
+ (if (eof-object? new)
+ (begin
+ (closedir dir-stream)
+ acc
+ )
+ (loop (readdir dir-stream)
+ (if (or (string=? "." new) ;;; ignore
+ (string=? ".." new)) ;;; ignore
+ acc
+ (cons new acc)
+ )
+ )
+ )
+ )
+ )
+)
+
+(define (process-file-list l)
+ (map (lambda (s) (if (string-suffix? ".scm" s) (string-drop-right s 4) s))
+ l
+ )
+)
+
+(define (get-report-list)
+; (list
+; 'account-piecharts
+; 'account-summary
+; 'advanced-portfolio
+; 'average-balance
+; 'balance-sheet
+; 'equity-statement
+; 'general-journal
+; 'general-ledger
+; 'cash-flow
+; 'budget
+; 'budget-balance-sheet
+; 'budget-barchart
+; 'budget-flow
+; 'budget-income-statement
+; 'category-barchart
+; 'daily-reports
+; 'net-barchart
+; 'income-statement
+; 'portfolio
+; 'price-scatter
+; 'register
+; 'trial-balance
+; 'transaction
+; )
+ (map (lambda (s) (string->symbol s))
+ (process-file-list (directory-files (getenv "GNC_STANDARD_REPORTS_DIR")))
+ )
+)
+
+(gnc:debug "dir-files=" (directory-files (getenv "GNC_STANDARD_REPORTS_DIR")))
+(gnc:debug "processed=" (process-file-list (directory-files (getenv "GNC_STANDARD_REPORTS_DIR"))))
+(gnc:debug "report-list=" (get-report-list))
+
+(for-each
+ (lambda (x) (resolve-module (append '(gnucash report standard-reports) (list x))))
+ (get-report-list))
+
(use-modules (gnucash gnc-module))
(gnc:module-load "gnucash/engine" 0)
Modified: gnucash/trunk/src/report/standard-reports/transaction.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/transaction.scm 2009-08-15 21:09:47 UTC (rev 18252)
+++ gnucash/trunk/src/report/standard-reports/transaction.scm 2009-08-16 00:50:33 UTC (rev 18253)
@@ -29,7 +29,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report transaction))
+(define-module (gnucash report standard-reports transaction))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (srfi srfi-1))
Modified: gnucash/trunk/src/report/standard-reports/trial-balance.scm
===================================================================
--- gnucash/trunk/src/report/standard-reports/trial-balance.scm 2009-08-15 21:09:47 UTC (rev 18252)
+++ gnucash/trunk/src/report/standard-reports/trial-balance.scm 2009-08-16 00:50:33 UTC (rev 18253)
@@ -50,7 +50,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report trial-balance))
+(define-module (gnucash report standard-reports trial-balance))
(use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
(use-modules (ice-9 slib))
(use-modules (gnucash gnc-module))
More information about the gnucash-changes
mailing list