Merge branch 'remove-scheme-deprecated-module' #891

bindings/guile/test/CMakeLists.txt

@@ -41,17 +41,10 @@ gnc_add_scheme_test_targets(scm-test-engine-extras
     OUTPUT_DIR "tests"
     DEPENDS "${GUILE_DEPENDS}")
 
-# Module interfaces deprecated in 4.x, will be removed for 5.x
-gnc_add_scheme_deprecated_module (
-    OLD_MODULE "gnucash engine test test-extras"
-    NEW_MODULE "tests test-engine-extras"
-    DEPENDS "scm-test-engine-extras")
-
 gnc_add_scheme_test_targets(scm-test-engine
-    SOURCES "${bindings_test_SCHEME}"
-    OUTPUT_DIR "tests"
-    DEPENDS "${GUILE_DEPENDS};scm-test-engine-extras")
-
+  SOURCES "${bindings_test_SCHEME}"
+  OUTPUT_DIR "tests"
+  DEPENDS "${GUILE_DEPENDS};scm-test-engine-extras")
 
 add_dependencies(check scm-test-engine)
 gnc_add_scheme_tests("${engine_test_SCHEME}")
@@ -62,12 +55,6 @@ if (HAVE_SRFI64)
         OUTPUT_DIR "tests"
         DEPENDS "${GUILE_DEPENDS};scm-test-engine-extras;scm-srfi64-extras")
 
-    # Module interfaces deprecated in 4.x, will be removed for 5.x
-    gnc_add_scheme_deprecated_module (
-        OLD_MODULE "gnucash engine test srfi64-extras"
-        NEW_MODULE "tests srfi64-extras"
-        DEPENDS "scm-srfi64-extras")
-
     set (scm_tests_with_srfi64_SOURCES
         test-business-core.scm
         )
@@ -125,6 +112,7 @@ set(test_guile_DIST
 )
 
 # Define two imaginary deprecated guile modules to test the compat file generation code
