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

engine - move guile code to bindings/guile

Browse Source 
This commit tries to do the minimum necessary to move the guile bits from engine
to bindings/guile. As engine is a very central piece in the software, this unfortunately
still touches many other source files:

- A few helper objects have been squashed together:
  * engine-helpers-guile.[ch] (of which the c part is extracted from engine-helpers.c)
  * gncBusGuile.[ch]
  * gnc-hooks-scm.[ch]
- The initialization function of gncmod-engine no longer initializes the scm bits.
  Any scm code that wants to interact with the engine code now has to load
  the (gnucash engine) scm module, or sometimes (gnucash business-core).
  The bulk of changes in this commit actually is updating all the scm consumers to do so.
- scm-scm target has been removed. Instead (gnucash utilities) is part
  of scm-engine. A few dependency graphs have been updated for this.

More refinements will be in followup commits.
This commit is contained in:
Geert Janssens
2019-10-05 20:06:58 +02:00
parent b1ba16c33b
commit 1c7f835f47
125 changed files with 2123 additions and 2152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bindings/CMakeLists.txt
View File

@@ -1,5 +1,10 @@
add_subdirectory(guile)
add_subdirectory(python)
set_local_dist(bindings_DIST_local CMakeLists.txt core-utils.i)
set_local_dist(bindings_DIST_local
CMakeLists.txt
business-core.i
core-utils.i
engine.i
engine-common.i)
set(bindings_DIST ${bindings_DIST_local} ${guile_DIST} ${python_bindings_DIST} PARENT_SCOPE)

2
libgnucash/engine/business-core.i → bindings/business-core.i
View File

@@ -126,7 +126,7 @@ GLIST_HELPER_INOUT(OwnerList, SWIGTYPE_p__gncOwner);
%include <gncTaxTable.h>
%include <gncVendor.h>
#if defined(SWIGGUILE)
%include <gncBusGuile.h>
%include <engine-helpers-guile.h>
#endif
/* Import query bindings for the below invoice query functions (but
* don't generate bindings for them). */

0
libgnucash/engine/engine-common.i → bindings/engine-common.i
View File

2
libgnucash/engine/engine.i → bindings/engine.i
View File

