app-utils - expose wrapped api directly from app-utils.scm

With that in place we no longer need to (gnc:module-load "gnucash/app-utils" 0)
the app-utils gncmodule. An ordinary (use-modules (gnucash app-utils)) suffices

bindings/guile/test/test-business-core.scm

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

bindings/guile/test/test-scm-utilities.scm

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

gnucash/gnome-utils/gnome-utils.scm

@@ -21,13 +21,11 @@
 
 (use-modules (gnucash engine))
 (use-modules (gnucash utilities))
-(use-modules (gnucash gnc-module))
+(use-modules (gnucash app-utils))
 
 (eval-when (compile load eval expand)
   (load-extension "libgncmod-gnome-utils" "scm_init_sw_gnome_utils_module"))
-
 (use-modules (sw_gnome_utils))
-(gnc:module-load "gnucash/app-utils" 0)
 
 ;; from gnc-menu-extensions.scm
 (export gnc:extension-type)

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

@@ -42,7 +42,6 @@
 (debug-enable 'backtrace)
 
 (use-modules (gnucash gnc-module))
-(gnc:module-load "gnucash/app-utils" 0)
 (gnc:module-load "gnucash/gnome-utils" 0)
 
 (load-from-path "gnucash/qif-import/qif-objects")      ;; class definitions

gnucash/import-export/qif-imp/test/test-qif-imp.scm

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

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

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

gnucash/import-export/qif-imp/test/test-qif-parse.scm

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

gnucash/report/eguile-html-utilities.scm

@@ -29,7 +29,6 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash app-utils))
 (gnc:module-load "gnucash/report" 0)
-(gnc:module-load "gnucash/app-utils" 0)
 
 (use-modules (ice-9 regex))  ; for regular expressions
 (use-modules (srfi srfi-13)) ; for extra string functions

gnucash/report/eguile-utilities.scm

@@ -30,7 +30,6 @@
 (use-modules (gnucash app-utils))
 (use-modules (gnucash core-utils))
 (gnc:module-load "gnucash/report" 0)
