gnucash maint: Multiple changes pushed
Christopher Lam
clam at code.gnucash.org
Tue Aug 27 10:30:01 EDT 2019
Updated via https://github.com/Gnucash/gnucash/commit/2fa44263 (commit)
via https://github.com/Gnucash/gnucash/commit/f4a1b2fd (commit)
from https://github.com/Gnucash/gnucash/commit/d963ca0d (commit)
commit 2fa442638dd2c86be0dd21c472e330b7eaf80085
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Tue Aug 27 22:16:27 2019 +0800
fix typo in he/CMakelists.txt templates dist_list
diff --git a/data/accounts/he/CMakeLists.txt b/data/accounts/he/CMakeLists.txt
index e10868345..43a9812bb 100644
--- a/data/accounts/he/CMakeLists.txt
+++ b/data/accounts/he/CMakeLists.txt
@@ -18,7 +18,7 @@ set(account_DATA
acctchrt_spouseinc.gnucash-xea
acctchrt_spouseretire.gnucash-xea)
-set_dist_list(he_DIST ${account_DATA} acctchrt_full.gnucash-xea CMakeLists.txt)
+set_dist_list(HE_DIST ${account_DATA} acctchrt_full.gnucash-xea CMakeLists.txt)
install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/he)
file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/he_HE)
commit f4a1b2fdf2dbf1bbb5abd3a96a64fbdba3fcf2d4
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Tue Aug 27 21:50:32 2019 +0800
Revert "[standard-reports] modernise to srfi-9 records"
This reverts commit
123033e5ea31beb21dc1e75cb50c9cf5432cc34a. Unfortunately srfi-9 records
don't travel well outside modules, so, will fail on master.
diff --git a/gnucash/report/standard-reports/standard-reports.scm b/gnucash/report/standard-reports/standard-reports.scm
index 321f0997d..235f763c8 100644
--- a/gnucash/report/standard-reports/standard-reports.scm
+++ b/gnucash/report/standard-reports/standard-reports.scm
@@ -25,7 +25,6 @@
(define-module (gnucash report standard-reports))
-(use-modules (srfi srfi-9))
(use-modules (srfi srfi-13))
(use-modules (gnucash utilities))
(use-modules (gnucash core-utils))
@@ -40,15 +39,26 @@
;; or without split. If no function is found, then run the 'default'
;; function
-(define-record-type :acct-type-info
- (make-acct-type-private split non-split)
- acct-type-info?
- (split get-split set-split)
- (non-split get-non-split set-non-split))
+(define acct-type-info (make-record-type "AcctTypeInfo" '(split non-split)))
+
+(define make-acct-type-private
+ (record-constructor acct-type-info '(split non-split)))
(define (make-acct-type)
(make-acct-type-private #f #f))
+(define get-split
+ (record-accessor acct-type-info 'split))
+
+(define set-split
+ (record-modifier acct-type-info 'split))
+
+(define get-non-split
+ (record-accessor acct-type-info 'non-split))
+
+(define set-non-split
+ (record-modifier acct-type-info 'non-split))
+
(define (gnc:register-report-hook acct-type split? create-fcn)
(let ((type-info (hash-ref gnc:*register-report-hash* acct-type (make-acct-type))))
(if split?
Summary of changes:
data/accounts/he/CMakeLists.txt | 2 +-
.../report/standard-reports/standard-reports.scm | 22 ++++++++++++++++------
2 files changed, 17 insertions(+), 7 deletions(-)
More information about the gnucash-changes
mailing list