@@ -33,7 +33,6 @@
#include "gnc-pricedb.h"
#include "gnc-lot.h"
#include "gnc-session.h"
#include "gnc-hooks-scm.h"
#include "engine-deprecated.h"
#include "engine-helpers.h"
#include "engine-helpers-guile.h"
@@ -53,7 +52,6 @@
#include "gncOwner.h"
#include "gncTaxTable.h"
#include "gncVendor.h"
#include "gncBusGuile.h"
%}
#if defined(SWIGGUILE)
%{

91
bindings/guile/CMakeLists.txt
View File

@@ -9,17 +9,35 @@ gnc_add_swig_guile_command (swig-core-utils-guile-c
${CORE_UTILS_HEADERS}
)
# Command to generate the swig-engine.c wrapper file
gnc_swig_extract_header_files (gncmod-engine ENGINE_HEADERS)
gnc_add_swig_guile_command (swig-engine-c
SWIG_ENGINE_C swig-engine.c
${CMAKE_SOURCE_DIR}/bindings/engine.i
"${CMAKE_CURRENT_SOURCE_DIR};${CMAKE_SOURCE_DIR}/libgnucash/engine"
${ENGINE_HEADERS}
${CMAKE_SOURCE_DIR}/bindings/business-core.i
${CMAKE_SOURCE_DIR}/bindings/engine-common.i
)
set(guile_HEADERS
gnc-guile-utils.h)
engine-helpers-guile.h
glib-helpers.h
gnc-guile-utils.h
kvp-scm.h)
set(guile_SOURCES
engine-helpers-guile.c
glib-helpers.c
gnc-guile-bindings.c
gnc-guile-utils.c)
gnc-guile-utils.c
kvp-scm.cpp)
add_library(gnucash-guile SHARED
${guile_SOURCES}
${guile_HEADERS}
${SWIG_CORE_UTILS_GUILE_C})
${SWIG_CORE_UTILS_GUILE_C}
${SWIG_ENGINE_C})
add_dependencies(gnucash-guile
swig-runtime-h)
@@ -38,6 +56,7 @@ target_link_libraries(gnucash-guile
${GUILE_LDFLAGS}
PRIVATE
gnc-core-utils
gncmod-engine
${GLIB2_LDFLAGS})
install(TARGETS gnucash-guile
@@ -48,20 +67,11 @@ install(TARGETS gnucash-guile
# Scheme
set(GUILE_DEPENDS scm-core-utils scm-gnc-module gncmod-engine)
gnc_add_scheme_targets(scm-scm
"utilities.scm"
gnucash
"${GUILE_DEPENDS}"
FALSE
)
# depends on main.scm
gnc_add_scheme_targets(price-quotes
price-quotes.scm
gnucash
"scm-scm;scm-app-utils"
"scm-engine;scm-app-utils"
FALSE)
set (core_utils_SCHEME core-utils.scm)
@@ -76,13 +86,64 @@ gnc_add_scheme_targets(scm-core-utils
FALSE
)
set (engine_SCHEME_0
commodity-table.scm
engine-utilities.scm
gnc-numeric.scm
)
set (engine_SCHEME_1
engine.scm
)
set (engine_SCHEME_2
business-core.scm
utilities.scm
)
set(BACKEND_DEPENDS gncmod-backend-xml)
if (WITH_SQL)
list(APPEND BACKEND_DEPENDS gncmod-backend-dbi)
endif(WITH_SQL)
set(GUILE_DEPENDS
${BACKEND_DEPENDS}
gncmod-engine
gnucash-guile)
gnc_add_scheme_targets(scm-engine-0
"${engine_SCHEME_0}"
"gnucash/engine"
"${GUILE_DEPENDS}"
TRUE
)
gnc_add_scheme_targets(scm-engine-1
"${engine_SCHEME_1}"
gnucash
"scm-engine-0;${GUILE_DEPENDS}"
FALSE
)
gnc_add_scheme_targets(scm-engine-2
"${engine_SCHEME_2}"
gnucash
"scm-engine-1;${GUILE_DEPENDS}"
FALSE
)
add_custom_target(scm-engine ALL DEPENDS scm-engine-2 scm-engine-1 scm-engine-0)
set_local_dist(guile_DIST_local
CMakeLists.txt
core-utils.scm
utilities.scm
price-quotes.scm
${guile_SOURCES}
${guile_HEADERS})
${guile_HEADERS}
${engine_SCHEME_0}
${engine_SCHEME_1}
${engine_SCHEME_2})
set(guile_DIST ${guile_DIST_local} ${test_guile_DIST} PARENT_SCOPE)

3
libgnucash/engine/business-core.scm → bindings/guile/business-core.scm
View File

@@ -18,9 +18,8 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash business-core))
(use-modules (gnucash gnc-module))
(use-modules (srfi srfi-1))
(gnc:module-load "gnucash/engine" 0)
(use-modules (gnucash engine))
(define (gnc:owner-get-address owner)
(let ((type (gncOwnerGetType owner)))

0
libgnucash/engine/commodity-table.scm → bindings/guile/commodity-table.scm
View File

1889
bindings/guile/engine-helpers-guile.c Normal file
View File

File diff suppressed because it is too large Load Diff

12
libgnucash/engine/engine-helpers-guile.h → bindings/guile/engine-helpers-guile.h
View File

@@ -1,5 +1,5 @@
/********************************************************************\
* engine-helpers.h -- gnucash engine helper functions *
* engine-helpers-guile.h -- engine helper functions for guile *
* Copyright (C) 2000 Linas Vepstas <linas@linas.org> *
* Copyright (C) 2001 Linux Developers Group, Inc. *
* *
@@ -29,6 +29,8 @@
#include <libguile.h>
#include "gnc-engine.h"
#include <gncTaxTable.h> /* for GncAccountValue */
#include "gnc-hooks.h"
/* Helpers for various conversions to and from guile */
@@ -53,4 +55,12 @@ gnc_commodity * gnc_scm_to_commodity(SCM scm);
SCM gnc_commodity_to_scm (const gnc_commodity *commodity);
SCM gnc_book_to_scm (const QofBook *book);
/* Conversion routines used with tax tables */
GncAccountValue * gnc_scm_to_account_value_ptr (SCM valuearg);
SCM gnc_account_value_ptr_to_scm (GncAccountValue *);
/**
* add Scheme-style danglers from a hook
*/
void gnc_hook_add_scm_dangler(const gchar *name, SCM proc);
#endif

2
libgnucash/engine/engine-utilities.scm → bindings/guile/engine-utilities.scm
View File

@@ -24,7 +24,7 @@
(eval-when
(compile load eval expand)
(load-extension "libgncmod-engine" "scm_init_sw_engine_module"))
(load-extension "libgnucash-guile" "gnc_guile_bindings_init"))
(use-modules (sw_engine))
(use-modules (srfi srfi-1)

5
libgnucash/engine/engine.scm → bindings/guile/engine.scm
View File

@@ -21,9 +21,12 @@
(eval-when
(compile load eval expand)
(load-extension "libgncmod-engine" "scm_init_sw_engine_module"))
(load-extension "libgnucash-guile" "gnc_guile_bindings_init"))
(use-modules (sw_engine))
(let ((i (module-public-interface (current-module))))
(module-use! i (resolve-interface '(sw_engine))))
(export GNC-RND-FLOOR)
(export GNC-RND-CEIL)
(export GNC-RND-TRUNC)

0
libgnucash/engine/glib-helpers.c → bindings/guile/glib-helpers.c
View File

0
libgnucash/engine/glib-helpers.h → bindings/guile/glib-helpers.h
View File

5
bindings/guile/gnc-guile-bindings.c
View File

@@ -32,8 +32,8 @@ void gnc_guile_bindings_init(void);
static int is_initialized = 0;
extern SCM
scm_init_sw_core_utils_module (void);
extern SCM scm_init_sw_core_utils_module (void);
extern SCM scm_init_sw_engine_module (void);
void
gnc_guile_bindings_init(void)
@@ -42,6 +42,7 @@ gnc_guile_bindings_init(void)
{
/* Do what's necessary to initialize the bindings */
scm_init_sw_core_utils_module();
scm_init_sw_engine_module();
is_initialized = 1;
}

0
libgnucash/engine/gnc-numeric.scm → bindings/guile/gnc-numeric.scm
View File

0
libgnucash/engine/kvp-scm.cpp → bindings/guile/kvp-scm.cpp
View File

0
libgnucash/engine/kvp-scm.h → bindings/guile/kvp-scm.h
View File

1
bindings/guile/price-quotes.scm
View File

@@ -25,6 +25,7 @@
(export gnc:book-add-quotes) ;; called from gnome/dialog-price-edit-db.c
(export gnc:price-quotes-install-sources)
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash core-utils))

4
bindings/guile/test/CMakeLists.txt
View File

@@ -6,7 +6,7 @@ set(scm_test_SCHEME
set(GUILE_DEPENDS
scm-gnc-module
scm-app-utils
scm-scm scm-engine
scm-engine
scm-srfi64-extras
scm-deprecated-gnucash-deprecated-module
scm-deprecated-gnucash-superseded-module
@@ -31,4 +31,4 @@ set_dist_list(test_guile_DIST
# Define two imaginary deprecated guile modules to test the compat file generation code
gnc_add_scheme_deprecated_module ("gnucash deprecated-module" "" "" "")
gnc_add_scheme_deprecated_module ("gnucash superseded-module" "gnucash utilities" "scm-scm" "")
gnc_add_scheme_deprecated_module ("gnucash superseded-module" "gnucash utilities" "scm-engine" "")

1
bindings/guile/test/test-scm-utilities.scm
View File

@@ -1,5 +1,6 @@
(use-modules (gnucash gnc-module))
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (srfi srfi-64))
(use-modules (tests srfi64-extras))

5
bindings/guile/utilities.scm
View File

@@ -25,10 +25,7 @@
'(#:warnings (arity-mismatch format duplicate-case-datum bad-case-datum)))
(use-modules (gnucash core-utils))
(eval-when (compile load eval expand)
(load-extension "libgncmod-engine" "scm_init_sw_engine_module"))
(use-modules (sw_engine))
(use-modules (gnucash engine))
;; Load the srfis (eventually, we should see where these are needed
;; and only have the use-modules statements in those files).

7
bindings/python/CMakeLists.txt
View File

@@ -39,10 +39,11 @@ set(GNUCASH_CORE_C_INCLUDES
gnc_add_swig_python_command (swig-gnucash-core
SWIG_GNUCASH_CORE_C SWIG_GNUCASH_CORE_PY
gnucash_core.c gnucash_core_c.py
${SWIG_FILES}
""
${CMAKE_CURRENT_SOURCE_DIR}/gnucash_core.i
${CMAKE_SOURCE_DIR}/bindings
${CMAKE_CURRENT_SOURCE_DIR}/time64.i
${CMAKE_SOURCE_DIR}/common/base-typemaps.i
${CMAKE_SOURCE_DIR}/libgnucash/engine/engine-common.i
${CMAKE_SOURCE_DIR}/bindings/engine-common.i
${GNUCASH_CORE_C_INCLUDES}
)

2
gnucash/CMakeLists.txt
View File

@@ -52,7 +52,7 @@ endif (BUILDING_FROM_VCS)
target_link_libraries (gnucash
gncmod-ledger-core gnc-gnome gncmod-gnome-utils gncmod-app-utils
gncmod-engine gnc-module gnc-core-utils gncmod-report
gncmod-engine gnc-module gnc-core-utils gncmod-report gnucash-guile
PkgConfig::GTK3 ${GUILE_LDFLAGS} ${GLIB2_LDFLAGS} ${GTK_MAC_LDFLAGS}
)

2
gnucash/gnome-utils/CMakeLists.txt
View File

@@ -251,7 +251,7 @@ install(FILES ${gnome_utils_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnu
# Scheme
set(GUILE_DEPENDS gncmod-gnome-utils scm-gnc-module scm-scm scm-app-utils)
set(GUILE_DEPENDS gncmod-gnome-utils scm-gnc-module scm-engine scm-app-utils)
gnc_add_scheme_targets(scm-gnome-utils-1
gnome-utils.scm

1
gnucash/gnome-utils/gnome-utils.scm
View File

@@ -19,6 +19,7 @@
(define-module (gnucash gnome-utils))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))

1
gnucash/gnome/CMakeLists.txt
View File

@@ -232,7 +232,6 @@ set(GUILE_DEPENDS
scm-gettext
scm-gnome-utils
scm-gnc-module
scm-scm
scm-report
scm-reports
)

1
gnucash/gnome/report-menus.scm
View File

@@ -26,6 +26,7 @@
(define-module (gnucash report-menus))
(use-modules (gnucash core-utils))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gnome-utils))

1
gnucash/import-export/qif-imp/CMakeLists.txt
View File

@@ -66,7 +66,6 @@ set(GUILE_DEPENDS
gnc-gnome
scm-core-utils
scm-gnc-module
scm-scm
scm-app-utils
scm-engine
scm-gnome-utils

6
gnucash/import-export/qif-imp/qif-import.scm
View File

@@ -25,7 +25,8 @@
(define-module (gnucash qif-import))
(use-modules (gnucash utilities))
(use-modules (gnucash utilities))
(use-modules (gnucash engine))
(use-modules (gnucash app-utils))
;; We do this initialization here because src/gnome isn't a real module.
@@ -35,13 +36,12 @@
(use-modules (sw_gnome))
(use-modules (gnucash gnc-module))
(use-modules (ice-9 regex))
(use-modules (srfi srfi-1))
(debug-enable 'backtrace)
(gnc:module-load "gnucash/engine" 0)
(use-modules (gnucash gnc-module))
(gnc:module-load "gnucash/app-utils" 0)
(gnc:module-load "gnucash/gnome-utils" 0)

1
gnucash/import-export/qif-imp/test/CMakeLists.txt
View File

@@ -15,7 +15,6 @@ set (GUILE_DEPENDS
scm-engine
scm-test-engine
scm-gettext
scm-scm
scm-qif-import
)
gnc_add_test(test-link-qif-imp test-link.c QIF_IMP_TEST_INCLUDE_DIRS QIF_IMP_TEST_LIBS)

1
gnucash/import-export/qif-imp/test/test-qif-merge-groups.scm
View File

@@ -1,3 +1,4 @@
(use-modules (gnucash engine))
(use-modules (gnucash gnc-module))
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
(use-modules (srfi srfi-64))

2
gnucash/report/CMakeLists.txt
View File

@@ -93,7 +93,7 @@ set(GUILE_DEPENDS
scm-gnome-utils
gncmod-report
scm-app-utils
scm-scm
scm-engine
scm-gnc-module
guile-json
)

1
gnucash/report/eguile-html-utilities.scm
View File

@@ -24,6 +24,7 @@
; using all of these seems like overkill --
; not sure which are really required
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash app-utils))

1
gnucash/report/eguile-utilities.scm
View File

@@ -24,6 +24,7 @@
; using all of these seems like overkill --
; not sure which are really required
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash app-utils))

1
gnucash/report/html-utilities.scm
View File

@@ -22,6 +22,7 @@
;; Boston, MA 02110-1301, USA gnu@gnu.org
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
;; returns a list with n #f (empty cell) values

1
gnucash/report/report-core.scm
View File

@@ -20,6 +20,7 @@
;; Boston, MA 02110-1301, USA gnu@gnu.org
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash app-utils))
(use-modules (gnucash gettext))

