From 06fae12265bd33671046702609cff8c8dcab4a7f Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Sat, 15 Jun 2019 16:12:25 +0200 Subject: [PATCH] RptCleanup - Add compat interface for all module interfaces that were deprecated so far These can be permanently removed for the gnucash 5.x series. A comment has been added to that effect. --- common/test-core/CMakeLists.txt | 4 ++ gnucash/gnome/CMakeLists.txt | 4 ++ gnucash/import-export/qif-imp/CMakeLists.txt | 4 ++ gnucash/report/CMakeLists.txt | 14 +++++- gnucash/report/reports/CMakeLists.txt | 50 ++++++++++++++++++++ gnucash/report/stylesheets/CMakeLists.txt | 7 +++ gnucash/report/test/CMakeLists.txt | 3 ++ libgnucash/app-utils/CMakeLists.txt | 4 ++ libgnucash/engine/test/CMakeLists.txt | 5 ++ libgnucash/tax/us/CMakeLists.txt | 4 ++ 10 files changed, 98 insertions(+), 1 deletion(-) diff --git a/common/test-core/CMakeLists.txt b/common/test-core/CMakeLists.txt index afb7f0ec0c..30bcf4d5dd 100644 --- a/common/test-core/CMakeLists.txt +++ b/common/test-core/CMakeLists.txt @@ -68,6 +68,10 @@ 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 ("gnucash unittest-support" "tests unittest-support" "scm-test-core" "") + + if(NOT GTEST_SHARED_LIB) set (lib_gtest_SOURCES ${GTEST_SRC_DIR}/src/gtest-all.cc) add_library(gtest STATIC ${lib_gtest_SOURCES}) diff --git a/gnucash/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt index 3cc49321d8..b16eaf4bae 100644 --- a/gnucash/gnome/CMakeLists.txt +++ b/gnucash/gnome/CMakeLists.txt @@ -240,6 +240,10 @@ ${GUILE_OUTPUT_DIR} "${GUILE_DEPENDS}" FALSE ) + +# Module interfaces deprecated in 4.x, will be removed for 5.x +gnc_add_scheme_deprecated_module ("gnucash report report-gnome" "gnucash report-menus" "scm-gnome" "") + set_dist_list(gnome_DIST CMakeLists.txt gnome.i gnucash.appdata.xml.in gnucash.desktop.in.in ${gnc_gnome_noinst_HEADERS} ${gnc_gnome_SOURCES} ${gnome_SCHEME}) diff --git a/gnucash/import-export/qif-imp/CMakeLists.txt b/gnucash/import-export/qif-imp/CMakeLists.txt index c7e9637114..cacd62f28a 100644 --- a/gnucash/import-export/qif-imp/CMakeLists.txt +++ b/gnucash/import-export/qif-imp/CMakeLists.txt @@ -90,6 +90,10 @@ gnc_add_scheme_targets(scm-qif-import TRUE ) +# Module interfaces deprecated in 4.x, will be removed for 5.x +gnc_add_scheme_deprecated_module ("gnucash import-export qif-import" "gnucash qif-import" "scm-qif-import-2" "") +gnc_add_scheme_deprecated_module ("gnucash import-export string" "gnucash string" "scm-qif-import-0" "") + 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) diff --git a/gnucash/report/CMakeLists.txt b/gnucash/report/CMakeLists.txt index 093a4f6e7d..20e949bc88 100644 --- a/gnucash/report/CMakeLists.txt +++ b/gnucash/report/CMakeLists.txt @@ -116,10 +116,22 @@ gnc_add_scheme_targets(scm-report-eguile-parts gnc_add_scheme_targets(scm-report-eguile "${report_eguile_SCHEME}" "gnucash" - scm-report-1 + scm-report-equile-parts FALSE ) +# Module interfaces deprecated in 4.x, will be removed for 5.x +gnc_add_scheme_deprecated_module ("gnucash report eguile-gnc" "gnucash eguile" "scm-report-eguile" "") +gnc_add_scheme_deprecated_module ("gnucash report eguile-html-utilities" "gnucash eguile" "scm-report-eguile" "") +gnc_add_scheme_deprecated_module ("gnucash report eguile-utilities" "gnucash eguile" "scm-report-eguile" "") +gnc_add_scheme_deprecated_module ("gnucash report report-system" "gnucash report" "scm-report-1" "") + +gnc_add_scheme_deprecated_module ("gnucash report business-reports" "" "" "") +gnc_add_scheme_deprecated_module ("gnucash report report-system collectors" "" "" "") +gnc_add_scheme_deprecated_module ("gnucash report report-system report-collectors" "" "" "") +gnc_add_scheme_deprecated_module ("gnucash report stylesheets" "" "" "") +gnc_add_scheme_deprecated_module ("gnucash report utility-reports" "" "" "") + add_custom_target(scm-report ALL DEPENDS scm-report-eguile) set_local_dist(report_DIST_local CMakeLists.txt diff --git a/gnucash/report/reports/CMakeLists.txt b/gnucash/report/reports/CMakeLists.txt index 79431b2aa1..76a0d5c643 100644 --- a/gnucash/report/reports/CMakeLists.txt +++ b/gnucash/report/reports/CMakeLists.txt @@ -159,6 +159,56 @@ add_custom_target(scm-reports ALL DEPENDS scm-reports-us scm-reports-de_DE) +# Module interfaces deprecated in 4.x, will be removed for 5.x +gnc_add_scheme_deprecated_module ("gnucash report standard-reports" "gnucash reports" "scm-rpt-reports" "") +gnc_add_scheme_deprecated_module ("gnucash report aging" "gnucash reports aging" "scm-reports-common" "") +gnc_add_scheme_deprecated_module ("gnucash report standard-reports average-balance" "gnucash reports example average-balance" "scm-reports-example" "") +gnc_add_scheme_deprecated_module ("gnucash report standard-reports daily-reports" "gnucash reports example daily-reports" "scm-reports-example" "") +gnc_add_scheme_deprecated_module ("gnucash report hello-world" "gnucash reports example hello-world" "scm-reports-example" "") +gnc_add_scheme_deprecated_module ("gnucash report test-graphing" "gnucash reports example sample-graphs" "scm-reports-example" "") +gnc_add_scheme_deprecated_module ("gnucash report locale-specific de_DE" "gnucash reports locale-specific de_DE taxtxf" "scm-reports-de_DE" "") +gnc_add_scheme_deprecated_module ("gnucash report taxtxf-de_DE" "gnucash reports locale-specific de_DE taxtxf" "scm-reports-de_DE" "") +gnc_add_scheme_deprecated_module ("gnucash report locale-specific us" "gnucash reports locale-specific us taxtxf" "scm-reports-us" "") +gnc_add_scheme_deprecated_module ("gnucash report taxtxf" "gnucash reports locale-specific us taxtxf" "scm-reports-us" "") +gnc_add_scheme_deprecated_module ("gnucash report standard-reports account-piecharts" "gnucash reports standard account-piecharts" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report standard-reports account-summary" "gnucash reports standard account-summary" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report standard-reports advanced-portfolio" "gnucash reports standard advanced-portfolio" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report standard-reports balance-forecast" "gnucash reports standard balance-forecast" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report standard-reports balance-sheet" "gnucash reports standard balance-sheet" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report balsheet-eg" "gnucash reports standard balsheet-eg" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report standard-reports balsheet-pnl" "gnucash reports standard balsheet-pnl" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report standard-reports budget-balance-sheet" "gnucash reports standard budget-balance-sheet" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report standard-reports budget-barchart" "gnucash reports standard budget-barchart" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report standard-reports budget-flow" "gnucash reports standard budget-flow" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report standard-reports budget" "gnucash reports standard budget" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report standard-reports budget-income-statement" "gnucash reports standard budget-income-statement" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report standard-reports cashflow-barchart" "gnucash reports standard cashflow-barchart" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report standard-reports cash-flow" "gnucash reports standard cash-flow" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report standard-reports category-barchart" "gnucash reports standard category-barchart" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report customer-summary" "gnucash reports standard customer-summary" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report welcome-to-gnucash" "gnucash reports standard dashboard" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report standard-reports equity-statement" "gnucash reports standard equity-statement" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report standard-reports general-journal" "gnucash reports standard general-journal" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report standard-reports general-ledger" "gnucash reports standard general-ledger" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report standard-reports income-gst-statement" "gnucash reports standard income-gst-statement" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report standard-reports income-statement" "gnucash reports standard income-statement" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report invoice" "gnucash reports standard invoice" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report job-report" "gnucash reports standard job-report" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report standard-reports net-charts" "gnucash reports standard net-charts" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report owner-report" "gnucash reports standard owner-report" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report payables" "gnucash reports standard payables" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report standard-reports portfolio" "gnucash reports standard portfolio" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report standard-reports price-scatter" "gnucash reports standard price-scatter" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report receipt" "gnucash reports standard receipt" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report receivables" "gnucash reports standard receivables" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report standard-reports reconcile-report" "gnucash reports standard reconcile-report" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report standard-reports register" "gnucash reports standard register" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report standard-reports sx-summary" "gnucash reports standard sx-summary" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report taxinvoice" "gnucash reports standard taxinvoice" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report standard-reports transaction" "gnucash reports standard transaction" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report standard-reports trial-balance" "gnucash reports standard trial-balance" "scm-reports-standard" "") +gnc_add_scheme_deprecated_module ("gnucash report view-column" "gnucash reports standard view-column" "scm-reports-standard" "") + set_local_dist(reports_DIST_local CMakeLists.txt ${reports_SCHEME} ${reports_common_SCHEME} ${reports_standard_SCHEME} ${reports_example_SCHEME} ${reports_us_SCHEME} ${reports_de_DE_SCHEME}) diff --git a/gnucash/report/stylesheets/CMakeLists.txt b/gnucash/report/stylesheets/CMakeLists.txt index 3a925cd444..cf049f8307 100644 --- a/gnucash/report/stylesheets/CMakeLists.txt +++ b/gnucash/report/stylesheets/CMakeLists.txt @@ -24,6 +24,13 @@ gnc_add_scheme_targets(scm-report-stylesheets-1 TRUE ) +# Module interfaces deprecated in 4.x, will be removed for 5.x +gnc_add_scheme_deprecated_module ("gnucash report stylesheet-easy" "gnucash report stylesheets easy" "scm-report-stylesheets-1" "") +gnc_add_scheme_deprecated_module ("gnucash report stylesheet-fancy" "gnucash report stylesheets fancy" "scm-report-stylesheets-1" "") +gnc_add_scheme_deprecated_module ("gnucash report stylesheet-footer" "gnucash report stylesheets footer" "scm-report-stylesheets-1" "") +gnc_add_scheme_deprecated_module ("gnucash report stylesheet-head-or-tail" "gnucash report stylesheets head-or-tail" "scm-report-stylesheets-1" "") +gnc_add_scheme_deprecated_module ("gnucash report stylesheet-plain" "gnucash report stylesheets plain" "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}) diff --git a/gnucash/report/test/CMakeLists.txt b/gnucash/report/test/CMakeLists.txt index c6e28b5d93..a9ce3b81e7 100644 --- a/gnucash/report/test/CMakeLists.txt +++ b/gnucash/report/test/CMakeLists.txt @@ -70,3 +70,6 @@ set_dist_list(test_report_DIST test-report-extras.scm test-link-module.c ) + +# Module interfaces deprecated in 4.x, will be removed for 5.x +gnc_add_scheme_deprecated_module ("tests test-report-system-extras" "tests test-report-extras" "scm-test-report" "") diff --git a/libgnucash/app-utils/CMakeLists.txt b/libgnucash/app-utils/CMakeLists.txt index aafc607adb..0cdd51c9b2 100644 --- a/libgnucash/app-utils/CMakeLists.txt +++ b/libgnucash/app-utils/CMakeLists.txt @@ -194,6 +194,10 @@ gnc_add_scheme_targets(scm-app-utils-2 FALSE ) +# Module interfaces deprecated in 4.x, will be removed for 5.x +gnc_add_scheme_deprecated_module ("migrate-prefs" "" "" "") +gnc_add_scheme_deprecated_module ("migrate-prefs-user" "" "" "") + add_custom_target(scm-app-utils ALL DEPENDS scm-app-utils-2 scm-app-utils-1 scm-gettext) set_local_dist(app_utils_DIST_local diff --git a/libgnucash/engine/test/CMakeLists.txt b/libgnucash/engine/test/CMakeLists.txt index 4f784c9a79..6dac16aa1d 100644 --- a/libgnucash/engine/test/CMakeLists.txt +++ b/libgnucash/engine/test/CMakeLists.txt @@ -241,6 +241,7 @@ if (HAVE_SRFI64) FALSE ) + gnc_add_scheme_deprecated_module ("gnucash engine test srfi64-extras" "tests srfi64-extras" "scm-srfi64-extras" "") endif (HAVE_SRFI64) gnc_add_scheme_test_targets(scm-test-engine @@ -253,6 +254,10 @@ gnc_add_scheme_test_targets(scm-test-engine add_dependencies(check scm-test-engine) gnc_add_scheme_tests("${engine_test_SCHEME}") +# Module interfaces deprecated in 4.x, will be removed for 5.x +gnc_add_scheme_deprecated_module ("gnucash engine test test-extras" "tests test-engine-extras" "scm-test-engine-extras" "") + + set(test_engine_SOURCES_DIST dummy.cpp gtest-gnc-int128.cpp diff --git a/libgnucash/tax/us/CMakeLists.txt b/libgnucash/tax/us/CMakeLists.txt index 7e0fd9bcc3..cfaf810b6c 100644 --- a/libgnucash/tax/us/CMakeLists.txt +++ b/libgnucash/tax/us/CMakeLists.txt @@ -57,6 +57,10 @@ gnc_add_scheme_targets(scm-tax-de_DE-2 FALSE ) +# Module interfaces deprecated in 4.x, will be removed for 5.x +gnc_add_scheme_deprecated_module ("gnucash tax de_DE" "gnucash tax-de_DE" "scm-tax-de_DE-2" "") +gnc_add_scheme_deprecated_module ("gnucash tax us" "gnucash tax-us" "scm-tax-us-2" "") + add_custom_target(scm-tax-us ALL DEPENDS scm-tax-us-1 scm-tax-us-2 scm-tax-de_DE-1 scm-tax-de_DE-2 ) set_local_dist(tax_us_DIST_local CMakeLists.txt ${tax_us_SOURCES}