From a0aa105826264430da63428eefd067b161f3a7bd Mon Sep 17 00:00:00 2001
From: Geert Janssens <geert@kobaltwit.be>
Date: Mon, 30 Sep 2019 19:33:58 +0200
Subject: [PATCH] libgnucash/scm - move to bindings/guile

A small step in the direction of making libgnucash guile-free.
---
 bindings/CMakeLists.txt                                       | 3 ++-
 {libgnucash/scm => bindings/guile}/CMakeLists.txt             | 4 ++--
 {libgnucash/scm => bindings/guile}/price-quotes.scm           | 0
 {libgnucash/scm => bindings/guile}/test/CMakeLists.txt        | 4 ++--
 .../scm => bindings/guile}/test/test-module-deprecation.scm   | 0
 .../guile/test/test-scm-utilities.scm                         | 4 ++--
 {libgnucash/scm => bindings/guile}/utilities.scm              | 0
 libgnucash/CMakeLists.txt                                     | 3 +--
 po/POTFILES.in                                                | 4 ++--
 9 files changed, 11 insertions(+), 11 deletions(-)
 rename {libgnucash/scm => bindings/guile}/CMakeLists.txt (66%)
 rename {libgnucash/scm => bindings/guile}/price-quotes.scm (100%)
 rename {libgnucash/scm => bindings/guile}/test/CMakeLists.txt (92%)
 rename {libgnucash/scm => bindings/guile}/test/test-module-deprecation.scm (100%)
 rename libgnucash/scm/test/test-libgnucash-scm-utilities.scm => bindings/guile/test/test-scm-utilities.scm (97%)
 rename {libgnucash/scm => bindings/guile}/utilities.scm (100%)

diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt
index 61450f669d..268222cbd4 100644
--- a/bindings/CMakeLists.txt
+++ b/bindings/CMakeLists.txt
@@ -1,4 +1,5 @@
+add_subdirectory(guile)
 add_subdirectory(python)
 
 set_local_dist(bindings_DIST_local CMakeLists.txt )
-set(bindings_DIST ${bindings_DIST_local} ${python_bindings_DIST} PARENT_SCOPE)
+set(bindings_DIST ${bindings_DIST_local} ${guile_DIST} ${python_bindings_DIST} PARENT_SCOPE)
diff --git a/libgnucash/scm/CMakeLists.txt b/bindings/guile/CMakeLists.txt
similarity index 66%
rename from libgnucash/scm/CMakeLists.txt
rename to bindings/guile/CMakeLists.txt
index 5b3ce0e860..7d1aae9649 100644
--- a/libgnucash/scm/CMakeLists.txt
+++ b/bindings/guile/CMakeLists.txt
@@ -18,7 +18,7 @@ gnc_add_scheme_targets(price-quotes
   FALSE)
 
 
-set_local_dist(scm_DIST_local CMakeLists.txt utilities.scm price-quotes.scm)
-set(scm_DIST ${scm_DIST_local} ${scm_gnumeric_DIST} ${test_scm_DIST} PARENT_SCOPE)
+set_local_dist(guile_DIST_local CMakeLists.txt utilities.scm price-quotes.scm)
+set(guile_DIST ${guile_DIST_local} ${test_guile_DIST} PARENT_SCOPE)
 
 
diff --git a/libgnucash/scm/price-quotes.scm b/bindings/guile/price-quotes.scm
similarity index 100%
rename from libgnucash/scm/price-quotes.scm
rename to bindings/guile/price-quotes.scm
diff --git a/libgnucash/scm/test/CMakeLists.txt b/bindings/guile/test/CMakeLists.txt
similarity index 92%
rename from libgnucash/scm/test/CMakeLists.txt
rename to bindings/guile/test/CMakeLists.txt
index 544e446ab0..df1d3a692c 100644
--- a/libgnucash/scm/test/CMakeLists.txt
+++ b/bindings/guile/test/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(scm_test_SCHEME
-  test-libgnucash-scm-utilities.scm
+  test-scm-utilities.scm
   test-module-deprecation.scm
   )
 
