gnucash master: guile: remove support for guile < 2.0

Christopher Lam clam at code.gnucash.org
Wed Oct 2 08:26:13 EDT 2019


Updated	 via  https://github.com/Gnucash/gnucash/commit/0c65c41b (commit)
	from  https://github.com/Gnucash/gnucash/commit/c59515f7 (commit)



commit 0c65c41b321ea912722e441f592704e845d36f50
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Wed Oct 2 19:55:50 2019 +0800

    guile: remove support for guile < 2.0

diff --git a/gnucash/report/test/test-load-report-module.scm b/gnucash/report/test/test-load-report-module.scm
index aef1452c1..270fe4b9a 100755
--- a/gnucash/report/test/test-load-report-module.scm
+++ b/gnucash/report/test/test-load-report-module.scm
@@ -1,8 +1,6 @@
 (debug-enable 'backtrace)
 
 (debug-set! stack 500000)
-(if (< (string->number (major-version)) 2)
-    (debug-set! maxdepth 100000))
 
 (display "  testing report module load ... ")
 (setenv "GNC_UNINSTALLED" "1")
diff --git a/libgnucash/app-utils/gettext.scm b/libgnucash/app-utils/gettext.scm
index bfef8564b..46e965a72 100644
--- a/libgnucash/app-utils/gettext.scm
+++ b/libgnucash/app-utils/gettext.scm
@@ -32,10 +32,6 @@
   (syntax-rules ()
     ((_ x) x)))
 
-
-(if (< (string->number (major-version)) 2)
-    (export-syntax N_))
-
 (export gnc:gettext)
 (export _)
 (export N_)
diff --git a/libgnucash/gnc-module/test/test-gnc-module-scm-dynload.scm b/libgnucash/gnc-module/test/test-gnc-module-scm-dynload.scm
index 5a81132e4..8d7a82a74 100755
--- a/libgnucash/gnc-module/test/test-gnc-module-scm-dynload.scm
+++ b/libgnucash/gnc-module/test/test-gnc-module-scm-dynload.scm
@@ -1,5 +1,2 @@
-(if (or (string=? (version) "1.3")
-        (string=? (version) "1.3.4"))
-    (dynamic-link "libgnc-module.so")
-    (dynamic-link "libgnc-module"))
+(dynamic-link "libgnc-module")
 (exit 0)
diff --git a/libgnucash/scm/utilities.scm b/libgnucash/scm/utilities.scm
index 4bdc61ed8..de563d231 100644
--- a/libgnucash/scm/utilities.scm
+++ b/libgnucash/scm/utilities.scm
@@ -21,9 +21,8 @@
 ;; In guile 2.0 we get nearly 7500 of them loading the scheme files.
 ;; This is the default value for auto-compilation-options without "unbound-variable".
 ;; See module/ice-9/boot-9.scm  */
-(if (>= (string->number (major-version)) 2)
-    (set! %auto-compilation-options 
-          '(#:warnings (arity-mismatch format duplicate-case-datum bad-case-datum))))
+(set! %auto-compilation-options
+  '(#:warnings (arity-mismatch format duplicate-case-datum bad-case-datum)))
 
 (use-modules (gnucash core-utils))
 



Summary of changes:
 gnucash/report/test/test-load-report-module.scm            | 2 --
 libgnucash/app-utils/gettext.scm                           | 4 ----
 libgnucash/gnc-module/test/test-gnc-module-scm-dynload.scm | 5 +----
 libgnucash/scm/utilities.scm                               | 5 ++---
 4 files changed, 3 insertions(+), 13 deletions(-)



More information about the gnucash-changes mailing list