4
gnucash/report/report.scm
View File

@@ -29,10 +29,10 @@
(use-modules (ice-9 regex))
(use-modules (srfi srfi-1))
(use-modules (srfi srfi-19))
(use-modules (gnucash gnc-module))
(use-modules (gnucash core-utils))
(use-modules (gnucash engine))
(gnc:module-load "gnucash/engine" 0)
(use-modules (gnucash gnc-module))
(gnc:module-load "gnucash/app-utils" 0)
(gnc:module-load "gnucash/html" 0)
(gnc:module-load "gnucash/gnome-utils" 0)

5
gnucash/report/reports/CMakeLists.txt
View File

@@ -76,7 +76,6 @@ set(scm_rpts_GUILE_DEPENDS
scm-core-utils
scm-engine
scm-gettext
scm-scm
scm-gnome-utils
scm-report
)
@@ -87,7 +86,7 @@ set(scm_rpt_example_GUILE_DEPENDS
scm-core-utils
scm-gettext
scm-gnc-module
scm-scm
scm-engine
scm-reports-example-links
scm-gnome-utils
scm-report
@@ -98,7 +97,7 @@ set(scm_rpt_locale_specific_GUILE_DEPENDS
scm-core-utils
scm-gettext
scm-gnc-module
scm-scm
scm-engine
scm-test-core
scm-locale-tax
scm-report

2
gnucash/report/reports/aging.scm
View File

@@ -26,6 +26,8 @@
(define-module (gnucash reports aging))
(use-modules (gnucash business-core))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

1
gnucash/report/reports/example/average-balance.scm
View File

@@ -28,6 +28,7 @@
(define-module (gnucash reports example average-balance))
(use-modules (srfi srfi-1))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

3
gnucash/report/reports/example/daily-reports.scm
View File

@@ -27,7 +27,8 @@
(define-module (gnucash reports example daily-reports))
(use-modules (gnucash utilities))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (srfi srfi-1))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

1
gnucash/report/reports/example/hello-world.scm
View File

@@ -24,6 +24,7 @@
;; new reports for GnuCash.
(define-module (gnucash reports example hello-world))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

1
gnucash/report/reports/example/sample-graphs.scm
View File

@@ -24,6 +24,7 @@
;; new reports for GnuCash.
(define-module (gnucash reports example sample-graphs))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))