@@ -24,7 +24,7 @@ if (HAVE_SRFI64)
 
 endif (HAVE_SRFI64)
 
-set_dist_list(test_scm_DIST
+set_dist_list(test_guile_DIST
   CMakeLists.txt
   ${scm_test_SCHEME}
   )
diff --git a/libgnucash/scm/test/test-module-deprecation.scm b/bindings/guile/test/test-module-deprecation.scm
similarity index 100%
rename from libgnucash/scm/test/test-module-deprecation.scm
rename to bindings/guile/test/test-module-deprecation.scm
diff --git a/libgnucash/scm/test/test-libgnucash-scm-utilities.scm b/bindings/guile/test/test-scm-utilities.scm
similarity index 97%
rename from libgnucash/scm/test/test-libgnucash-scm-utilities.scm
rename to bindings/guile/test/test-scm-utilities.scm
index 9c73336a15..a335fb13cd 100644
--- a/libgnucash/scm/test/test-libgnucash-scm-utilities.scm
+++ b/bindings/guile/test/test-scm-utilities.scm
@@ -6,13 +6,13 @@
 
 (define (run-test)
   (test-runner-factory gnc:test-runner)
-  (test-begin "test-libgnucash-scm-utilities.scm")
+  (test-begin "test-scm-utilities.scm")
   (test-traverse-vec)
   (test-substring-replace)
   (test-sort-and-delete-duplicates)
   (test-gnc:html-string-sanitize)
   (test-gnc:list-flatten)
-  (test-begin "test-libgnucash-scm-utilities.scm"))
+  (test-begin "test-scm-utilities.scm"))
 
 (define (test-traverse-vec)
   (test-begin "traverse-vec")
diff --git a/libgnucash/scm/utilities.scm b/bindings/guile/utilities.scm
similarity index 100%
rename from libgnucash/scm/utilities.scm
rename to bindings/guile/utilities.scm
diff --git a/libgnucash/CMakeLists.txt b/libgnucash/CMakeLists.txt
index f6e6ef6a51..a0ea47cf49 100644
--- a/libgnucash/CMakeLists.txt
+++ b/libgnucash/CMakeLists.txt
@@ -8,7 +8,6 @@ add_subdirectory (doc)
 add_subdirectory (engine)
 add_subdirectory (gnc-module)
 add_subdirectory (quotes)
-add_subdirectory (scm)
 add_subdirectory (tax)
 
 add_definitions (-DHAVE_CONFIG_H)
@@ -17,4 +16,4 @@ set_local_dist(libgnucash_DIST_local CMakeLists.txt ${libgnucash_EXTRA_DIST})
 
 set(libgnucash_DIST ${libgnucash_DIST_local} ${app_utils_DIST} ${backend_DIST}
              ${core_utils_DIST} ${doc_DIST} ${engine_DIST} ${gnc_module_DIST}
-             ${quotes_DIST} ${scm_DIST} ${tax_DIST} PARENT_SCOPE)
+             ${quotes_DIST} ${tax_DIST} PARENT_SCOPE)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1c147ff059..e55d034e53 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,7 @@
 # This is a list of files which contain translatable strings.
 # This file was autogenerated by cmake.
+bindings/guile/price-quotes.scm
+bindings/guile/utilities.scm
 borrowed/goffice/go-charmap-sel.c
 borrowed/goffice/go-glib-extras.c
 borrowed/goffice/go-optionmenu.c
@@ -692,8 +694,6 @@ libgnucash/engine/TransLog.c
 libgnucash/gnc-module/example/gncmod-example.c
 libgnucash/gnc-module/gnc-module.c
 libgnucash/gnc-module/gnc-module.scm
-libgnucash/scm/price-quotes.scm
-libgnucash/scm/utilities.scm
 libgnucash/tax/de_DE/tax.scm
 libgnucash/tax/de_DE/txf-help.scm
 libgnucash/tax/de_DE/txf.scm