+# See commit bbcffa3ec for old code using this function.
 gnc_add_scheme_deprecated_module (OLD_MODULE "gnucash deprecated-module")
 gnc_add_scheme_deprecated_module (
     OLD_MODULE "gnucash superseded-module"

common/test-core/CMakeLists.txt

@@ -66,12 +66,6 @@ gnc_add_scheme_test_targets(scm-test-core
 
 add_dependencies(check scm-test-core)
 
-# Module interfaces deprecated in 4.x, will be removed for 5.x
-gnc_add_scheme_deprecated_module (
-    OLD_MODULE "gnucash unittest-support"
-    NEW_MODULE "tests unittest-support"
-    DEPENDS "scm-test-core")
-
 
 if (GTEST_SRC_DIR)
   # in contrast to GoogleTest build system libraries libgtest.a and libgtest_main.a

gnucash/gnome/CMakeLists.txt

@@ -255,12 +255,6 @@ gnc_add_scheme_targets(scm-gnome
     OUTPUT_DIR gnucash
     DEPENDS "${GUILE_DEPENDS}")
 
-# Module interfaces deprecated in 4.x, will be removed for 5.x
-gnc_add_scheme_deprecated_module (
-    OLD_MODULE "gnucash report report-gnome"
-    NEW_MODULE"gnucash report-menus"
-    DEPENDS "scm-gnome")
-
 set_dist_list(gnome_DIST
         CMakeLists.txt gnome.i gnucash.appdata.xml.in.in gnucash.desktop.in.in
         gnucash.releases.xml ${gnc_gnome_noinst_HEADERS} ${gnc_gnome_SOURCES} ${gnome_SCHEME})

gnucash/import-export/qif-imp/CMakeLists.txt

@@ -91,18 +91,6 @@ gnc_add_scheme_targets(scm-qif-import
     DEPENDS "${GUILE_DEPENDS};scm-qif-import-0"
     MAKE_LINKS)
 
-# Module interfaces deprecated in 4.x, will be removed for 5.x
-gnc_add_scheme_deprecated_module (
-    OLD_MODULE "gnucash import-export qif-import"
-    NEW_MODULE "gnucash qif-import"
-    DEPENDS "scm-qif-import-2"
-    MAKE_LINKS)
-gnc_add_scheme_deprecated_module (
-    OLD_MODULE "gnucash import-export string"
-    NEW_MODULE "gnucash string"
-    DEPENDS "scm-qif-import-0"
-    MAKE_LINKS)
-
 set_local_dist(qif_import_DIST_local CMakeLists.txt file-format.txt ${qif_import_SOURCES} ${qif_import_noinst_HEADERS}
         ${qif_import_SCHEME_0} ${qif_import_SCHEME} ${qif_import_SCHEME_2})
 set(qif_import_DIST ${qif_import_DIST_local} ${test_qif_import_DIST} PARENT_SCOPE)

gnucash/report/CMakeLists.txt

@@ -112,30 +112,6 @@ gnc_add_scheme_targets(scm-report-eguile
     OUTPUT_DIR "gnucash"
     DEPENDS scm-report-eguile-parts)
 
-# Module interfaces deprecated in 4.x, will be removed for 5.x
-gnc_add_scheme_deprecated_module (
-    OLD_MODULE "gnucash report eguile-gnc"
-    NEW_MODULE "gnucash eguile"
-    DEPENDS "scm-report-eguile")
-gnc_add_scheme_deprecated_module (
-    OLD_MODULE "gnucash report eguile-html-utilities"
-    NEW_MODULE "gnucash eguile"
-    DEPENDS "scm-report-eguile")
-gnc_add_scheme_deprecated_module (
-    OLD_MODULE "gnucash report eguile-utilities"
-    NEW_MODULE "gnucash eguile"
-    DEPENDS "scm-report-eguile")
-gnc_add_scheme_deprecated_module (
-    OLD_MODULE "gnucash report report-system"
-    NEW_MODULE "gnucash report"
-    DEPENDS "scm-report-2")
-
-gnc_add_scheme_deprecated_module (OLD_MODULE "gnucash report business-reports")
-gnc_add_scheme_deprecated_module (OLD_MODULE "gnucash report report-system collectors")
-gnc_add_scheme_deprecated_module (OLD_MODULE "gnucash report report-system report-collectors")
-gnc_add_scheme_deprecated_module (OLD_MODULE "gnucash report stylesheets")
-gnc_add_scheme_deprecated_module (OLD_MODULE "gnucash report utility-reports")
-
 add_custom_target(scm-report ALL DEPENDS scm-report-2 scm-report-eguile)
 
 set_local_dist(report_DIST_local CMakeLists.txt

gnucash/report/stylesheets/CMakeLists.txt

@@ -20,28 +20,6 @@ gnc_add_scheme_targets(scm-report-stylesheets-1
     DEPENDS "${GUILE_DEPENDS}"
     MAKE_LINKS)
 
-# Module interfaces deprecated in 4.x, will be removed for 5.x
-gnc_add_scheme_deprecated_module (
-    OLD_MODULE "gnucash report stylesheet-easy"
-    NEW_MODULE "gnucash report stylesheets footer"
-    DEPENDS "scm-report-stylesheets-1")
-gnc_add_scheme_deprecated_module (
-    OLD_MODULE  "gnucash report stylesheet-fancy"
-    NEW_MODULE "gnucash report stylesheets footer"
-    DEPENDS "scm-report-stylesheets-1")
-gnc_add_scheme_deprecated_module (
-    OLD_MODULE  "gnucash report stylesheet-footer"
-    NEW_MODULE "gnucash report stylesheets footer"
-    DEPENDS "scm-report-stylesheets-1")
-gnc_add_scheme_deprecated_module (
-    OLD_MODULE  "gnucash report stylesheet-head-or-tail"
-    NEW_MODULE "gnucash report stylesheets head-or-tail"
-    DEPENDS "scm-report-stylesheets-1")
-gnc_add_scheme_deprecated_module (
-    OLD_MODULE  "gnucash report stylesheet-plain"
-    NEW_MODULE "gnucash report stylesheets plain"
-    DEPENDS "scm-report-stylesheets-1")
-
 add_custom_target(scm-report-stylesheets ALL DEPENDS scm-report-stylesheets-1)
 
 set_local_dist(stylesheets_DIST_local CMakeLists.txt ${stylesheets_SCHEME})

gnucash/report/test/CMakeLists.txt

@@ -53,9 +53,3 @@ set_dist_list(test_report_DIST
   ${scm_test_report_SOURCES}
   test-report-extras.scm
 )
-
-# Module interfaces deprecated in 4.x, will be removed for 5.x
-gnc_add_scheme_deprecated_module (
-    OLD_MODULE "tests test-report-system-extras"
-    NEW_MODULE "tests test-report-extras"
-    DEPENDS "scm-test-report")

libgnucash/app-utils/CMakeLists.txt

@@ -225,14 +225,6 @@ gnc_add_scheme_targets(scm-app-utils-2
     DEPENDS "scm-bus-prefs"
     MAKE_LINKS)
 
-# Module interfaces deprecated in 4.x, will be removed for 5.x
-gnc_add_scheme_deprecated_module (OLD_MODULE "migrate-prefs")
-gnc_add_scheme_deprecated_module (OLD_MODULE "migrate-prefs-user")
-gnc_add_scheme_deprecated_module (
-    OLD_MODULE "gnucash gettext"
-    NEW_MODULE "gnucash core-utils"
-    DEPENDS "scm-core-utils")
-
 add_custom_target(scm-app-utils ALL DEPENDS scm-app-utils-2 scm-app-utils-1)
 
 set_local_dist(app_utils_DIST_local

libgnucash/tax/CMakeLists.txt

@@ -59,16 +59,6 @@ gnc_add_scheme_targets(scm-tax-de_DE-2
     OUTPUT_DIR "gnucash/locale/de_DE"
     DEPENDS "scm-tax-de_DE-1;${GUILE_DEPENDS}")
 
-# Module interfaces deprecated in 4.x, will be removed for 5.x
-gnc_add_scheme_deprecated_module (
-    OLD_MODULE "gnucash tax de_DE"
-    NEW_MODULE "gnucash locale de_DE tax"
-    DEPENDS "scm-tax-de_DE-2")
-gnc_add_scheme_deprecated_module (
-    OLD_MODULE "gnucash tax us"
-    NEW_MODULE "gnucash locale us tax"
-    DEPENDS "scm-tax-us-2")
-
 add_custom_target(scm-locale-tax ALL DEPENDS scm-tax-us-1 scm-tax-us-2 scm-tax-de_DE-1 scm-tax-de_DE-2 )
 
 set(de_DE_tax_EXTRA_DIST