1
gnucash/report/reports/example/welcome-to-gnucash.scm
View File

@@ -23,6 +23,7 @@
(define-module (gnucash reports example welcome-to-gnucash))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash core-utils)) ; for gnc:version
(use-modules (gnucash gettext))

2
gnucash/report/reports/locale-specific/de_DE/taxtxf.scm
View File

@@ -67,6 +67,7 @@
;; depends must be outside module scope -- and should eventually go away.
(define-module (gnucash reports locale-specific de_DE taxtxf))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (srfi srfi-1))
(use-modules (gnucash core-utils)) ; for gnc:version
@@ -75,7 +76,6 @@
(use-modules (gnucash gnc-module))
(gnc:module-load "gnucash/report" 0)
(gnc:module-load "gnucash/engine" 0)
(define reportname (N_ "Tax Report / TXF Export"))

3
gnucash/report/reports/locale-specific/us/taxtxf.scm
View File

@@ -99,7 +99,8 @@
(define-module (gnucash reports locale-specific us taxtxf))
(use-modules (gnucash utilities))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (srfi srfi-1))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

4
gnucash/report/reports/reports.scm
View File

@@ -29,6 +29,7 @@
(use-modules (srfi srfi-8))
(use-modules (gnucash app-utils))
(use-modules (gnucash core-utils))
(use-modules (gnucash engine))
(use-modules (gnucash report))
(use-modules (gnucash utilities))
@@ -50,8 +51,7 @@
(all-dirs (append report-dirs (list (list 'gnucash 'reports 'locale-specific loc-spec)))))
(report-module-loader all-dirs))
(use-modules (gnucash gnc-module))
(gnc:module-load "gnucash/engine" 0)
(use-modules (gnucash engine))
(define (gnc:register-report-create account split query journal? ledger-type?
double? title debit-string credit-string)

3
gnucash/report/reports/standard/account-piecharts.scm
View File

@@ -25,7 +25,8 @@
(define-module (gnucash reports standard account-piecharts))
(use-modules (gnucash utilities))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (srfi srfi-1))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

1
gnucash/report/reports/standard/account-summary.scm
View File

@@ -56,6 +56,7 @@
(define-module (gnucash reports standard account-summary))
(use-modules (srfi srfi-1))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

1
gnucash/report/reports/standard/advanced-portfolio.scm
View File

@@ -27,6 +27,7 @@
(define-module (gnucash reports standard advanced-portfolio))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (srfi srfi-1))
(use-modules (gnucash gnc-module))

1
gnucash/report/reports/standard/balance-forecast.scm
View File

@@ -25,6 +25,7 @@
(define-module (gnucash reports standard balance-forecast))
(use-modules (gnucash engine))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))
(use-modules (srfi srfi-1))

