Cmake - rework gnc_add_scheme_deprecated_module to use keyword parameters

Update all invocations accordingly
This commit is contained in:
Geert Janssens
2020-03-19 06:31:51 +01:00
parent ba15cf7f7f
commit e78313147c
11 changed files with 320 additions and 100 deletions

View File

@@ -43,7 +43,10 @@ gnc_add_scheme_test_targets(scm-test-engine-extras
DEPENDS "${GUILE_DEPENDS}")
# 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" "")
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}"
@@ -61,7 +64,10 @@ if (HAVE_SRFI64)
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 ("gnucash engine test srfi64-extras" "tests srfi64-extras" "scm-srfi64-extras" "")
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
@@ -121,5 +127,8 @@ set(test_guile_DIST
)
# Define two imaginary deprecated guile modules to test the compat file generation code
gnc_add_scheme_deprecated_module ("gnucash deprecated-module" "" "" "")
gnc_add_scheme_deprecated_module ("gnucash superseded-module" "gnucash utilities" "scm-engine" "")
gnc_add_scheme_deprecated_module (OLD_MODULE "gnucash deprecated-module")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash superseded-module"
NEW_MODULE "gnucash utilities"
DEPENDS "scm-engine")

View File

@@ -304,29 +304,45 @@ function(gnc_add_scheme_test_targets _TARGET)
gnc_add_scheme_targets(${_TARGET} ${ARGN} TEST)
endfunction()
# gnc_add_scheme_deprecated_module (OLD_MODULE old_module_name
# [NEW_MODULE new_module_name
# DEPENDS new_module_target]
# [MESSAGE msg_string])
#
# Function to write boilerplate code for deprecated guile modules
# All but the _OLDMOD parameter are optional
# It will emit a deprecation warning and if _NEWMOD is also given
# that module will be loaded instead.
# If _NEWMOD is given, _DEPENDS should be set to the target for which
# such that invocation of the old module will emit a deprecation warning
# message.
#
# All but the OLD_MODULE keyword are optional
#
# OLD_MODULE and NEW_MODULE should be passed in the form
# "gnucash mod parts"
#
# If NEW_MODULE is set that module will be loaded instead of the
# deprecated module.
# If NEW_MODULE is set, DEPENDS should be set to the target for which
# that module is a source file.
# For example module (gnucash reports standard transaction)
# is defined in transaction.scm, which is a source file for
# cmake target scm-reports-standard so that should be set as _DEPENDS.
# cmake target scm-reports-standard so that should be set as DEPENDS.
#
# If MESSAGE is left blank, the module will emit a generic message.
# Otherwise MESSAGE will be emitted.
function(gnc_add_scheme_deprecated_module)
# The function expects module names in the form "gnucash mod parts"
# If _DEPMSG is left blank, the module will emit a generic message,
# otherswise _DEPMSG will be emitted.
function(gnc_add_scheme_deprecated_module _OLDMOD _NEWMOD _DEPENDS _DEPMSG)
string(STRIP _OLDMOD "${_OLDMOD}")
string(REPLACE " " "-" _TARGET ${_OLDMOD})
set(singleValues OLD_MODULE NEW_MODULE MESSAGE)
set(multiValues DEPENDS)
cmake_parse_arguments(DM "" "${singleValues}" "${multiValues}" ${ARGN})
string(STRIP DM_OLD_MODULE "${DM_OLD_MODULE}")
string(REPLACE " " "-" _TARGET ${DM_OLD_MODULE})
set(_TARGET "scm-deprecated-${_TARGET}")
string(REPLACE " " ";" MODPARTS "${_OLDMOD}")
string(REPLACE " " ";" MODPARTS "${DM_OLD_MODULE}")
list(GET MODPARTS -1 DEPFILENAME)
set(SOURCEFILE "${CMAKE_CURRENT_BINARY_DIR}/deprecated/${DEPFILENAME}.scm")
string(FIND "${_OLDMOD}" ${DEPFILENAME} POS REVERSE)
string(FIND "${DM_OLD_MODULE}" ${DEPFILENAME} POS REVERSE)
if (${POS} LESS 2)
set(MODPATH "gnucash/deprecated")
else()
@@ -336,38 +352,38 @@ function(gnc_add_scheme_deprecated_module _OLDMOD _NEWMOD _DEPENDS _DEPMSG)
endif()
set(DEPPREFIX "* WARN <gnc-guile-deprecation> *: ")
if (_DEPMSG)
set(DEPWARNING "(issue-deprecation-warning \"${DEPPREFIX}${_DEPMSG}\")")
if (DM_MESSAGE)
set(DEPWARNING "(issue-deprecation-warning \"${DEPPREFIX}${DM_MESSAGE}\")")
else()
set(DEPWARNING
"(issue-deprecation-warning \"${DEPPREFIX}Module '(${_OLDMOD})' has been deprecated and will be removed in the future.\")")
if (_NEWMOD)
"(issue-deprecation-warning \"${DEPPREFIX}Module '(${DM_OLD_MODULE})' has been deprecated and will be removed in the future.\")")
if (DM_NEW_MODULE)
set(DEPWARNING "${DEPWARNING}
(issue-deprecation-warning \"${DEPPREFIX}Use module '(${_NEWMOD})' instead.\")")
(issue-deprecation-warning \"${DEPPREFIX}Use module '(${DM_NEW_MODULE})' instead.\")")
endif()
endif()
# Write the stub file
file(WRITE ${SOURCEFILE} "
;; ${DEPFILENAME}.scm
;; Compatibility module for deprecated (${_OLDMOD}).
;; Compatibility module for deprecated (${DM_OLD_MODULE}).
;; This file is autogenerated, do not modify by hand.
(define-module (${_OLDMOD}))
(define-module (${DM_OLD_MODULE}))
${DEPWARNING}
")
if (_NEWMOD)
if (DM_NEW_MODULE)
file(APPEND ${SOURCEFILE} "
(use-modules (${_NEWMOD}))
(use-modules (${DM_NEW_MODULE}))
(let ((i (module-public-interface (current-module))))
(module-use! i (resolve-interface '(${_NEWMOD}))))")
(module-use! i (resolve-interface '(${DM_NEW_MODULE}))))")
endif()
gnc_add_scheme_targets("${_TARGET}"
SOURCES "${SOURCEFILE}"
OUTPUT_DIR "${MODPATH}"
DEPENDS "${_DEPENDS}")
DEPENDS "${DM_DEPENDS}")
endfunction()

View File

@@ -67,7 +67,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" "")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash unittest-support"
NEW_MODULE "tests unittest-support"
DEPENDS "scm-test-core")
if (GTEST_SRC_DIR)

View File

@@ -257,7 +257,10 @@ gnc_add_scheme_targets(scm-gnome
DEPENDS "${GUILE_DEPENDS}")
# 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" "")
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

View File

@@ -88,8 +88,14 @@ gnc_add_scheme_targets(scm-qif-import
MAKE_LINKS)
# 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" "")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash import-export qif-import"
NEW_MODULE "gnucash qif-import"
DEPENDS "scm-qif-import-2")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash import-export string"
NEW_MODULE "gnucash string"
DEPENDS "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})

View File

@@ -119,16 +119,28 @@ gnc_add_scheme_targets(scm-report-eguile
DEPENDS scm-report-eguile-parts)
# 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-2" "")
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 ("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" "" "" "")
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)

View File

@@ -171,54 +171,198 @@ add_custom_target(scm-reports ALL DEPENDS
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 account-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" "")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report standard-reports"
NEW_MODULE "gnucash reports"
DEPENDS "scm-rpt-reports")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report aging"
NEW_MODULE "gnucash reports aging"
DEPENDS "scm-reports-common")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report standard-reports average-balance"
NEW_MODULE "gnucash reports example average-balance"
DEPENDS "scm-reports-example")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report standard-reports daily-reports"
NEW_MODULE "gnucash reports example daily-reports"
DEPENDS "scm-reports-example")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report hello-world"
NEW_MODULE "gnucash reports example hello-world"
DEPENDS "scm-reports-example")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report test-graphing"
NEW_MODULE "gnucash reports example sample-graphs"
DEPENDS "scm-reports-example")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report locale-specific de_DE"
NEW_MODULE "gnucash reports locale-specific de_DE taxtxf"
DEPENDS "scm-reports-de_DE")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report taxtxf-de_DE"
NEW_MODULE "gnucash reports locale-specific de_DE taxtxf"
DEPENDS "scm-reports-de_DE")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report locale-specific us"
NEW_MODULE "gnucash reports locale-specific us taxtxf"
DEPENDS "scm-reports-us")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report taxtxf"
NEW_MODULE "gnucash reports locale-specific us taxtxf"
DEPENDS "scm-reports-us")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report standard-reports account-piecharts"
NEW_MODULE "gnucash reports standard account-piecharts"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report standard-reports account-summary"
NEW_MODULE "gnucash reports standard account-summary"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report standard-reports advanced-portfolio"
NEW_MODULE "gnucash reports standard advanced-portfolio"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report standard-reports balance-forecast"
NEW_MODULE "gnucash reports standard balance-forecast"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report standard-reports balance-sheet"
NEW_MODULE "gnucash reports standard balance-sheet"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report balsheet-eg"
NEW_MODULE "gnucash reports standard balsheet-eg"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report standard-reports balsheet-pnl"
NEW_MODULE "gnucash reports standard balsheet-pnl"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report standard-reports budget-balance-sheet"
NEW_MODULE "gnucash reports standard budget-balance-sheet"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report standard-reports budget-barchart"
NEW_MODULE "gnucash reports standard budget-barchart"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report standard-reports budget-flow"
NEW_MODULE "gnucash reports standard budget-flow"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report standard-reports budget"
NEW_MODULE "gnucash reports standard budget"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report standard-reports budget-income-statement"
NEW_MODULE "gnucash reports standard budget-income-statement"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report standard-reports cashflow-barchart"
NEW_MODULE "gnucash reports standard cashflow-barchart"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report standard-reports cash-flow"
NEW_MODULE "gnucash reports standard cash-flow"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report standard-reports category-barchart"
NEW_MODULE "gnucash reports standard category-barchart"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report customer-summary"
NEW_MODULE "gnucash reports standard customer-summary"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report welcome-to-gnucash"
NEW_MODULE "gnucash reports standard dashboard"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report standard-reports equity-statement"
NEW_MODULE "gnucash reports standard equity-statement"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report standard-reports general-journal"
NEW_MODULE "gnucash reports standard general-journal"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report standard-reports general-ledger"
NEW_MODULE "gnucash reports standard general-ledger"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report standard-reports income-gst-statement"
NEW_MODULE "gnucash reports standard income-gst-statement"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report standard-reports income-statement"
NEW_MODULE "gnucash reports standard income-statement"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report invoice"
NEW_MODULE "gnucash reports standard invoice"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report job-report"
NEW_MODULE "gnucash reports standard job-report"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report standard-reports net-charts"
NEW_MODULE "gnucash reports standard net-charts"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report owner-report"
NEW_MODULE "gnucash reports standard owner-report"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report payables"
NEW_MODULE "gnucash reports standard payables"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report standard-reports portfolio"
NEW_MODULE "gnucash reports standard portfolio"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report standard-reports price-scatter"
NEW_MODULE "gnucash reports standard price-scatter"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report receipt"
NEW_MODULE "gnucash reports standard receipt"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report receivables"
NEW_MODULE "gnucash reports standard receivables"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report standard-reports reconcile-report"
NEW_MODULE "gnucash reports standard reconcile-report"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report standard-reports register"
NEW_MODULE "gnucash reports standard register"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report standard-reports sx-summary"
NEW_MODULE "gnucash reports standard account-summary"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report taxinvoice"
NEW_MODULE "gnucash reports standard taxinvoice"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report standard-reports transaction"
NEW_MODULE "gnucash reports standard transaction"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report standard-reports trial-balance"
NEW_MODULE "gnucash reports standard trial-balance"
DEPENDS "scm-reports-standard")
gnc_add_scheme_deprecated_module (
OLD_MODULE "gnucash report view-column"
NEW_MODULE "gnucash reports standard view-column"
DEPENDS "scm-reports-standard")
set_local_dist(reports_DIST_local CMakeLists.txt ${reports_SCHEME}
${reports_common_SCHEME} ${reports_standard_SCHEME} ${reports_standard_SCHEME_2}

View File

@@ -22,11 +22,26 @@ gnc_add_scheme_targets(scm-report-stylesheets-1
MAKE_LINKS)
# Module interfaces deprecated in 4.x, will be removed for 5.x
gnc_add_scheme_deprecated_module ("gnucash report stylesheet-easy" "gnucash report stylesheets footer" "scm-report-stylesheets-1" "")
gnc_add_scheme_deprecated_module ("gnucash report stylesheet-fancy" "gnucash report stylesheets footer" "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" "")
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)

View File

@@ -66,4 +66,7 @@ set_dist_list(test_report_DIST
)
# 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" "")
gnc_add_scheme_deprecated_module (
OLD_MODULE "tests test-report-system-extras"
NEW_MODULE "tests test-report-extras"
DEPENDS "scm-test-report")

View File

@@ -186,9 +186,12 @@ gnc_add_scheme_targets(scm-app-utils-2
DEPENDS "scm-app-utils-1")
# 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" "" "" "")
gnc_add_scheme_deprecated_module ("gnucash gettext" "gnucash core-utils" "scm-core-utils" "")
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)

View File

@@ -55,8 +55,14 @@ gnc_add_scheme_targets(scm-tax-de_DE-2
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 ("gnucash tax de_DE" "gnucash locale de_DE tax" "scm-tax-de_DE-2" "")
gnc_add_scheme_deprecated_module ("gnucash tax us" "gnucash locale us tax" "scm-tax-us-2" "")
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 )