-(gnc:module-load "gnucash/app-utils" 0)
 
 (define-public (fmtnumber n)
   ;; Format a number (integer or real) into something printable

gnucash/report/report.scm

@@ -31,9 +31,9 @@
 (use-modules (srfi srfi-19))
 (use-modules (gnucash core-utils))
 (use-modules (gnucash engine))
+(use-modules (gnucash app-utils))
 
 (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)
 

gnucash/report/reports/standard/test/test-account-summary.scm

@@ -1,6 +1,5 @@
 (use-modules (gnucash engine))
-(use-modules (gnucash gnc-module))
-(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
+(use-modules (gnucash app-utils))
 (use-modules (tests test-engine-extras))
 (use-modules (gnucash reports standard account-summary))
 (use-modules (gnucash report stylesheets plain))

gnucash/report/reports/standard/test/test-average-balance.scm

@@ -1,5 +1,4 @@
 (use-modules (gnucash gnc-module))
-(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 (gnc:module-begin-syntax (gnc:module-load "gnucash/report" 0))
 (use-modules (tests test-engine-extras))
 (use-modules (gnucash reports example average-balance))
@@ -11,7 +10,7 @@
 (use-modules (srfi srfi-1))
 (use-modules (srfi srfi-64))
 (use-modules (gnucash engine))
-(use-modules (sw_engine))
+(use-modules (gnucash app-utils))
 
 ;; Explicitly set locale to make the report output predictable
 (setlocale LC_ALL "C")

gnucash/report/reports/standard/test/test-balsheet-pnl.scm

@@ -1,6 +1,5 @@
 (use-modules (gnucash engine))
-(use-modules (gnucash gnc-module))
-(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
+(use-modules (gnucash app-utils))
 (use-modules (tests test-engine-extras))
 (use-modules (gnucash reports standard balance-sheet))
 (use-modules (gnucash reports standard income-statement))

gnucash/report/reports/standard/test/test-cash-flow.scm

@@ -1,8 +1,5 @@
 (use-modules (gnucash engine))
-(use-modules (gnucash gnc-module))
-
-(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
-
+(use-modules (gnucash app-utils))
 (use-modules (tests test-engine-extras))
 (use-modules (gnucash reports standard cash-flow))
 (use-modules (gnucash report))

gnucash/report/reports/standard/test/test-cashflow-barchart.scm

@@ -18,12 +18,10 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (use-modules (gnucash gnc-module))
-
-(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 (gnc:module-load "gnucash/report" 0)
 
 (use-modules (gnucash engine))
-(use-modules (sw_engine))
+(use-modules (gnucash app-utils))
 (use-modules (tests test-engine-extras))
 (use-modules (tests srfi64-extras))
 (use-modules (gnucash report))

gnucash/report/reports/standard/test/test-charts.scm

@@ -1,6 +1,5 @@
 (use-modules (gnucash engine))
-(use-modules (gnucash gnc-module))
-(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
+(use-modules (gnucash app-utils))
 (use-modules (tests test-engine-extras))
 (use-modules (gnucash reports standard category-barchart))
 (use-modules (gnucash reports standard net-charts))

gnucash/report/reports/standard/test/test-income-gst.scm

@@ -1,6 +1,5 @@
 (use-modules (gnucash engine))
-(use-modules (gnucash gnc-module))
-(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
+(use-modules (gnucash app-utils))
 (use-modules (tests test-engine-extras))
 (use-modules (gnucash reports standard income-gst-statement))
 (use-modules (gnucash report stylesheets plain)) ; For the default stylesheet, required for rendering

gnucash/report/reports/standard/test/test-invoice.scm

@@ -1,6 +1,5 @@
 (use-modules (gnucash engine))
-(use-modules (gnucash gnc-module))
-(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
+(use-modules (gnucash app-utils))
 (use-modules (tests test-engine-extras))
 (use-modules (gnucash reports standard invoice))
 (use-modules (gnucash report stylesheets plain)) ; For the default stylesheet, required for rendering

gnucash/report/reports/standard/test/test-owner-report.scm

@@ -1,6 +1,5 @@
 (use-modules (gnucash engine))
-(use-modules (gnucash gnc-module))
-(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
+(use-modules (gnucash app-utils))
 (use-modules (tests test-engine-extras))
 (use-modules (gnucash reports standard owner-report))
 (use-modules (gnucash reports standard job-report))

gnucash/report/reports/standard/test/test-portfolios.scm

@@ -1,6 +1,5 @@
 (use-modules (gnucash engine))
-(use-modules (gnucash gnc-module))
-(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
+(use-modules (gnucash app-utils))
 (use-modules (tests test-engine-extras))
 (use-modules (gnucash reports standard portfolio))
 (use-modules (gnucash reports standard advanced-portfolio))

gnucash/report/reports/standard/test/test-stress-options.scm

@@ -2,8 +2,7 @@
 (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))
+(use-modules (gnucash app-utils))
 (use-modules (tests test-engine-extras))
 (use-modules (gnucash reports standard view-column))
 (use-modules (gnucash report stylesheets plain)) ; For the default stylesheet, required for rendering

gnucash/report/reports/standard/test/test-transaction.scm

@@ -1,6 +1,5 @@
 (use-modules (gnucash engine))
-(use-modules (gnucash gnc-module))
-(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
+(use-modules (gnucash app-utils))
 (use-modules (tests test-engine-extras))
 (use-modules (gnucash reports standard transaction))
 (use-modules (gnucash reports standard reconcile-report))

gnucash/report/test/test-html-chart.scm

@@ -1,13 +1,12 @@
 (use-modules (gnucash gnc-module))
-
-(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 (gnc:module-begin-syntax (gnc:module-load "gnucash/report" 0))
 
+(use-modules (gnucash app-utils))
+(use-modules (gnucash report))
 (use-modules (srfi srfi-64))
 (use-modules (tests srfi64-extras))
 (use-modules (tests test-engine-extras))
 (use-modules (tests test-report-extras))
-(use-modules (gnucash report))
 
 (define (run-test)
   (test-runner-factory gnc:test-runner)

gnucash/report/test/test-html-utilities-srfi64.scm

@@ -1,11 +1,10 @@
 (use-modules (gnucash gnc-module))
-
-(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 (gnc:module-begin-syntax (gnc:module-load "gnucash/report" 0))
 
+(use-modules (gnucash app-utils))
+(use-modules (gnucash report))
 (use-modules (tests test-engine-extras))
 (use-modules (tests test-report-extras))
-(use-modules (gnucash report))
 (use-modules (tests srfi64-extras))
 (use-modules (srfi srfi-64))
 

gnucash/report/test/test-report-html.scm

@@ -1,15 +1,12 @@
-(use-modules (gnucash gnc-module))
-
-(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
-
 (use-modules (gnucash engine))
-(use-modules (tests test-engine-extras))
+(use-modules (gnucash app-utils))
 (use-modules (gnucash report))
-(use-modules (tests test-report-extras))
 (use-modules (gnucash report stylesheets plain))
 (use-modules (srfi srfi-64))
 (use-modules (ice-9 pretty-print))
 (use-modules (sxml simple))
+(use-modules (tests test-engine-extras))
+(use-modules (tests test-report-extras))
 (use-modules (tests srfi64-extras))
 (use-modules (system vm coverage))
 

gnucash/report/test/test-report-utilities.scm

@@ -1,14 +1,13 @@
 (use-modules (gnucash gnc-module))
-
-(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 (gnc:module-begin-syntax (gnc:module-load "gnucash/report" 0))
 
 (use-modules (gnucash engine))
+(use-modules (gnucash app-utils))
+(use-modules (gnucash report))
 (use-modules (srfi srfi-64))
 (use-modules (tests srfi64-extras))
 (use-modules (tests test-engine-extras))
 (use-modules (tests test-report-extras))
-(use-modules (gnucash report))
 
 (setlocale LC_ALL "C")
 

gnucash/report/test/test-report.scm

@@ -1,10 +1,7 @@
-(use-modules (gnucash gnc-module))
-
-(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
-
-(use-modules (tests test-engine-extras))
+(use-modules (gnucash app-utils))
 (use-modules (gnucash report))
 (use-modules (srfi srfi-64))
+(use-modules (tests test-engine-extras))
 (use-modules (tests srfi64-extras))
 
 (define (run-test)

libgnucash/app-utils/app-utils.scm

@@ -20,6 +20,11 @@
       (compile load eval expand)
       (load-extension "libgncmod-app-utils" "scm_init_sw_app_utils_module"))
 (use-modules (sw_app_utils))
+
+; Export the swig-wrapped symbols in the public interface of this module
+(let ((i (module-public-interface (current-module))))
+     (module-use! i (resolve-interface '(sw_app_utils))))
+
 (use-modules (srfi srfi-1))
 (use-modules (gnucash utilities))
 (use-modules (gnucash engine))

libgnucash/app-utils/test/test-date-utilities.scm

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

libgnucash/app-utils/test/test-options.scm

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