1
gnucash/report/reports/standard/balance-sheet.scm
View File

@@ -63,6 +63,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash reports standard balance-sheet))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

1
gnucash/report/reports/standard/balsheet-eg.scm
View File

@@ -32,6 +32,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash reports standard balsheet-eg))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

1
gnucash/report/reports/standard/balsheet-pnl.scm
View File

@@ -26,6 +26,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash reports standard balsheet-pnl))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

1
gnucash/report/reports/standard/budget-balance-sheet.scm
View File

@@ -29,6 +29,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash reports standard budget-balance-sheet))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

1
gnucash/report/reports/standard/budget-barchart.scm
View File

@@ -27,6 +27,7 @@
(define-module (gnucash reports standard budget-barchart))
(use-modules (srfi srfi-1))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

1
gnucash/report/reports/standard/budget-flow.scm
View File

@@ -26,6 +26,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash reports standard budget-flow))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

1
gnucash/report/reports/standard/budget-income-statement.scm
View File

@@ -41,6 +41,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash reports standard budget-income-statement))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

3
gnucash/report/reports/standard/budget.scm
View File

@@ -27,12 +27,11 @@
(define-module (gnucash reports standard budget))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))
(use-modules (gnucash engine))
(use-modules (srfi srfi-1))
(use-modules (ice-9 match))

