diff --git a/gnucash/report/CMakeLists.txt b/gnucash/report/CMakeLists.txt index 5ce629451e..519d76e9ba 100644 --- a/gnucash/report/CMakeLists.txt +++ b/gnucash/report/CMakeLists.txt @@ -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) diff --git a/gnucash/report/report-gnome/CMakeLists.txt b/gnucash/report/report-gnome/CMakeLists.txt index 50731b065b..30995fd40b 100644 --- a/gnucash/report/report-gnome/CMakeLists.txt +++ b/gnucash/report/report-gnome/CMakeLists.txt @@ -63,7 +63,6 @@ set(GUILE_DEPENDS scm-scm scm-report-system scm-reports - scm-utility-reports ) gnc_add_scheme_targets(scm-report-gnome diff --git a/gnucash/report/report-gnome/gncmod-report-gnome.c b/gnucash/report/report-gnome/gncmod-report-gnome.c index ec2fdee2df..42051faf7f 100644 --- a/gnucash/report/report-gnome/gncmod-report-gnome.c +++ b/gnucash/report/report-gnome/gncmod-report-gnome.c @@ -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(); diff --git a/gnucash/report/report-gnome/report-gnome.scm b/gnucash/report/report-gnome/report-gnome.scm index 94af047712..69a7278582 100644 --- a/gnucash/report/report-gnome/report-gnome.scm +++ b/gnucash/report/report-gnome/report-gnome.scm @@ -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") diff --git a/gnucash/report/reports/CMakeLists.txt b/gnucash/report/reports/CMakeLists.txt index 2dfe6e4ee6..d669fc1a67 100644 --- a/gnucash/report/reports/CMakeLists.txt +++ b/gnucash/report/reports/CMakeLists.txt @@ -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) diff --git a/gnucash/report/reports/reports.scm b/gnucash/report/reports/reports.scm index 7ea3177701..8f49aa605b 100644 --- a/gnucash/report/reports/reports.scm +++ b/gnucash/report/reports/reports.scm @@ -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) diff --git a/gnucash/report/utility-reports/hello-world.scm b/gnucash/report/reports/sample/hello-world.scm similarity index 99% rename from gnucash/report/utility-reports/hello-world.scm rename to gnucash/report/reports/sample/hello-world.scm index d149888797..d1d1245f20 100644 --- a/gnucash/report/utility-reports/hello-world.scm +++ b/gnucash/report/reports/sample/hello-world.scm @@ -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)) diff --git a/gnucash/report/utility-reports/test-graphing.scm b/gnucash/report/reports/sample/test-graphing.scm similarity index 99% rename from gnucash/report/utility-reports/test-graphing.scm rename to gnucash/report/reports/sample/test-graphing.scm index f375938a53..52568dfc32 100644 --- a/gnucash/report/utility-reports/test-graphing.scm +++ b/gnucash/report/reports/sample/test-graphing.scm @@ -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)) diff --git a/gnucash/report/utility-reports/view-column.scm b/gnucash/report/reports/sample/view-column.scm similarity index 99% rename from gnucash/report/utility-reports/view-column.scm rename to gnucash/report/reports/sample/view-column.scm index 49a300ddd4..cf1946d838 100644 --- a/gnucash/report/utility-reports/view-column.scm +++ b/gnucash/report/reports/sample/view-column.scm @@ -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)) diff --git a/gnucash/report/utility-reports/welcome-to-gnucash.scm b/gnucash/report/reports/sample/welcome-to-gnucash.scm similarity index 98% rename from gnucash/report/utility-reports/welcome-to-gnucash.scm rename to gnucash/report/reports/sample/welcome-to-gnucash.scm index 79b8d5a150..acfbea9b1d 100644 --- a/gnucash/report/utility-reports/welcome-to-gnucash.scm +++ b/gnucash/report/reports/sample/welcome-to-gnucash.scm @@ -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)) diff --git a/gnucash/report/reports/standard/test/test-stress-options.scm b/gnucash/report/reports/standard/test/test-stress-options.scm index bb407dbae4..e4eb69cb58 100644 --- a/gnucash/report/reports/standard/test/test-stress-options.scm +++ b/gnucash/report/reports/standard/test/test-stress-options.scm @@ -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)) diff --git a/gnucash/report/utility-reports/CMakeLists.txt b/gnucash/report/utility-reports/CMakeLists.txt deleted file mode 100644 index af969bc23a..0000000000 --- a/gnucash/report/utility-reports/CMakeLists.txt +++ /dev/null @@ -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) diff --git a/gnucash/report/utility-reports/utility-reports.scm b/gnucash/report/utility-reports/utility-reports.scm deleted file mode 100644 index 8a849ca910..0000000000 --- a/gnucash/report/utility-reports/utility-reports.scm +++ /dev/null @@ -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) diff --git a/po/POTFILES.in b/po/POTFILES.in index b805cd4ec6..6cfdc75930 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -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