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

Report fs cleanup - move utility reports to sample directory

Browse Source 
And have them load by the same generic load mechanism
This commit is contained in:
Geert Janssens 2019-04-05 22:00:11 +02:00
parent f2368700a8
commit 2ac9e21378
14 changed files with 42 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnucash/report/CMakeLists.txt
View File

@ -5,8 +5,7 @@ add_subdirectory(report-gnome)
add_subdirectory(report-system)
add_subdirectory(reports)
add_subdirectory(stylesheets)
add_subdirectory(utility-reports)
set_local_dist(report_DIST_local CMakeLists.txt )
set(report_DIST ${report_DIST_local} ${jqplot_DIST} ${locale_specific_DIST} ${report_gnome_DIST} ${report_system_DIST}
${reports_DIST} ${stylesheets_DIST} ${utility_reports_DIST} PARENT_SCOPE)
${reports_DIST} ${stylesheets_DIST} PARENT_SCOPE)

1
gnucash/report/report-gnome/CMakeLists.txt
View File

@ -63,7 +63,6 @@ set(GUILE_DEPENDS
scm-scm
scm-report-system
scm-reports
scm-utility-reports
)
gnc_add_scheme_targets(scm-report-gnome

1
gnucash/report/report-gnome/gncmod-report-gnome.c
View File

@ -89,7 +89,6 @@ libgncmod_report_gnome_gnc_module_init(int refcount)
}
lmod ("(gnucash report reports)");
lmod ("(gnucash report utility-reports)");
scm_init_sw_report_gnome_module();

2
gnucash/report/report-gnome/report-gnome.scm
View File

@ -29,7 +29,7 @@
(use-modules (gnucash gnc-module))
(use-modules (gnucash gnome-utils))
(use-modules (gnucash gettext))
(use-modules (gnucash report utility-reports))
(use-modules (gnucash report reports sample welcome-to-gnucash))
(eval-when (compile load eval expand)
(load-extension "libgncmod-gnome-utils" "scm_init_sw_gnome_utils_module")

31
gnucash/report/reports/CMakeLists.txt
View File

@ -51,6 +51,13 @@ set (reports_standard_SCHEME
standard/balsheet-eg.scm
)
set(reports_sample_SCHEME
sample/hello-world.scm
sample/view-column.scm
sample/welcome-to-gnucash.scm
)
set(scm_rpts_GUILE_DEPENDS
gncmod-html
scm-core-utils
@ -61,6 +68,18 @@ set(scm_rpts_GUILE_DEPENDS
scm-report-system
)
set(scm_rpt_sample_GUILE_DEPENDS
gncmod-html
scm-app-utils
scm-core-utils
scm-gettext
scm-gnc-module
scm-scm
scm-reports-sample-links
scm-gnome-utils
scm-report-system
)
set(scm_rpt_std_GUILE_DEPENDS
${scm_rpts_GUILE_DEPENDS}
scm-app-utils
@ -90,7 +109,15 @@ gnc_add_scheme_targets(scm-reports-standard
TRUE
)
add_custom_target(scm-reports ALL DEPENDS scm-reports-standard scm-reports-common scm-rpt-reports)
set_local_dist(reports_DIST_local CMakeLists.txt ${reports_SCHEME} ${reports_common_SCHEME} ${reports_standard_SCHEME})
gnc_add_scheme_targets(scm-reports-sample
"${reports_sample_SCHEME}"
"gnucash/report/reports/sample"
"${scm_rpt_sample_GUILE_DEPENDS}"
TRUE
)
add_custom_target(scm-reports ALL DEPENDS scm-reports-standard scm-reports-sample scm-reports-common scm-rpt-reports)
set_local_dist(reports_DIST_local CMakeLists.txt ${reports_SCHEME} ${reports_common_SCHEME} ${reports_standard_SCHEME} ${reports_sample_SCHEME})
set(reports_DIST ${reports_DIST_local} ${reports_support_DIST} ${test_reports_standard_DIST} PARENT_SCOPE)

3
gnucash/report/reports/reports.scm
View File

@ -43,6 +43,7 @@
(define report-dirs (list
"standard" ; base directory for standard reports included in gnucash
"sample" ; base directory for experimental and sample reports included in gnucash
))
;; Returns a list of files in a directory
@ -96,6 +97,8 @@
(get-report-list rpt-dir-str)))
report-dirs)
;;(use-modules (gnucash report test-graphing))
(use-modules (gnucash gnc-module))
(gnc:module-load "gnucash/engine" 0)

2
gnucash/report/utility-reports/hello-world.scm → gnucash/report/reports/sample/hello-world.scm
View File

@ -23,7 +23,7 @@
;; It illustrates the basic techniques used to create
;; new reports for GnuCash.
(define-module (gnucash report hello-world))
(define-module (gnucash report reports sample hello-world))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