2
gnucash/report/reports/standard/cash-flow.scm
View File

@@ -28,10 +28,10 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash reports standard cash-flow))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))
(use-modules (gnucash engine))
(gnc:module-load "gnucash/report" 0)
(gnc:module-load "gnucash/gnome-utils" 0) ;for gnc-build-url

2
gnucash/report/reports/standard/cashflow-barchart.scm
View File

@@ -29,10 +29,10 @@
(define-module (gnucash reports standard cashflow-barchart))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))
(use-modules (gnucash engine))
(use-modules (gnucash reports standard cash-flow))
(gnc:module-load "gnucash/report" 0)

1
gnucash/report/reports/standard/category-barchart.scm
View File

@@ -26,6 +26,7 @@
(define-module (gnucash reports standard category-barchart))
(use-modules (srfi srfi-1))
(use-modules (srfi srfi-9))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

1
gnucash/report/reports/standard/customer-summary.scm
View File

@@ -30,6 +30,7 @@
(use-modules (srfi srfi-1))
(use-modules (gnucash gnc-module))
(use-modules (gnucash engine))
(use-modules (gnucash utilities)) ; for gnc:debug
(use-modules (gnucash gettext))
(use-modules (gnucash reports))

1
gnucash/report/reports/standard/dashboard.scm
View File

@@ -25,6 +25,7 @@
(define-module (gnucash reports standard dashboard))
(export gnc:make-dashboard)
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash core-utils)) ; for gnc:version
(use-modules (gnucash gettext))

1
gnucash/report/reports/standard/equity-statement.scm
View File

@@ -46,6 +46,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash reports standard equity-statement))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

1
gnucash/report/reports/standard/general-journal.scm
View File

@@ -27,6 +27,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash reports standard general-journal))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

