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

Drop guile 1.8 support

Browse Source 
And with it all quirks we still had in the code to support that version.
This commit is contained in:
Geert Janssens
2017-12-19 23:13:01 +01:00
parent a784dd5784
commit 3d910ad2b1
61 changed files with 110 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libgnucash/gnc-module/Makefile.am
View File

@@ -33,13 +33,6 @@ if BUILDING_FROM_VCS
swig-gnc-module.c: gnc-module.i ${top_srcdir}/common/base-typemaps.i
$(SWIG) -guile -Linkage module \
-I${top_srcdir}/common -o $@ $<
if ! OS_WIN32
if ! SWIG_DIST_FAIL
if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
patch $@ $(top_srcdir)/common/swig-utf8.patch; \
fi
endif
endif
endif
EXAMPLE_EXTRA_DIST = \
@@ -79,7 +72,6 @@ if ! OS_WIN32
touch .scm-links
endif
if GNC_HAVE_GUILE_2
GUILE_COMPILE_ENV = \
--library-dir ${top_builddir}/libgnucash/gnc-module \
--library-dir ${top_builddir}/libgnucash/core-utils
@@ -92,7 +84,6 @@ GUILE_COMPILE_ENV = \
gncscmmodcachedir = ${pkglibdir}/scm/ccache/@GUILE_EFFECTIVE_VERSION@/gnucash
gncscmmodcache_DATA = $(gncscmmod_DATA:.scm=.go)
endif
clean-local:
rm -rf gnucash

16
libgnucash/gnc-module/gnc-module.scm
View File

@@ -28,13 +28,9 @@
(define-module (gnucash gnc-module))
;; Guile 2 needs to find the symbols from the extension at compile time already
(cond-expand
(guile-2
(eval-when
(eval-when
(compile load eval expand)
(load-extension "libgnc-module" "scm_init_sw_gnc_module_module")))
(else
(load-extension "libgnc-module" "scm_init_sw_gnc_module_module")))
(load-extension "libgnc-module" "scm_init_sw_gnc_module_module"))
(use-modules (sw_gnc_module))
@@ -52,9 +48,5 @@
(export gnc:module-begin-syntax)
;; Guile 2 needs to load external modules at compile time
(cond-expand
(guile-2
(define-syntax-rule (gnc:module-begin-syntax form ...)
(eval-when (load compile eval expand) (begin form ...))))
(else
(define gnc:module-begin-syntax begin)))
(define-syntax-rule (gnc:module-begin-syntax form ...)
(eval-when (load compile eval expand) (begin form ...)))

7
libgnucash/gnc-module/test/mod-bar/Makefile.am
View File

@@ -25,13 +25,6 @@ libgncmodbar_la_LIBADD=libbar.la \
if BUILDING_FROM_VCS
swig-bar.c: bar.i
$(SWIG) -guile -Linkage module -o $@ $<
if ! OS_WIN32
if ! SWIG_DIST_FAIL
if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
patch $@ $(top_srcdir)/common/swig-utf8.patch; \
fi
endif
endif
endif
EXTRA_DIST = \

7
libgnucash/gnc-module/test/mod-baz/Makefile.am
View File

@@ -29,13 +29,6 @@ libgncmodbaz_la_LIBADD = \
if BUILDING_FROM_VCS
swig-baz.c: baz.i
$(SWIG) -guile -Linkage module -o $@ $<
if ! OS_WIN32
if ! SWIG_DIST_FAIL
if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
patch $@ $(top_srcdir)/common/swig-utf8.patch; \
fi
endif
endif
endif
EXTRA_DIST = \

7
libgnucash/gnc-module/test/mod-foo/Makefile.am
View File

@@ -31,13 +31,6 @@ EXTRA_DIST = \
if BUILDING_FROM_VCS
swig-foo.c: foo.i
$(SWIG) -guile -Linkage module -o $@ $<
if ! OS_WIN32
if ! SWIG_DIST_FAIL
if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \
patch $@ $(top_srcdir)/common/swig-utf8.patch; \
fi
endif
endif
endif
BUILT_SOURCES = swig-foo.c