2
gnucash/report/utility-reports/test-graphing.scm → gnucash/report/reports/sample/test-graphing.scm
View File

@ -23,7 +23,7 @@
;; It illustrates the basic techniques used to create
;; new reports for GnuCash.
(define-module (gnucash report test-graphing))
(define-module (gnucash report reports sample test-graphing))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))

2
gnucash/report/utility-reports/view-column.scm → gnucash/report/reports/sample/view-column.scm
View File

@ -26,7 +26,7 @@
;; edited in a special window. Every view gets a stylesheet so we
;; don't have to worry about that here.
(define-module (gnucash report view-column))
(define-module (gnucash report reports sample view-column))
(use-modules (gnucash utilities))
(use-modules (gnucash app-utils))
(use-modules (gnucash gnc-module))

2
gnucash/report/utility-reports/welcome-to-gnucash.scm → gnucash/report/reports/sample/welcome-to-gnucash.scm
View File

@ -20,7 +20,7 @@
;; Boston, MA 02110-1301, USA gnu@gnu.org
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report welcome-to-gnucash))
(define-module (gnucash report reports sample welcome-to-gnucash))
(export gnc:make-welcome-report)
(use-modules (gnucash utilities))

2
gnucash/report/reports/standard/test/test-stress-options.scm
View File

@ -5,7 +5,7 @@
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
(use-modules (gnucash engine test test-extras))
(use-modules (gnucash report reports))
(use-modules (gnucash report view-column))
(use-modules (gnucash report reports sample view-column))
(use-modules (gnucash report stylesheets))
(use-modules (gnucash report reports standard taxinvoice))
(use-modules (gnucash report report-system))

32
gnucash/report/utility-reports/CMakeLists.txt
View File

@ -1,32 +0,0 @@
# Scheme
set(utility_reports_SCHEME
hello-world.scm
utility-reports.scm
view-column.scm
welcome-to-gnucash.scm
)
set(GUILE_OUTPUT_DIR gnucash/report)
set(GUILE_DEPENDS
gncmod-html
scm-app-utils
scm-core-utils
scm-gettext
scm-gnc-module
scm-scm
scm-utility-reports-links
scm-gnome-utils
scm-report-system
)
gnc_add_scheme_targets(scm-utility-reports
"${utility_reports_SCHEME}"
${GUILE_OUTPUT_DIR}
"${GUILE_DEPENDS}"
TRUE
)
set_local_dist(utility_reports_DIST_local CMakeLists.txt
${utility_reports_SCHEME})
set(utility_reports_DIST ${utility_reports_DIST_local} ${test_utility_reports_DIST} PARENT_SCOPE)

36
gnucash/report/utility-reports/utility-reports.scm
View File

@ -1,36 +0,0 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; utility-reports.scm
;; load the utility report definitions
;;
;; Copyright (c) 2001 Linux Developers Group, Inc.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; This program is free software; you can redistribute it and/or
;; modify it under the terms of the GNU General Public License as
;; published by the Free Software Foundation; either version 2 of
;; the License, or (at your option) any later version.
;;
;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;;
;; You should have received a copy of the GNU General Public License
;; along with this program; if not, contact:
;;
;; Free Software Foundation Voice: +1-617-542-5942
;; 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652
;; Boston, MA 02110-1301, USA gnu@gnu.org
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report utility-reports))
(use-modules (gnucash utilities))
(use-modules (gnucash report hello-world))
(use-modules (gnucash report view-column))
(use-modules (gnucash report welcome-to-gnucash))
;;(use-modules (gnucash report test-graphing))
(re-export gnc:make-welcome-report)

7
po/POTFILES.in
View File

@ -425,6 +425,9 @@ gnucash/report/report-gnome/report-gnome.scm
gnucash/report/report-gnome/window-report.c
gnucash/report/reports/aging.scm
gnucash/report/reports/reports.scm
gnucash/report/reports/sample/hello-world.scm
gnucash/report/reports/sample/view-column.scm
gnucash/report/reports/sample/welcome-to-gnucash.scm
gnucash/report/reports/standard/account-piecharts.scm
gnucash/report/reports/standard/account-summary.scm
gnucash/report/reports/standard/advanced-portfolio.scm
@ -501,10 +504,6 @@ gnucash/report/stylesheets/stylesheet-footer.scm
gnucash/report/stylesheets/stylesheet-head-or-tail.scm
gnucash/report/stylesheets/stylesheet-plain.scm
gnucash/report/stylesheets/stylesheets.scm
gnucash/report/utility-reports/hello-world.scm
gnucash/report/utility-reports/utility-reports.scm
gnucash/report/utility-reports/view-column.scm
gnucash/report/utility-reports/welcome-to-gnucash.scm
libgnucash/app-utils/app-utils.scm
libgnucash/app-utils/business-helpers.c
libgnucash/app-utils/business-options.c