1
gnucash/report/reports/standard/general-ledger.scm
View File

@@ -30,6 +30,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash reports standard general-ledger))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

1
gnucash/report/reports/standard/income-gst-statement.scm
View File

@@ -27,6 +27,7 @@
(define-module (gnucash reports standard income-gst-statement))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (srfi srfi-1))
(use-modules (gnucash gnc-module))

1
gnucash/report/reports/standard/income-statement.scm
View File

@@ -42,6 +42,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash reports standard income-statement))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

2
gnucash/report/reports/standard/invoice.scm
View File

@@ -24,6 +24,8 @@
(define-module (gnucash reports standard invoice))
(use-modules (gnucash engine))
(use-modules (gnucash business-core))
(use-modules (srfi srfi-1))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

2
gnucash/report/reports/standard/job-report.scm
View File

@@ -27,6 +27,8 @@
(define-module (gnucash reports standard job-report))
(use-modules (srfi srfi-1))
(use-modules (gnucash business-core))
(use-modules (gnucash engine))
(use-modules (gnucash gnc-module))
(use-modules (gnucash utilities)) ; for gnc:debug
(use-modules (gnucash gettext))

1
gnucash/report/reports/standard/net-charts.scm
View File

@@ -29,6 +29,7 @@
(define-module (gnucash reports standard net-charts))
(use-modules (srfi srfi-1))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

1
gnucash/report/reports/standard/new-aging.scm
View File

@@ -30,6 +30,7 @@
(use-modules (srfi srfi-1))
(use-modules (srfi srfi-11)) ;let-values
(use-modules (gnucash utilities))
(use-modules (gnucash engine))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

1
gnucash/report/reports/standard/new-owner-report.scm
View File

@@ -32,6 +32,7 @@
(use-modules (srfi srfi-8))
(use-modules (srfi srfi-11)) ;for let-values
(use-modules (gnucash gnc-module))
(use-modules (gnucash engine))
(use-modules (gnucash utilities)) ; for gnc:debug
(use-modules (gnucash gettext))

2
gnucash/report/reports/standard/owner-report.scm
View File

@@ -29,6 +29,8 @@
(use-modules (srfi srfi-1))
(use-modules (srfi srfi-8))
(use-modules (gnucash business-core))
(use-modules (gnucash engine))
(use-modules (gnucash gnc-module))
(use-modules (gnucash utilities)) ; for gnc:debug
(use-modules (gnucash gettext))

1
gnucash/report/reports/standard/payables.scm
View File

@@ -25,6 +25,7 @@
(define-module (gnucash reports standard payables))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

1
gnucash/report/reports/standard/portfolio.scm
View File

@@ -23,6 +23,7 @@
(define-module (gnucash reports standard portfolio))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (srfi srfi-1))
(use-modules (gnucash gnc-module))

1
gnucash/report/reports/standard/price-scatter.scm
View File

@@ -24,6 +24,7 @@
(define-module (gnucash reports standard price-scatter))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (srfi srfi-1))
(use-modules (gnucash gnc-module))

6
gnucash/report/reports/standard/receipt.scm
View File

@@ -17,12 +17,14 @@
(define-module (gnucash reports standard receipt))
(use-modules (ice-9 local-eval)) ; for the-environment
(use-modules (gnucash business-core))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))
(use-modules (gnucash gnc-module))
(gnc:module-load "gnucash/report" 0)
(gnc:module-load "gnucash/html" 0)
(gnc:module-load "gnucash/engine" 0)
(use-modules (gnucash eguile))

1
gnucash/report/reports/standard/receivables.scm
View File

@@ -25,6 +25,7 @@
(define-module (gnucash reports standard receivables))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

1
gnucash/report/reports/standard/reconcile-report.scm
View File

@@ -26,6 +26,7 @@
(define-module (gnucash reports standard reconcile-report))
(use-modules (gnucash engine))
(use-modules (gnucash gettext))
(use-modules (gnucash gnc-module))
(gnc:module-load "gnucash/report" 0)

1
gnucash/report/reports/standard/register.scm
View File

@@ -22,6 +22,7 @@
(define-module (gnucash reports standard register))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (srfi srfi-1))
(use-modules (gnucash gnc-module))

6
gnucash/report/reports/standard/taxinvoice.scm
View File

@@ -25,12 +25,14 @@
(define-module (gnucash reports standard taxinvoice))
(use-modules (ice-9 local-eval)) ; for the-environment
(use-modules (gnucash engine))
(use-modules (gnucash business-core))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))
(use-modules (gnucash gnc-module))
(gnc:module-load "gnucash/report" 0)
(gnc:module-load "gnucash/html" 0)
(gnc:module-load "gnucash/engine" 0)
(use-modules (gnucash eguile))

1
gnucash/report/reports/standard/test/CMakeLists.txt
View File

@@ -32,7 +32,6 @@ set(GUILE_DEPENDS
scm-engine
scm-test-engine
scm-gettext
scm-scm
scm-test-report
scm-reports
scm-report-stylesheets

1
gnucash/report/reports/standard/test/test-account-summary.scm
View File

@@ -1,3 +1,4 @@
(use-modules (gnucash engine))
(use-modules (gnucash gnc-module))
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
(use-modules (tests test-engine-extras))

1
gnucash/report/reports/standard/test/test-balsheet-pnl.scm
View File

@@ -1,3 +1,4 @@
(use-modules (gnucash engine))
(use-modules (gnucash gnc-module))
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
(use-modules (tests test-engine-extras))

1
gnucash/report/reports/standard/test/test-cash-flow.scm
View File

@@ -1,3 +1,4 @@
(use-modules (gnucash engine))
(use-modules (gnucash gnc-module))
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))

1
gnucash/report/reports/standard/test/test-charts.scm
View File

@@ -1,3 +1,4 @@
(use-modules (gnucash engine))
(use-modules (gnucash gnc-module))
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
(use-modules (tests test-engine-extras))

1
gnucash/report/reports/standard/test/test-income-gst.scm
View File

@@ -1,3 +1,4 @@
(use-modules (gnucash engine))
(use-modules (gnucash gnc-module))
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
(use-modules (tests test-engine-extras))

1
gnucash/report/reports/standard/test/test-invoice.scm
View File

@@ -1,3 +1,4 @@
(use-modules (gnucash engine))
(use-modules (gnucash gnc-module))
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
(use-modules (tests test-engine-extras))

1
gnucash/report/reports/standard/test/test-owner-report.scm
View File

@@ -1,3 +1,4 @@
(use-modules (gnucash engine))
(use-modules (gnucash gnc-module))
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
(use-modules (tests test-engine-extras))

1
gnucash/report/reports/standard/test/test-portfolios.scm
View File

@@ -1,3 +1,4 @@
(use-modules (gnucash engine))
(use-modules (gnucash gnc-module))
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
(use-modules (tests test-engine-extras))

1
gnucash/report/reports/standard/test/test-stress-options.scm
View File

@@ -1,5 +1,6 @@
(use-modules (ice-9 textual-ports))
(use-modules (ice-9 popen))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))

1
gnucash/report/reports/standard/test/test-transaction.scm
View File

@@ -1,3 +1,4 @@
(use-modules (gnucash engine))
(use-modules (gnucash gnc-module))
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
(use-modules (tests test-engine-extras))

1
gnucash/report/reports/standard/trial-balance.scm
View File

@@ -52,6 +52,7 @@
(define-module (gnucash reports standard trial-balance))
(use-modules (srfi srfi-1))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

1
gnucash/report/reports/standard/view-column.scm
View File

@@ -27,6 +27,7 @@
;; don't have to worry about that here.
(define-module (gnucash reports standard view-column))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash app-utils))
(use-modules (gnucash gnc-module))

2
gnucash/report/stylesheets/CMakeLists.txt
View File

@@ -10,7 +10,7 @@ set(GUILE_DEPENDS
scm-gnc-module
scm-core-utils
scm-gettext
scm-scm
scm-engine
gncmod-html
scm-report
)

1
gnucash/report/stylesheets/footer.scm
View File

@@ -36,6 +36,7 @@
(define-module (gnucash report stylesheets footer))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

1
gnucash/report/stylesheets/head-or-tail.scm
View File

@@ -35,6 +35,7 @@
(define-module (gnucash report stylesheets head-or-tail))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash core-utils)) ; for gnc:version

1
gnucash/report/stylesheets/plain.scm
View File

@@ -24,6 +24,7 @@
(define-module (gnucash report stylesheets plain))
(use-modules (gnucash engine))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash core-utils))

Some files were not shown because too many files have changed in this diff Show More