gnucash master: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Mon May 27 05:42:33 EDT 2019
Updated via https://github.com/Gnucash/gnucash/commit/29b842ba (commit)
via https://github.com/Gnucash/gnucash/commit/d35eabd6 (commit)
via https://github.com/Gnucash/gnucash/commit/06bc0643 (commit)
via https://github.com/Gnucash/gnucash/commit/cac30760 (commit)
via https://github.com/Gnucash/gnucash/commit/141e7778 (commit)
via https://github.com/Gnucash/gnucash/commit/8adac3c3 (commit)
via https://github.com/Gnucash/gnucash/commit/da4d72f8 (commit)
via https://github.com/Gnucash/gnucash/commit/7cc9d5cd (commit)
via https://github.com/Gnucash/gnucash/commit/2ac9e213 (commit)
via https://github.com/Gnucash/gnucash/commit/f2368700 (commit)
via https://github.com/Gnucash/gnucash/commit/c3b9d389 (commit)
via https://github.com/Gnucash/gnucash/commit/e97bb62f (commit)
via https://github.com/Gnucash/gnucash/commit/4a721e1f (commit)
via https://github.com/Gnucash/gnucash/commit/8eaf87d3 (commit)
via https://github.com/Gnucash/gnucash/commit/6c5fc4da (commit)
via https://github.com/Gnucash/gnucash/commit/72f5417c (commit)
via https://github.com/Gnucash/gnucash/commit/20eb1cc6 (commit)
via https://github.com/Gnucash/gnucash/commit/438cf3c2 (commit)
from https://github.com/Gnucash/gnucash/commit/3ec00f52 (commit)
commit 29b842ba994c0ec47d27fe51f20feb68c49eed28
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat May 18 16:06:41 2019 +0200
Fix ubuntu 14.04 build failure
srfi-64 is optional and hence should only be depended upon within
the have-srfi-64 condition.
Ubuntu 14.04 doesn't have srfi-64 yet.
diff --git a/libgnucash/engine/test/CMakeLists.txt b/libgnucash/engine/test/CMakeLists.txt
index ad4992cbb..21dd7a0bd 100644
--- a/libgnucash/engine/test/CMakeLists.txt
+++ b/libgnucash/engine/test/CMakeLists.txt
@@ -239,7 +239,7 @@ if (HAVE_SRFI64)
gnc_add_scheme_test_targets (scm-srfi64-extras
"srfi64-extras.scm"
"tests"
- "${GUILE_DEPENDS}"
+ "${GUILE_DEPENDS};scm-test-engine-extras;scm-srfi64-extras"
FALSE
)
@@ -252,7 +252,7 @@ endif (HAVE_SRFI64)
gnc_add_scheme_test_targets(scm-test-engine
"${engine_test_SCHEME}"
"tests"
- "${GUILE_DEPENDS};scm-test-engine-extras;scm-srfi64-extras"
+ "${GUILE_DEPENDS};scm-test-engine-extras"
FALSE
)
commit d35eabd63689b7d014c18206a611cd355af016ba
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat May 18 14:06:57 2019 +0200
Prevent autocompilation of the guile test scripts
There were several issues:
- we store the compiled test*.go files in a tests subdirectory, but this is not
on the GUILE_LOAD_COMPILED_PATH. Added this directory to the path.
- guile was looking for 'script.scm.go' while we create 'script.go'. This is due
to how we invoke the scripts: guile -l path-to-script.scm -c (something)
we can replace this with -l path-to-script (without extension) as -l won't add
the extension. So I've rewrittin the test command to invoke (load-from-path).
- the test modules foo.scm, bar.scm and baz.scm should go in tests/gnucash
as they are defined as modules (gnucash foo), (gnucash bar) and (gnucash baz)
respectively.
- find html.scm/go on the load path instead of using a relative path.
diff --git a/common/cmake_modules/GncAddTest.cmake b/common/cmake_modules/GncAddTest.cmake
index 2d5efbbe6..7cebe5168 100644
--- a/common/cmake_modules/GncAddTest.cmake
+++ b/common/cmake_modules/GncAddTest.cmake
@@ -32,7 +32,7 @@ function(get_guile_env)
list(APPEND env "GUILE=${GUILE_EXECUTABLE}")
if (NOT WIN32)
- list(APPEND env "GUILE_LOAD_COMPILED_PATH=${LIBDIR_BUILD}/gnucash/scm/ccache/${GUILE_EFFECTIVE_VERSION}")
+ list(APPEND env "GUILE_LOAD_COMPILED_PATH=${LIBDIR_BUILD}/gnucash/scm/ccache/${GUILE_EFFECTIVE_VERSION}:${LIBDIR_BUILD}/gnucash/scm/ccache/${GUILE_EFFECTIVE_VERSION}/tests")
endif()
set(guile_load_paths "")
list(APPEND guile_load_paths ${CMAKE_CURRENT_SOURCE_DIR}/mod-foo)
@@ -102,7 +102,7 @@ function(gnc_add_scheme_test _TARGET _SOURCE_FILE)
set(CMAKE_COMMAND_TMP ${CMAKE_COMMAND} -E env)
endif()
add_test(${_TARGET} ${CMAKE_COMMAND_TMP}
- ${GUILE_EXECUTABLE} --debug -l ${CMAKE_CURRENT_SOURCE_DIR}/${_SOURCE_FILE} -c "(exit (run-test))"
+ ${GUILE_EXECUTABLE} --debug -c "(load-from-path \"${_TARGET}\")(exit (run-test))"
)
get_guile_env()
set_tests_properties(${_TARGET} PROPERTIES ENVIRONMENT "${GUILE_ENV};${ARGN}")
diff --git a/gnucash/report/report-system/test/test-html-fonts.scm b/gnucash/report/report-system/test/test-html-fonts.scm
index bdb4d9099..d136a1de2 100644
--- a/gnucash/report/report-system/test/test-html-fonts.scm
+++ b/gnucash/report/report-system/test/test-html-fonts.scm
@@ -1,6 +1,6 @@
(use-modules (srfi srfi-64))
(use-modules (tests srfi64-extras))
-(load "../html-fonts.scm")
+(load "html-fonts")
(setlocale LC_ALL "C")
diff --git a/gnucash/report/reports/standard/test/CMakeLists.txt b/gnucash/report/reports/standard/test/CMakeLists.txt
index 081d8cacc..503771f99 100644
--- a/gnucash/report/reports/standard/test/CMakeLists.txt
+++ b/gnucash/report/reports/standard/test/CMakeLists.txt
@@ -43,6 +43,12 @@ if (HAVE_SRFI64)
gnc_add_scheme_tests("${scm_test_with_srfi64_SOURCES}")
if (HAVE_TEXT_PORTS)
+ gnc_add_scheme_test_targets(scm-test-reports-standard-tp
+ "${scm_test_with_textual_ports_SOURCES}"
+ "tests"
+ "${GUILE_DEPENDS};scm-srfi64-extras"
+ FALSE
+ )
gnc_add_scheme_tests("${scm_test_with_textual_ports_SOURCES}")
endif (HAVE_TEXT_PORTS)
endif (HAVE_SRFI64)
diff --git a/libgnucash/gnc-module/test/mod-bar/CMakeLists.txt b/libgnucash/gnc-module/test/mod-bar/CMakeLists.txt
index e86921c16..ddeefb786 100644
--- a/libgnucash/gnc-module/test/mod-bar/CMakeLists.txt
+++ b/libgnucash/gnc-module/test/mod-bar/CMakeLists.txt
@@ -19,6 +19,13 @@ target_include_directories(gncmod-bar PRIVATE
${GUILE_INCLUDE_DIRS}
)
+gnc_add_scheme_test_targets(scm-mod-bar
+ gnucash/bar.scm
+ "tests/gnucash"
+ gncmod-bar
+ FALSE
+ )
+
set_target_properties(bar gncmod-bar PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test
ARCHIVE_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test
diff --git a/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt b/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt
index 23b2dfad7..f83fed30e 100644
--- a/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt
+++ b/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt
@@ -27,9 +27,9 @@ target_include_directories(gncmod-baz PRIVATE
gnc_add_scheme_test_targets(scm-mod-baz
gnucash/baz.scm
- "tests"
+ "tests/gnucash"
gncmod-baz
- TRUE
+ FALSE
)
set_target_properties(baz gncmod-baz PROPERTIES
diff --git a/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt b/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt
index 5e05b1092..c184eef7d 100644
--- a/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt
+++ b/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt
@@ -21,9 +21,9 @@ target_include_directories(gncmod-foo PRIVATE
gnc_add_scheme_test_targets(scm-mod-foo
gnucash/foo.scm
- "tests"
+ "tests/gnucash"
gncmod-foo
- TRUE
+ FALSE
)
set_target_properties(foo gncmod-foo PROPERTIES
commit 06bc06437942fa5e7ab1522339050d5a129ef7fb
Author: John Ralls <jralls at ceridwen.us>
Date: Fri May 17 16:56:45 2019 -0700
Fix dependencies for Scheme tests requiring SRFI64.
So ninja check passes without having run ninja first.
diff --git a/gnucash/report/report-system/test/CMakeLists.txt b/gnucash/report/report-system/test/CMakeLists.txt
index 4c34e222b..7167a516f 100644
--- a/gnucash/report/report-system/test/CMakeLists.txt
+++ b/gnucash/report/report-system/test/CMakeLists.txt
@@ -32,10 +32,18 @@ set(GUILE_DEPENDS
scm-test-engine
scm-scm
scm-report-system-3
+ scm-test-report-system
)
gnc_add_scheme_tests("${scm_test_report_system_SOURCES}")
if (HAVE_SRFI64)
+ gnc_add_scheme_test_targets(scm-test-report-system-srfi64
+ "${scm_test_report_system_with_srfi64_SOURCES}"
+ "tests"
+ "${GUILE_DEPENDS};scm-srfi64-extras"
+ FALSE
+ )
+
gnc_add_scheme_tests ("${scm_test_report_system_with_srfi64_SOURCES}")
endif (HAVE_SRFI64)
diff --git a/gnucash/report/reports/CMakeLists.txt b/gnucash/report/reports/CMakeLists.txt
index 7387bba20..a232ba878 100644
--- a/gnucash/report/reports/CMakeLists.txt
+++ b/gnucash/report/reports/CMakeLists.txt
@@ -92,21 +92,21 @@ set(scm_rpt_std_GUILE_DEPENDS
gnc_add_scheme_targets(scm-rpt-reports
"${reports_SCHEME}"
"gnucash/report"
- "scm-reports-standard;${scm_rpts_GUILE_DEPENDS}"
+ "${scm_rpts_GUILE_DEPENDS}"
TRUE
)
gnc_add_scheme_targets(scm-reports-common
"${reports_common_SCHEME}"
"gnucash/report/reports"
- "scm-reports-common-links;${scm_rpt_std_GUILE_DEPENDS}"
+ "scm-reports-common-links;scm-rpt-reports;${scm_rpt_std_GUILE_DEPENDS}"
TRUE
)
gnc_add_scheme_targets(scm-reports-standard
"${reports_standard_SCHEME}"
"gnucash/report/reports/standard"
- "${scm_rpt_std_GUILE_DEPENDS}"
+ "scm-rpt-reports;${scm_rpt_std_GUILE_DEPENDS}"
TRUE
)
diff --git a/gnucash/report/reports/standard/test/CMakeLists.txt b/gnucash/report/reports/standard/test/CMakeLists.txt
index 36e899751..081d8cacc 100644
--- a/gnucash/report/reports/standard/test/CMakeLists.txt
+++ b/gnucash/report/reports/standard/test/CMakeLists.txt
@@ -34,6 +34,13 @@ set(GUILE_DEPENDS
)
if (HAVE_SRFI64)
+ gnc_add_scheme_test_targets(scm-test-reports-standard-srfi64
+ "${scm_test_with_srfi64_SOURCES}"
+ "tests"
+ "${GUILE_DEPENDS};scm-srfi64-extras"
+ FALSE
+ )
+
gnc_add_scheme_tests("${scm_test_with_srfi64_SOURCES}")
if (HAVE_TEXT_PORTS)
gnc_add_scheme_tests("${scm_test_with_textual_ports_SOURCES}")
diff --git a/libgnucash/app-utils/test/CMakeLists.txt b/libgnucash/app-utils/test/CMakeLists.txt
index de20eecb8..369f27a8e 100644
--- a/libgnucash/app-utils/test/CMakeLists.txt
+++ b/libgnucash/app-utils/test/CMakeLists.txt
@@ -66,6 +66,13 @@ gnc_add_scheme_test_targets(scm-test-c-interface
gnc_add_scheme_tests("${test_app_utils_scheme_SOURCES}")
if (HAVE_SRFI64)
+ gnc_add_scheme_test_targets(scm-test-app-utils-srfi64
+ "${test_app_utils_scheme_SRFI64_SOURCES}"
+ "tests"
+ "${GUILE_DEPENDS};scm-srfi64-extras"
+ FALSE
+ )
+
gnc_add_scheme_tests("${test_app_utils_scheme_SRFI64_SOURCES}")
endif ()
diff --git a/libgnucash/engine/test/CMakeLists.txt b/libgnucash/engine/test/CMakeLists.txt
index 60c1f93fa..ad4992cbb 100644
--- a/libgnucash/engine/test/CMakeLists.txt
+++ b/libgnucash/engine/test/CMakeLists.txt
@@ -252,7 +252,7 @@ endif (HAVE_SRFI64)
gnc_add_scheme_test_targets(scm-test-engine
"${engine_test_SCHEME}"
"tests"
- "${GUILE_DEPENDS};scm-test-engine-extras"
+ "${GUILE_DEPENDS};scm-test-engine-extras;scm-srfi64-extras"
FALSE
)
commit cac307602fa5c7880fbecc031b3d5f8a4e4a6547
Author: John Ralls <jralls at ceridwen.us>
Date: Fri May 17 16:10:49 2019 -0700
Build or link all Scheme test files into a directory "tests".
Instead of random locations only occasionally related to the
corresponding source.
Includes renaming libgnucash/engine/test/test-extras.scm and
gnucash/report/report-system/test/test-extras.scm to avoid a
naming conflict.
diff --git a/common/test-core/CMakeLists.txt b/common/test-core/CMakeLists.txt
index 9bf12478b..afb7f0ec0 100644
--- a/common/test-core/CMakeLists.txt
+++ b/common/test-core/CMakeLists.txt
@@ -55,7 +55,7 @@ endif()
set(test_core_SCHEME unittest-support.scm)
-set(GUILE_OUTPUT_DIR gnucash)
+set(GUILE_OUTPUT_DIR tests)
set(GUILE_DEPENDS test-core-guile)
diff --git a/common/test-core/unittest-support.scm b/common/test-core/unittest-support.scm
index 05254719e..cef067e19 100644
--- a/common/test-core/unittest-support.scm
+++ b/common/test-core/unittest-support.scm
@@ -17,7 +17,7 @@
;; Boston, MA 02110-1301, USA gnu at gnu.org
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash unittest-support))
+(define-module (tests unittest-support))
(eval-when
(compile load eval expand)
(load-extension "libtest-core-guile" "scm_init_unittest_support_module"))
diff --git a/gnucash/gnome-utils/test/CMakeLists.txt b/gnucash/gnome-utils/test/CMakeLists.txt
index 3c7f03d22..fbb26769d 100644
--- a/gnucash/gnome-utils/test/CMakeLists.txt
+++ b/gnucash/gnome-utils/test/CMakeLists.txt
@@ -39,7 +39,7 @@ set(GUILE_DEPENDS
gnc_add_scheme_test_targets(scm-test-load-gnome-utils-module
"test-load-gnome-utils-module.scm"
- "gnucash/reports"
+ "tests"
"${GUILE_DEPENDS}"
FALSE
)
diff --git a/gnucash/report/locale-specific/us/test/CMakeLists.txt b/gnucash/report/locale-specific/us/test/CMakeLists.txt
index c227abd92..70ec0e0e0 100644
--- a/gnucash/report/locale-specific/us/test/CMakeLists.txt
+++ b/gnucash/report/locale-specific/us/test/CMakeLists.txt
@@ -16,7 +16,7 @@ gnc_add_test(test-link-module-report-locale-specific-us test-link-module.c
#
#gnc_add_scheme_test_targets(test-load-report-locale-specific-module
# "test-load-report-locale-specific-module.scm"
-# "gnucash/report"
+# "tests"
# "${GUILE_DEPENDS}"
# FALSE
# )
diff --git a/gnucash/report/report-gnome/test/CMakeLists.txt b/gnucash/report/report-gnome/test/CMakeLists.txt
index 171e8d5e8..e35e71604 100644
--- a/gnucash/report/report-gnome/test/CMakeLists.txt
+++ b/gnucash/report/report-gnome/test/CMakeLists.txt
@@ -24,7 +24,7 @@ add_dependencies(test-link-module-report-gnome test-report-gnome)
gnc_add_scheme_test_targets(scm-test-load-report-gnome-module
"test-load-report-gnome-module.scm"
- "gnucash/reports"
+ "tests"
"${GUILE_DEPENDS}"
FALSE
)
diff --git a/gnucash/report/report-system/test/CMakeLists.txt b/gnucash/report/report-system/test/CMakeLists.txt
index 01b807b2a..4c34e222b 100644
--- a/gnucash/report/report-system/test/CMakeLists.txt
+++ b/gnucash/report/report-system/test/CMakeLists.txt
@@ -40,15 +40,15 @@ if (HAVE_SRFI64)
endif (HAVE_SRFI64)
gnc_add_scheme_test_targets(scm-test-report-system
- "test-extras.scm"
- gnucash/report/report-system/test
+ "test-report-system-extras.scm"
+ "tests"
"${GUILE_DEPENDS}"
FALSE
)
gnc_add_scheme_test_targets(scm-test-report-system-2
"${scm_test_report_system_SOURCES}"
- gnucash/report/report-system/test
+ "tests"
"scm-test-report-system"
FALSE
)
@@ -58,6 +58,6 @@ set_dist_list(test_report_system_DIST
CMakeLists.txt
${scm_test_report_system_with_srfi64_SOURCES}
${scm_test_report_system_SOURCES}
- test-extras.scm
+ test-report-system-extras.scm
test-link-module.c
)
diff --git a/gnucash/report/report-system/test/test-commodity-utils.scm b/gnucash/report/report-system/test/test-commodity-utils.scm
index 97d104d05..b360cc12a 100644
--- a/gnucash/report/report-system/test/test-commodity-utils.scm
+++ b/gnucash/report/report-system/test/test-commodity-utils.scm
@@ -23,8 +23,8 @@
(use-modules (srfi srfi-64))
(use-modules (ice-9 pretty-print))
-(use-modules (gnucash engine test srfi64-extras))
-(use-modules (gnucash engine test test-extras))
+(use-modules (tests srfi64-extras))
+(use-modules (tests test-engine-extras))
(use-modules (gnucash app-utils))
(use-modules (gnucash engine))
(use-modules (sw_engine))
diff --git a/gnucash/report/report-system/test/test-html-fonts.scm b/gnucash/report/report-system/test/test-html-fonts.scm
index fecc058b4..bdb4d9099 100644
--- a/gnucash/report/report-system/test/test-html-fonts.scm
+++ b/gnucash/report/report-system/test/test-html-fonts.scm
@@ -1,5 +1,5 @@
(use-modules (srfi srfi-64))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
(load "../html-fonts.scm")
(setlocale LC_ALL "C")
diff --git a/gnucash/report/report-system/test/test-html-utilities-srfi64.scm b/gnucash/report/report-system/test/test-html-utilities-srfi64.scm
index ef712c7ac..163909aea 100644
--- a/gnucash/report/report-system/test/test-html-utilities-srfi64.scm
+++ b/gnucash/report/report-system/test/test-html-utilities-srfi64.scm
@@ -3,10 +3,10 @@
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
(gnc:module-begin-syntax (gnc:module-load "gnucash/report/report-system" 0))
-(use-modules (gnucash engine test test-extras))
-(use-modules (gnucash report report-system test test-extras))
+(use-modules (tests test-engine-extras))
+(use-modules (tests test-report-system-extras))
(use-modules (gnucash report report-system))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
(use-modules (srfi srfi-64))
(define (run-test)
diff --git a/gnucash/report/report-system/test/test-report-html.scm b/gnucash/report/report-system/test/test-report-html.scm
index 966a63da3..196aac491 100644
--- a/gnucash/report/report-system/test/test-report-html.scm
+++ b/gnucash/report/report-system/test/test-report-html.scm
@@ -2,10 +2,10 @@
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
-(use-modules (gnucash engine test test-extras))
+(use-modules (tests test-engine-extras))
(use-modules (gnucash report report-system))
(use-modules (srfi srfi-64))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
(define (run-test)
(test-runner-factory gnc:test-runner)
diff --git a/gnucash/report/report-system/test/test-extras.scm b/gnucash/report/report-system/test/test-report-system-extras.scm
similarity index 97%
rename from gnucash/report/report-system/test/test-extras.scm
rename to gnucash/report/report-system/test/test-report-system-extras.scm
index 9f546700d..bbeef1d5b 100644
--- a/gnucash/report/report-system/test/test-extras.scm
+++ b/gnucash/report/report-system/test/test-report-system-extras.scm
@@ -17,10 +17,10 @@
;; Boston, MA 02110-1301, USA gnu at gnu.org
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report report-system test test-extras))
+(define-module (tests test-report-system-extras))
(use-modules (gnucash gnc-module))
-(use-modules (gnucash engine test test-extras))
+(use-modules (tests test-engine-extras))
(use-modules (gnucash report report-system))
(use-modules (sxml simple))
(use-modules (sxml xpath))
diff --git a/gnucash/report/report-system/test/test-report-system.scm b/gnucash/report/report-system/test/test-report-system.scm
index a683e375f..ffdf32622 100644
--- a/gnucash/report/report-system/test/test-report-system.scm
+++ b/gnucash/report/report-system/test/test-report-system.scm
@@ -2,10 +2,10 @@
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
-(use-modules (gnucash engine test test-extras))
+(use-modules (tests test-engine-extras))
(use-modules (gnucash report report-system))
(use-modules (srfi srfi-64))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
(define (run-test)
(test-runner-factory gnc:test-runner)
diff --git a/gnucash/report/report-system/test/test-report-utilities.scm b/gnucash/report/report-system/test/test-report-utilities.scm
index f58878fb1..9f64f4cbc 100644
--- a/gnucash/report/report-system/test/test-report-utilities.scm
+++ b/gnucash/report/report-system/test/test-report-utilities.scm
@@ -4,9 +4,9 @@
(gnc:module-begin-syntax (gnc:module-load "gnucash/report/report-system" 0))
(use-modules (srfi srfi-64))
-(use-modules (gnucash engine test srfi64-extras))
-(use-modules (gnucash engine test test-extras))
-(use-modules (gnucash report report-system test test-extras))
+(use-modules (tests srfi64-extras))
+(use-modules (tests test-engine-extras))
+(use-modules (tests test-report-system-extras))
(use-modules (gnucash report report-system))
(setlocale LC_ALL "C")
diff --git a/gnucash/report/report-system/test/test-test-extras.scm b/gnucash/report/report-system/test/test-test-extras.scm
index 8787e617f..bd03b2af3 100644
--- a/gnucash/report/report-system/test/test-test-extras.scm
+++ b/gnucash/report/report-system/test/test-test-extras.scm
@@ -17,8 +17,8 @@
;; Boston, MA 02110-1301, USA gnu at gnu.org
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(use-modules (gnucash report report-system test test-extras))
-(use-modules (gnucash engine test test-extras))
+(use-modules (tests test-report-system-extras))
+(use-modules (tests test-engine-extras))
(use-modules (gnucash engine))
(use-modules (sw_engine))
diff --git a/gnucash/report/reports/standard/test/CMakeLists.txt b/gnucash/report/reports/standard/test/CMakeLists.txt
index d625a15e1..36e899751 100644
--- a/gnucash/report/reports/standard/test/CMakeLists.txt
+++ b/gnucash/report/reports/standard/test/CMakeLists.txt
@@ -44,7 +44,7 @@ gnc_add_scheme_tests("${scm_test_reports_standard_SOURCES}")
gnc_add_scheme_test_targets(scm-test-reports-standard
"${scm_test_reports_standard_SOURCES}"
- gnucash/report/reports/standard/test
+ "tests"
"${GUILE_DEPENDS}"
FALSE
)
diff --git a/gnucash/report/reports/standard/test/test-average-balance.scm b/gnucash/report/reports/standard/test/test-average-balance.scm
index 72d631fd2..39dad0beb 100644
--- a/gnucash/report/reports/standard/test/test-average-balance.scm
+++ b/gnucash/report/reports/standard/test/test-average-balance.scm
@@ -1,13 +1,13 @@
(use-modules (gnucash gnc-module))
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
(gnc:module-begin-syntax (gnc:module-load "gnucash/report/report-system" 0))
-(use-modules (gnucash engine test test-extras))
+(use-modules (tests test-engine-extras))
(use-modules (gnucash report reports standard average-balance))
(use-modules (gnucash report report-system))
(use-modules (gnucash report reports standard budget))
-(use-modules (gnucash report report-system test test-extras))
+(use-modules (tests test-report-system-extras))
(use-modules (gnucash report stylesheets))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
(use-modules (srfi srfi-1))
(use-modules (srfi srfi-64))
(use-modules (gnucash engine))
diff --git a/gnucash/report/reports/standard/test/test-balsheet-pnl.scm b/gnucash/report/reports/standard/test/test-balsheet-pnl.scm
index 07fdede9f..bee547586 100644
--- a/gnucash/report/reports/standard/test/test-balsheet-pnl.scm
+++ b/gnucash/report/reports/standard/test/test-balsheet-pnl.scm
@@ -1,13 +1,13 @@
(use-modules (gnucash gnc-module))
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
-(use-modules (gnucash engine test test-extras))
+(use-modules (tests test-engine-extras))
(use-modules (gnucash report reports standard balance-sheet))
(use-modules (gnucash report reports standard income-statement))
(use-modules (gnucash report stylesheets))
(use-modules (gnucash report report-system))
-(use-modules (gnucash report report-system test test-extras))
+(use-modules (tests test-report-system-extras))
(use-modules (srfi srfi-64))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
(use-modules (sxml simple))
(use-modules (sxml xpath))
diff --git a/gnucash/report/reports/standard/test/test-budget.scm b/gnucash/report/reports/standard/test/test-budget.scm
index 33f44e690..4c91db90b 100644
--- a/gnucash/report/reports/standard/test/test-budget.scm
+++ b/gnucash/report/reports/standard/test/test-budget.scm
@@ -21,7 +21,7 @@
(use-modules (srfi srfi-14))
(use-modules (srfi srfi-64))
(use-modules (gnucash gnc-module))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
(gnc:module-begin-syntax (gnc:module-load "gnucash/report/report-system" 0))
@@ -31,9 +31,9 @@
(use-modules (gnucash engine))
(use-modules (sw_engine))
(use-modules (gnucash report reports standard budget))
-(use-modules (gnucash report report-system test test-extras))
+(use-modules (tests test-report-system-extras))
(use-modules (gnucash report stylesheets))
-(use-modules (gnucash engine test test-extras))
+(use-modules (tests test-engine-extras))
;; Explicitly set locale to make the report output predictable
(setlocale LC_ALL "C")
diff --git a/gnucash/report/reports/standard/test/test-cash-flow.scm b/gnucash/report/reports/standard/test/test-cash-flow.scm
index e40507270..db62bfc96 100644
--- a/gnucash/report/reports/standard/test/test-cash-flow.scm
+++ b/gnucash/report/reports/standard/test/test-cash-flow.scm
@@ -2,7 +2,7 @@
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
-(use-modules (gnucash engine test test-extras))
+(use-modules (tests test-engine-extras))
(use-modules (gnucash report reports standard cash-flow))
(use-modules (gnucash report report-system))
diff --git a/gnucash/report/reports/standard/test/test-cashflow-barchart.scm b/gnucash/report/reports/standard/test/test-cashflow-barchart.scm
index 05acb66fa..3eadcf884 100644
--- a/gnucash/report/reports/standard/test/test-cashflow-barchart.scm
+++ b/gnucash/report/reports/standard/test/test-cashflow-barchart.scm
@@ -24,10 +24,10 @@
(use-modules (gnucash engine))
(use-modules (sw_engine))
-(use-modules (gnucash engine test test-extras))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests test-engine-extras))
+(use-modules (tests srfi64-extras))
(use-modules (gnucash report report-system))
-(use-modules (gnucash report report-system test test-extras))
+(use-modules (tests test-report-system-extras))
(use-modules (gnucash report reports standard cashflow-barchart))
(use-modules (gnucash report stylesheets))
(use-modules (srfi srfi-1))
diff --git a/gnucash/report/reports/standard/test/test-charts.scm b/gnucash/report/reports/standard/test/test-charts.scm
index d49fb011c..8adf6aa2e 100644
--- a/gnucash/report/reports/standard/test/test-charts.scm
+++ b/gnucash/report/reports/standard/test/test-charts.scm
@@ -1,6 +1,6 @@
(use-modules (gnucash gnc-module))
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
-(use-modules (gnucash engine test test-extras))
+(use-modules (tests test-engine-extras))
(use-modules (gnucash report reports standard category-barchart))
(use-modules (gnucash report reports standard net-charts))
(use-modules (gnucash report reports standard account-piecharts))
@@ -9,9 +9,9 @@
(use-modules (gnucash report reports standard price-scatter))
(use-modules (gnucash report stylesheets))
(use-modules (gnucash report report-system))
-(use-modules (gnucash report report-system test test-extras))
+(use-modules (tests test-report-system-extras))
(use-modules (srfi srfi-64))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
(use-modules (sxml simple))
(use-modules (sxml xpath))
(use-modules (system vm coverage))
diff --git a/gnucash/report/reports/standard/test/test-income-gst.scm b/gnucash/report/reports/standard/test/test-income-gst.scm
index 77ffacaa3..763451667 100644
--- a/gnucash/report/reports/standard/test/test-income-gst.scm
+++ b/gnucash/report/reports/standard/test/test-income-gst.scm
@@ -1,12 +1,12 @@
(use-modules (gnucash gnc-module))
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
-(use-modules (gnucash engine test test-extras))
+(use-modules (tests test-engine-extras))
(use-modules (gnucash report reports standard income-gst-statement))
(use-modules (gnucash report stylesheets))
(use-modules (gnucash report report-system))
-(use-modules (gnucash report report-system test test-extras))
+(use-modules (tests test-report-system-extras))
(use-modules (srfi srfi-64))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
(use-modules (sxml simple))
(use-modules (sxml xpath))
diff --git a/gnucash/report/reports/standard/test/test-invoice.scm b/gnucash/report/reports/standard/test/test-invoice.scm
index 04ae97c19..9e122d2fb 100644
--- a/gnucash/report/reports/standard/test/test-invoice.scm
+++ b/gnucash/report/reports/standard/test/test-invoice.scm
@@ -1,13 +1,13 @@
(use-modules (gnucash gnc-module))
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
-(use-modules (gnucash engine test test-extras))
+(use-modules (tests test-engine-extras))
(use-modules (gnucash report reports standard invoice))
(use-modules (gnucash report stylesheets))
(use-modules (gnucash report report-system))
-(use-modules (gnucash report report-system test test-extras))
+(use-modules (tests test-report-system-extras))
(use-modules (srfi srfi-1))
(use-modules (srfi srfi-64))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
(use-modules (sxml simple))
(use-modules (sxml xpath))
(use-modules (system vm coverage))
diff --git a/gnucash/report/reports/standard/test/test-register.scm b/gnucash/report/reports/standard/test/test-register.scm
index aebe5c0ca..3b9e1118f 100644
--- a/gnucash/report/reports/standard/test/test-register.scm
+++ b/gnucash/report/reports/standard/test/test-register.scm
@@ -21,7 +21,7 @@
(use-modules (srfi srfi-14))
(use-modules (srfi srfi-64))
(use-modules (gnucash gnc-module))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
;; Guile 2 needs to load external modules at compile time
;; otherwise the N_ syntax-rule won't be found at compile time
@@ -36,9 +36,9 @@
(use-modules (gnucash engine))
(use-modules (sw_engine))
(use-modules (gnucash report reports standard register))
-(use-modules (gnucash report report-system test test-extras))
+(use-modules (tests test-report-system-extras))
(use-modules (gnucash report stylesheets))
-(use-modules (gnucash engine test test-extras))
+(use-modules (tests test-engine-extras))
;; Explicitly set locale to make the report output predictable
(setlocale LC_ALL "C")
diff --git a/gnucash/report/reports/standard/test/test-standard-category-report.scm b/gnucash/report/reports/standard/test/test-standard-category-report.scm
index cdfac0282..7531436fd 100644
--- a/gnucash/report/reports/standard/test/test-standard-category-report.scm
+++ b/gnucash/report/reports/standard/test/test-standard-category-report.scm
@@ -21,7 +21,7 @@
(use-modules (srfi srfi-14))
(use-modules (srfi srfi-64))
(use-modules (gnucash gnc-module))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
;; Guile 2 needs to load external modules at compile time
;; otherwise the N_ syntax-rule won't be found at compile time
@@ -36,11 +36,10 @@
(use-modules (gnucash engine))
(use-modules (sw_engine))
(use-modules (gnucash report reports standard net-charts))
-(use-modules (gnucash report report-system test test-extras))
+(use-modules (tests test-report-system-extras))
(use-modules (gnucash report reports standard category-barchart))
(use-modules (gnucash report stylesheets))
-(use-modules (gnucash engine test test-extras))
-(use-modules (gnucash report report-system test test-extras))
+(use-modules (tests test-engine-extras))
;; Explicitly set locale to make the report output predictable
(setlocale LC_ALL "C")
diff --git a/gnucash/report/reports/standard/test/test-standard-net-barchart.scm b/gnucash/report/reports/standard/test/test-standard-net-barchart.scm
index 9623122d3..b1721dc82 100644
--- a/gnucash/report/reports/standard/test/test-standard-net-barchart.scm
+++ b/gnucash/report/reports/standard/test/test-standard-net-barchart.scm
@@ -24,9 +24,9 @@
(use-modules (srfi srfi-1))
(use-modules (srfi srfi-64))
(use-modules (gnucash report stylesheets))
-(use-modules (gnucash engine test test-extras))
-(use-modules (gnucash engine test srfi64-extras))
-(use-modules (gnucash report report-system test test-extras))
+(use-modules (tests test-engine-extras))
+(use-modules (tests srfi64-extras))
+(use-modules (tests test-report-system-extras))
(use-modules (gnucash report reports standard net-charts))
;; Explicitly set locale to make the report output predictable
diff --git a/gnucash/report/reports/standard/test/test-standard-net-linechart.scm b/gnucash/report/reports/standard/test/test-standard-net-linechart.scm
index f998bfe7f..01f16132c 100644
--- a/gnucash/report/reports/standard/test/test-standard-net-linechart.scm
+++ b/gnucash/report/reports/standard/test/test-standard-net-linechart.scm
@@ -24,9 +24,9 @@
(use-modules (srfi srfi-1))
(use-modules (srfi srfi-64))
(use-modules (gnucash report stylesheets))
-(use-modules (gnucash engine test test-extras))
-(use-modules (gnucash engine test srfi64-extras))
-(use-modules (gnucash report report-system test test-extras))
+(use-modules (tests test-engine-extras))
+(use-modules (tests srfi64-extras))
+(use-modules (tests test-report-system-extras))
(use-modules (gnucash report reports standard net-charts))
;; Explicitly set locale to make the report output predictable
diff --git a/gnucash/report/reports/standard/test/test-stress-options.scm b/gnucash/report/reports/standard/test/test-stress-options.scm
index e4eb69cb5..c78522112 100644
--- a/gnucash/report/reports/standard/test/test-stress-options.scm
+++ b/gnucash/report/reports/standard/test/test-stress-options.scm
@@ -3,16 +3,16 @@
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
-(use-modules (gnucash engine test test-extras))
+(use-modules (tests test-engine-extras))
(use-modules (gnucash report reports))
(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))
-(use-modules (gnucash report report-system test test-extras))
+(use-modules (tests test-report-system-extras))
(use-modules (srfi srfi-64))
(use-modules (srfi srfi-98))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
(use-modules (sxml simple))
(use-modules (sxml xpath))
diff --git a/gnucash/report/reports/standard/test/test-transaction.scm b/gnucash/report/reports/standard/test/test-transaction.scm
index 3e1a5c13a..92f9d0735 100644
--- a/gnucash/report/reports/standard/test/test-transaction.scm
+++ b/gnucash/report/reports/standard/test/test-transaction.scm
@@ -1,13 +1,13 @@
(use-modules (gnucash gnc-module))
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
-(use-modules (gnucash engine test test-extras))
+(use-modules (tests test-engine-extras))
(use-modules (gnucash report reports standard transaction))
(use-modules (gnucash report reports standard reconcile-report))
(use-modules (gnucash report stylesheets))
(use-modules (gnucash report report-system))
-(use-modules (gnucash report report-system test test-extras))
+(use-modules (tests test-report-system-extras))
(use-modules (srfi srfi-64))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
(use-modules (sxml simple))
(use-modules (sxml xpath))
(use-modules (system vm coverage))
diff --git a/gnucash/report/stylesheets/test/CMakeLists.txt b/gnucash/report/stylesheets/test/CMakeLists.txt
index 8a16f8e44..30eb540da 100644
--- a/gnucash/report/stylesheets/test/CMakeLists.txt
+++ b/gnucash/report/stylesheets/test/CMakeLists.txt
@@ -15,7 +15,7 @@ set(GUILE_DEPENDS
gnc_add_scheme_test_targets(scm-test-load-report-stylesheets-module
"test-load-report-stylesheets-module.scm"
- "gnucash/report"
+ "tests"
"${GUILE_DEPENDS}"
FALSE
)
diff --git a/gnucash/report/stylesheets/test/test-load-report-stylesheets-module.scm b/gnucash/report/stylesheets/test/test-load-report-stylesheets-module.scm
index 2217dba81..570d8648f 100755
--- a/gnucash/report/stylesheets/test/test-load-report-stylesheets-module.scm
+++ b/gnucash/report/stylesheets/test/test-load-report-stylesheets-module.scm
@@ -1,6 +1,6 @@
(setenv "GNC_UNINSTALLED" "1")
(display " testing stylesheet module load ... ")
-(use-modules (gnucash unittest-support))
+(use-modules (tests unittest-support))
(define log-domain "gnc.report.core")
(define check (new-TestErrorStruct))
(define log-level (G-LOG-LEVEL-CRITICAL))
diff --git a/libgnucash/app-utils/test/CMakeLists.txt b/libgnucash/app-utils/test/CMakeLists.txt
index 73f1071c4..de20eecb8 100644
--- a/libgnucash/app-utils/test/CMakeLists.txt
+++ b/libgnucash/app-utils/test/CMakeLists.txt
@@ -51,14 +51,14 @@ set (test_app_utils_scheme_SRFI64_SOURCES
gnc_add_scheme_test_targets(scm-test-load-app-utils-module
"test-load-app-utils-module.scm"
- "gnucash/reports"
+ "tests"
"${GUILE_DEPENDS}"
FALSE
)
gnc_add_scheme_test_targets(scm-test-c-interface
"test-c-interface.scm"
- ""
+ "tests"
"${GUILE_DEPENDS}"
FALSE
)
diff --git a/libgnucash/app-utils/test/test-c-interface.scm b/libgnucash/app-utils/test/test-c-interface.scm
index f12cb1cd9..fe2445cd4 100644
--- a/libgnucash/app-utils/test/test-c-interface.scm
+++ b/libgnucash/app-utils/test/test-c-interface.scm
@@ -20,7 +20,7 @@
(setenv "GNC_UNINSTALLED" "1")
(debug-set! stack 50000)
(load-from-path "c-interface")
-(use-modules (gnucash engine test test-extras))
+(use-modules (tests test-engine-extras))
(define (test-func a b)
(list (/ a b) 6))
diff --git a/libgnucash/app-utils/test/test-date-utilities.scm b/libgnucash/app-utils/test/test-date-utilities.scm
index a495d9c75..1ed664a15 100644
--- a/libgnucash/app-utils/test/test-date-utilities.scm
+++ b/libgnucash/app-utils/test/test-date-utilities.scm
@@ -1,8 +1,8 @@
(use-modules (gnucash gnc-module))
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
-(use-modules (gnucash engine test test-extras))
+(use-modules (tests test-engine-extras))
(use-modules (srfi srfi-64))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
(define (run-test)
(test-runner-factory gnc:test-runner)
diff --git a/libgnucash/engine/test/CMakeLists.txt b/libgnucash/engine/test/CMakeLists.txt
index 3f7ce677b..60c1f93fa 100644
--- a/libgnucash/engine/test/CMakeLists.txt
+++ b/libgnucash/engine/test/CMakeLists.txt
@@ -229,8 +229,8 @@ set(engine_test_SCHEME
set(GUILE_DEPENDS scm-gnc-module scm-app-utils scm-scm scm-engine)
gnc_add_scheme_test_targets(scm-test-engine-extras
- "test-extras.scm"
- "gnucash/engine/test/"
+ "test-engine-extras.scm"
+ "tests"
"${GUILE_DEPENDS}"
FALSE
)
@@ -238,7 +238,7 @@ gnc_add_scheme_test_targets(scm-test-engine-extras
if (HAVE_SRFI64)
gnc_add_scheme_test_targets (scm-srfi64-extras
"srfi64-extras.scm"
- "gnucash/engine/test/"
+ "tests"
"${GUILE_DEPENDS}"
FALSE
)
@@ -251,7 +251,7 @@ endif (HAVE_SRFI64)
gnc_add_scheme_test_targets(scm-test-engine
"${engine_test_SCHEME}"
- ""
+ "tests"
"${GUILE_DEPENDS};scm-test-engine-extras"
FALSE
)
@@ -315,7 +315,7 @@ set(test_engine_SOURCES_DIST
set(test_engine_SCHEME_DIST
test-account.scm
test-create-account.scm
- test-extras.scm
+ test-engine-extras.scm
test-scm-query-import.scm
test-split.scm
)
diff --git a/libgnucash/engine/test/srfi64-extras.scm b/libgnucash/engine/test/srfi64-extras.scm
index 81329b219..b41baee43 100644
--- a/libgnucash/engine/test/srfi64-extras.scm
+++ b/libgnucash/engine/test/srfi64-extras.scm
@@ -17,7 +17,7 @@
;; Boston, MA 02110-1301, USA gnu at gnu.org
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash engine test srfi64-extras))
+(define-module (tests srfi64-extras))
(use-modules (srfi srfi-64))
(export gnc:test-runner)
diff --git a/libgnucash/engine/test/test-account.scm b/libgnucash/engine/test/test-account.scm
index e2ad2c454..81b36cf86 100644
--- a/libgnucash/engine/test/test-account.scm
+++ b/libgnucash/engine/test/test-account.scm
@@ -4,7 +4,7 @@
(use-modules (gnucash engine))
-(use-modules (gnucash engine test test-extras))
+(use-modules (tests test-engine-extras))
;; this test suite tests deprecated functions.
diff --git a/libgnucash/engine/test/test-extras.scm b/libgnucash/engine/test/test-engine-extras.scm
similarity index 99%
rename from libgnucash/engine/test/test-extras.scm
rename to libgnucash/engine/test/test-engine-extras.scm
index 6d53edd77..b2ec3e25d 100644
--- a/libgnucash/engine/test/test-extras.scm
+++ b/libgnucash/engine/test/test-engine-extras.scm
@@ -17,7 +17,7 @@
;; Boston, MA 02110-1301, USA gnu at gnu.org
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash engine test test-extras))
+(define-module (tests test-engine-extras))
(use-modules (gnucash gnc-module))
diff --git a/libgnucash/engine/test/test-split.scm b/libgnucash/engine/test/test-split.scm
index e5f53a6ef..dd10dcb36 100644
--- a/libgnucash/engine/test/test-split.scm
+++ b/libgnucash/engine/test/test-split.scm
@@ -4,7 +4,7 @@
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
(use-modules (gnucash engine))
-(use-modules (gnucash engine test test-extras))
+(use-modules (tests test-engine-extras))
(use-modules (gnucash app-utils))
(define (run-test)
diff --git a/libgnucash/gnc-module/test/CMakeLists.txt b/libgnucash/gnc-module/test/CMakeLists.txt
index 65ea8b149..ae87b460d 100644
--- a/libgnucash/gnc-module/test/CMakeLists.txt
+++ b/libgnucash/gnc-module/test/CMakeLists.txt
@@ -68,7 +68,7 @@ set(GUILE_DEPENDS
gnc_add_scheme_test_targets(test-gnc-modules-scm
"${test_gnc_module_SCHEME}"
- "gnucash/gnc-modules/test"
+ "tests"
"${GUILE_DEPENDS}"
TRUE
)
diff --git a/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt b/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt
index 23caa15d5..23b2dfad7 100644
--- a/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt
+++ b/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt
@@ -27,7 +27,7 @@ target_include_directories(gncmod-baz PRIVATE
gnc_add_scheme_test_targets(scm-mod-baz
gnucash/baz.scm
- "gnucash"
+ "tests"
gncmod-baz
TRUE
)
diff --git a/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt b/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt
index c18f06ef5..5e05b1092 100644
--- a/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt
+++ b/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt
@@ -21,7 +21,7 @@ target_include_directories(gncmod-foo PRIVATE
gnc_add_scheme_test_targets(scm-mod-foo
gnucash/foo.scm
- "gnucash"
+ "tests"
gncmod-foo
TRUE
)
diff --git a/libgnucash/gnc-module/test/test-gnc-module-load-deps.scm b/libgnucash/gnc-module/test/test-gnc-module-load-deps.scm
index d88791f23..c8f570382 100755
--- a/libgnucash/gnc-module/test/test-gnc-module-load-deps.scm
+++ b/libgnucash/gnc-module/test/test-gnc-module-load-deps.scm
@@ -1,4 +1,4 @@
-(use-modules (gnucash unittest-support))
+(use-modules (tests unittest-support))
(define log-domain "gnc.module")
(define check (new-TestErrorStruct))
(define log-level (G-LOG-LEVEL-WARNING))
diff --git a/libgnucash/gnc-module/test/test-gnc-module-load-scm.scm b/libgnucash/gnc-module/test/test-gnc-module-load-scm.scm
index d67fb19db..46a8385b2 100755
--- a/libgnucash/gnc-module/test/test-gnc-module-load-scm.scm
+++ b/libgnucash/gnc-module/test/test-gnc-module-load-scm.scm
@@ -1,4 +1,4 @@
-(use-modules (gnucash unittest-support))
+(use-modules (tests unittest-support))
(define log-domain "gnc.module")
(define check (new-TestErrorStruct))
(define log-level (G-LOG-LEVEL-WARNING))
diff --git a/libgnucash/gnc-module/test/test-gnc-module-scm-init.scm b/libgnucash/gnc-module/test/test-gnc-module-scm-init.scm
index c18f994f4..b66bdbcb7 100755
--- a/libgnucash/gnc-module/test/test-gnc-module-scm-init.scm
+++ b/libgnucash/gnc-module/test/test-gnc-module-scm-init.scm
@@ -1,4 +1,4 @@
-(use-modules (gnucash unittest-support))
+(use-modules (tests unittest-support))
(define log-domain "gnc.module")
(define check (new-TestErrorStruct))
(define log-level (G-LOG-LEVEL-WARNING))
diff --git a/libgnucash/gnc-module/test/test-gnc-module-scm-module.scm b/libgnucash/gnc-module/test/test-gnc-module-scm-module.scm
index ccfd804c6..689bb7c2c 100755
--- a/libgnucash/gnc-module/test/test-gnc-module-scm-module.scm
+++ b/libgnucash/gnc-module/test/test-gnc-module-scm-module.scm
@@ -1,4 +1,4 @@
-(use-modules (gnucash unittest-support))
+(use-modules (tests unittest-support))
(define log-domain "gnc.module")
(define check (new-TestErrorStruct))
(define log-level (G-LOG-LEVEL-WARNING))
diff --git a/libgnucash/gnc-module/test/test-gnc-module-scm-multi.scm b/libgnucash/gnc-module/test/test-gnc-module-scm-multi.scm
index bc938f285..126c44409 100755
--- a/libgnucash/gnc-module/test/test-gnc-module-scm-multi.scm
+++ b/libgnucash/gnc-module/test/test-gnc-module-scm-multi.scm
@@ -1,4 +1,4 @@
-(use-modules (gnucash unittest-support))
+(use-modules (tests unittest-support))
(define log-domain "gnc.module")
(define check (new-TestErrorStruct))
(define log-level (G-LOG-LEVEL-WARNING))
diff --git a/libgnucash/gnc-module/test/test-gnc-module-swigged-c.scm b/libgnucash/gnc-module/test/test-gnc-module-swigged-c.scm
index 913b49f24..89c5216da 100755
--- a/libgnucash/gnc-module/test/test-gnc-module-swigged-c.scm
+++ b/libgnucash/gnc-module/test/test-gnc-module-swigged-c.scm
@@ -1,4 +1,4 @@
-(use-modules (gnucash unittest-support))
+(use-modules (tests unittest-support))
(define log-domain "gnc.module")
(define check (new-TestErrorStruct))
(define log-level (G-LOG-LEVEL-WARNING))
diff --git a/libgnucash/scm/test/CMakeLists.txt b/libgnucash/scm/test/CMakeLists.txt
index 97f1129db..05105a25d 100644
--- a/libgnucash/scm/test/CMakeLists.txt
+++ b/libgnucash/scm/test/CMakeLists.txt
@@ -12,7 +12,7 @@ set(GUILE_DEPENDS
if (HAVE_SRFI64)
gnc_add_scheme_test_targets(scm-test-scm
"${scm_test_SCHEME}"
- ""
+ "tests"
"${GUILE_DEPENDS}"
FALSE
)
diff --git a/libgnucash/scm/test/test-libgnucash-scm-utilities.scm b/libgnucash/scm/test/test-libgnucash-scm-utilities.scm
index b5db94b24..cd445837d 100644
--- a/libgnucash/scm/test/test-libgnucash-scm-utilities.scm
+++ b/libgnucash/scm/test/test-libgnucash-scm-utilities.scm
@@ -2,7 +2,7 @@
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
(use-modules (gnucash utilities))
(use-modules (srfi srfi-64))
-(use-modules (gnucash engine test srfi64-extras))
+(use-modules (tests srfi64-extras))
(define (run-test)
(test-runner-factory gnc:test-runner)
diff --git a/libgnucash/tax/us/test/CMakeLists.txt b/libgnucash/tax/us/test/CMakeLists.txt
index a324c18b8..e8460be5b 100644
--- a/libgnucash/tax/us/test/CMakeLists.txt
+++ b/libgnucash/tax/us/test/CMakeLists.txt
@@ -13,7 +13,7 @@ gnc_add_test(test-link-module-tax-us test-link-module.c
#
#gnc_add_scheme_test_targets(scm-test-load-tax-us-module
# "test-load-tax-us-module.scm"
-# "gnucash/reports"
+# "tests"
# "${GUILE_DEPENDS}"
# FALSE
#)
commit 141e7778931862a6447249d933f987355722f79c
Author: John Ralls <jralls at ceridwen.us>
Date: Fri May 17 14:36:50 2019 -0700
Suppress installing Scheme test programs.
diff --git a/common/cmake_modules/GncAddSchemeTargets.cmake b/common/cmake_modules/GncAddSchemeTargets.cmake
index da0706dfa..ecadedbdd 100644
--- a/common/cmake_modules/GncAddSchemeTargets.cmake
+++ b/common/cmake_modules/GncAddSchemeTargets.cmake
@@ -26,7 +26,7 @@ function(make_unix_path_list PATH)
set(${PATH} ${newpath} PARENT_SCOPE)
endfunction()
-function(gnc_add_scheme_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
+function(make_scheme_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
MAKE_LINKS)
set(__DEBUG FALSE)
if (__DEBUG)
@@ -167,6 +167,20 @@ function(gnc_add_scheme_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
message("TARGET_FILES are ${_TARGET_FILES}")
endif(__DEBUG)
add_custom_target(${_TARGET} ALL DEPENDS ${_TARGET_FILES})
+ set(_TARGET_FILES "${_TARGET_FILES}" PARENT_SCOPE)
+endfunction(make_scheme_targets)
+
+function(gnc_add_scheme_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
+ MAKE_LINKS)
+ make_scheme_targets("${_TARGET}" "${_SOURCE_FILES}" "${_OUTPUT_DIR}"
+ "${_GUILE_DEPENDS}" "${MAKE_LINKS}")
install(FILES ${_TARGET_FILES} DESTINATION ${SCHEME_INSTALLED_CACHE_DIR}/${_OUTPUT_DIR})
install(FILES ${_SOURCE_FILES} DESTINATION ${SCHEME_INSTALLED_SOURCE_DIR}/${_OUTPUT_DIR})
endfunction(gnc_add_scheme_targets)
+
+function(gnc_add_scheme_test_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
+ MAKE_LINKS)
+ make_scheme_targets("${_TARGET}" "${_SOURCE_FILES}" "${_OUTPUT_DIR}"
+ "${_GUILE_DEPENDS}" "${MAKE_LINKS}")
+ add_dependencies(check ${_TARGET})
+endfunction(gnc_add_scheme_test_targets)
diff --git a/common/test-core/CMakeLists.txt b/common/test-core/CMakeLists.txt
index 9a757ad61..9bf12478b 100644
--- a/common/test-core/CMakeLists.txt
+++ b/common/test-core/CMakeLists.txt
@@ -59,7 +59,7 @@ set(GUILE_OUTPUT_DIR gnucash)
set(GUILE_DEPENDS test-core-guile)
-gnc_add_scheme_targets(scm-test-core
+gnc_add_scheme_test_targets(scm-test-core
${test_core_SCHEME}
${GUILE_OUTPUT_DIR}
"${GUILE_DEPENDS}"
diff --git a/gnucash/gnome-utils/test/CMakeLists.txt b/gnucash/gnome-utils/test/CMakeLists.txt
index fc47735ab..3c7f03d22 100644
--- a/gnucash/gnome-utils/test/CMakeLists.txt
+++ b/gnucash/gnome-utils/test/CMakeLists.txt
@@ -37,7 +37,7 @@ set(GUILE_DEPENDS
gncmod-engine
)
-gnc_add_scheme_targets(scm-test-load-gnome-utils-module
+gnc_add_scheme_test_targets(scm-test-load-gnome-utils-module
"test-load-gnome-utils-module.scm"
"gnucash/reports"
"${GUILE_DEPENDS}"
diff --git a/gnucash/report/locale-specific/us/test/CMakeLists.txt b/gnucash/report/locale-specific/us/test/CMakeLists.txt
index dfd67c455..c227abd92 100644
--- a/gnucash/report/locale-specific/us/test/CMakeLists.txt
+++ b/gnucash/report/locale-specific/us/test/CMakeLists.txt
@@ -14,7 +14,7 @@ gnc_add_test(test-link-module-report-locale-specific-us test-link-module.c
# gncmod-engine
#)
#
-#gnc_add_scheme_targets(test-load-report-locale-specific-module
+#gnc_add_scheme_test_targets(test-load-report-locale-specific-module
# "test-load-report-locale-specific-module.scm"
# "gnucash/report"
# "${GUILE_DEPENDS}"
diff --git a/gnucash/report/report-gnome/test/CMakeLists.txt b/gnucash/report/report-gnome/test/CMakeLists.txt
index 8fb560fa5..171e8d5e8 100644
--- a/gnucash/report/report-gnome/test/CMakeLists.txt
+++ b/gnucash/report/report-gnome/test/CMakeLists.txt
@@ -22,7 +22,7 @@ set(GUILE_DEPENDS
add_custom_target(test-report-gnome ALL DEPENDS ${GUILE_DEPENDS})
add_dependencies(test-link-module-report-gnome test-report-gnome)
-gnc_add_scheme_targets(scm-test-load-report-gnome-module
+gnc_add_scheme_test_targets(scm-test-load-report-gnome-module
"test-load-report-gnome-module.scm"
"gnucash/reports"
"${GUILE_DEPENDS}"
diff --git a/gnucash/report/report-system/test/CMakeLists.txt b/gnucash/report/report-system/test/CMakeLists.txt
index 51e752e7e..01b807b2a 100644
--- a/gnucash/report/report-system/test/CMakeLists.txt
+++ b/gnucash/report/report-system/test/CMakeLists.txt
@@ -39,14 +39,14 @@ if (HAVE_SRFI64)
gnc_add_scheme_tests ("${scm_test_report_system_with_srfi64_SOURCES}")
endif (HAVE_SRFI64)
-gnc_add_scheme_targets(scm-test-report-system
+gnc_add_scheme_test_targets(scm-test-report-system
"test-extras.scm"
gnucash/report/report-system/test
"${GUILE_DEPENDS}"
FALSE
)
-gnc_add_scheme_targets(scm-test-report-system-2
+gnc_add_scheme_test_targets(scm-test-report-system-2
"${scm_test_report_system_SOURCES}"
gnucash/report/report-system/test
"scm-test-report-system"
diff --git a/gnucash/report/reports/standard/test/CMakeLists.txt b/gnucash/report/reports/standard/test/CMakeLists.txt
index 9d0f56bca..d625a15e1 100644
--- a/gnucash/report/reports/standard/test/CMakeLists.txt
+++ b/gnucash/report/reports/standard/test/CMakeLists.txt
@@ -42,7 +42,7 @@ endif (HAVE_SRFI64)
gnc_add_scheme_tests("${scm_test_reports_standard_SOURCES}")
-gnc_add_scheme_targets(scm-test-reports-standard
+gnc_add_scheme_test_targets(scm-test-reports-standard
"${scm_test_reports_standard_SOURCES}"
gnucash/report/reports/standard/test
"${GUILE_DEPENDS}"
diff --git a/gnucash/report/stylesheets/test/CMakeLists.txt b/gnucash/report/stylesheets/test/CMakeLists.txt
index da49c42dc..8a16f8e44 100644
--- a/gnucash/report/stylesheets/test/CMakeLists.txt
+++ b/gnucash/report/stylesheets/test/CMakeLists.txt
@@ -13,7 +13,7 @@ set(GUILE_DEPENDS
scm-report-stylesheets
)
-gnc_add_scheme_targets(scm-test-load-report-stylesheets-module
+gnc_add_scheme_test_targets(scm-test-load-report-stylesheets-module
"test-load-report-stylesheets-module.scm"
"gnucash/report"
"${GUILE_DEPENDS}"
diff --git a/libgnucash/app-utils/test/CMakeLists.txt b/libgnucash/app-utils/test/CMakeLists.txt
index d3a55cc41..73f1071c4 100644
--- a/libgnucash/app-utils/test/CMakeLists.txt
+++ b/libgnucash/app-utils/test/CMakeLists.txt
@@ -49,14 +49,14 @@ set (test_app_utils_scheme_SRFI64_SOURCES
test-date-utilities.scm
)
-gnc_add_scheme_targets(scm-test-load-app-utils-module
+gnc_add_scheme_test_targets(scm-test-load-app-utils-module
"test-load-app-utils-module.scm"
"gnucash/reports"
"${GUILE_DEPENDS}"
FALSE
)
-gnc_add_scheme_targets(scm-test-c-interface
+gnc_add_scheme_test_targets(scm-test-c-interface
"test-c-interface.scm"
""
"${GUILE_DEPENDS}"
diff --git a/libgnucash/engine/test/CMakeLists.txt b/libgnucash/engine/test/CMakeLists.txt
index 1a27ea7f4..3f7ce677b 100644
--- a/libgnucash/engine/test/CMakeLists.txt
+++ b/libgnucash/engine/test/CMakeLists.txt
@@ -228,7 +228,7 @@ set(engine_test_SCHEME
set(GUILE_DEPENDS scm-gnc-module scm-app-utils scm-scm scm-engine)
-gnc_add_scheme_targets(scm-test-engine-extras
+gnc_add_scheme_test_targets(scm-test-engine-extras
"test-extras.scm"
"gnucash/engine/test/"
"${GUILE_DEPENDS}"
@@ -236,7 +236,7 @@ gnc_add_scheme_targets(scm-test-engine-extras
)
if (HAVE_SRFI64)
- gnc_add_scheme_targets (scm-srfi64-extras
+ gnc_add_scheme_test_targets (scm-srfi64-extras
"srfi64-extras.scm"
"gnucash/engine/test/"
"${GUILE_DEPENDS}"
@@ -249,7 +249,7 @@ if (HAVE_SRFI64)
endif (HAVE_SRFI64)
-gnc_add_scheme_targets(scm-test-engine
+gnc_add_scheme_test_targets(scm-test-engine
"${engine_test_SCHEME}"
""
"${GUILE_DEPENDS};scm-test-engine-extras"
diff --git a/libgnucash/gnc-module/test/CMakeLists.txt b/libgnucash/gnc-module/test/CMakeLists.txt
index e13b8d6e9..65ea8b149 100644
--- a/libgnucash/gnc-module/test/CMakeLists.txt
+++ b/libgnucash/gnc-module/test/CMakeLists.txt
@@ -66,7 +66,7 @@ set(GUILE_DEPENDS
gncmod-futuremodsys
)
-gnc_add_scheme_targets(test-gnc-modules-scm
+gnc_add_scheme_test_targets(test-gnc-modules-scm
"${test_gnc_module_SCHEME}"
"gnucash/gnc-modules/test"
"${GUILE_DEPENDS}"
diff --git a/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt b/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt
index acd1e4256..23caa15d5 100644
--- a/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt
+++ b/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt
@@ -25,7 +25,7 @@ target_include_directories(gncmod-baz PRIVATE
${GUILE_INCLUDE_DIRS}
)
-gnc_add_scheme_targets(scm-mod-baz
+gnc_add_scheme_test_targets(scm-mod-baz
gnucash/baz.scm
"gnucash"
gncmod-baz
diff --git a/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt b/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt
index 290ce6a51..c18f06ef5 100644
--- a/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt
+++ b/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt
@@ -19,7 +19,7 @@ target_include_directories(gncmod-foo PRIVATE
${GUILE_INCLUDE_DIRS}
)
-gnc_add_scheme_targets(scm-mod-foo
+gnc_add_scheme_test_targets(scm-mod-foo
gnucash/foo.scm
"gnucash"
gncmod-foo
diff --git a/libgnucash/scm/test/CMakeLists.txt b/libgnucash/scm/test/CMakeLists.txt
index 677d6124a..97f1129db 100644
--- a/libgnucash/scm/test/CMakeLists.txt
+++ b/libgnucash/scm/test/CMakeLists.txt
@@ -10,7 +10,7 @@ set(GUILE_DEPENDS
)
if (HAVE_SRFI64)
- gnc_add_scheme_targets(scm-test-scm
+ gnc_add_scheme_test_targets(scm-test-scm
"${scm_test_SCHEME}"
""
"${GUILE_DEPENDS}"
diff --git a/libgnucash/tax/us/test/CMakeLists.txt b/libgnucash/tax/us/test/CMakeLists.txt
index be2e11d35..a324c18b8 100644
--- a/libgnucash/tax/us/test/CMakeLists.txt
+++ b/libgnucash/tax/us/test/CMakeLists.txt
@@ -11,7 +11,7 @@ gnc_add_test(test-link-module-tax-us test-link-module.c
# scm-gnc-module
#)
#
-#gnc_add_scheme_targets(scm-test-load-tax-us-module
+#gnc_add_scheme_test_targets(scm-test-load-tax-us-module
# "test-load-tax-us-module.scm"
# "gnucash/reports"
# "${GUILE_DEPENDS}"
commit 8adac3c38428a5957a423141dc61ac00f51567ed
Author: Geert Janssens <geert at kobaltwit.be>
Date: Fri May 17 19:15:47 2019 +0200
Bug 773200 - Rename Sample & Custom Report Group
Technically the sample & custom group hasn't been changed yet,
in this commit the two relevant reports are moved to a new
'Multicolumn' submenu
diff --git a/gnucash/report/report-gnome/report-gnome.scm b/gnucash/report/report-gnome/report-gnome.scm
index 0e2447b3c..4da38959c 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 reports sample dashboard))
+(use-modules (gnucash report reports standard dashboard))
(eval-when (compile load eval expand)
(load-extension "libgncmod-gnome-utils" "scm_init_sw_gnome_utils_module")
@@ -37,7 +37,7 @@
(use-modules (sw_report_gnome))
(gnc:module-load "gnucash/gnome-utils" 0)
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-begin-syntax (gnc:module-load "gnucash/report/report-system" 0))
(export gnc:report-menu-setup)
(export gnc:add-report-template-menu-items)
@@ -81,6 +81,8 @@
(gnc:make-menu gnc:menuname-utility (list gnc:menuname-reports)))
(define experimental-menu
(gnc:make-menu gnc:menuname-experimental (list gnc:menuname-reports)))
+ (define multicolumn-menu
+ (gnc:make-menu gnc:menuname-multicolumn (list gnc:menuname-reports)))
(define tax-menu
(gnc:make-menu gnc:menuname-taxes (list gnc:menuname-reports)))
(define business-menu
@@ -102,6 +104,7 @@
(gnc-add-scm-extension budget-menu)
(gnc-add-scm-extension utility-menu)
(gnc-add-scm-extension experimental-menu)
+ (gnc-add-scm-extension multicolumn-menu)
(gnc-add-scm-extension business-menu)
;; run report-hook danglers
@@ -116,6 +119,6 @@
(N_ "Dashboard")
"ad80271c890b11dfa79f2dcedfd72085"
(N_ "A basic dashboard for your accounting data")
- (list gnc:menuname-reports gnc:menuname-utility "")
+ (list gnc:menuname-reports gnc:menuname-multicolumn "")
(lambda (window)
(gnc-main-window-open-report (gnc:make-dashboard) window)))))
diff --git a/gnucash/report/report-system/report-system.scm b/gnucash/report/report-system/report-system.scm
index 99d0a0f40..7d1561f57 100644
--- a/gnucash/report/report-system/report-system.scm
+++ b/gnucash/report/report-system/report-system.scm
@@ -137,6 +137,7 @@
(export gnc:menuname-budget)
(export gnc:menuname-taxes)
(export gnc:menuname-utility)
+(export gnc:menuname-multicolumn)
(export gnc:menuname-experimental)
(export gnc:menuname-custom)
(export gnc:menuname-business-reports)
diff --git a/gnucash/report/report-system/report.scm b/gnucash/report/report-system/report.scm
index a0793ef54..2b6433691 100644
--- a/gnucash/report/report-system/report.scm
+++ b/gnucash/report/report-system/report.scm
@@ -64,6 +64,7 @@
(define gnc:menuname-taxes (N_ "_Taxes"))
(define gnc:menuname-utility (N_ "_Sample & Custom"))
(define gnc:menuname-experimental (N_ "_Experimental"))
+(define gnc:menuname-multicolumn (N_ "_Multicolumn"))
(define gnc:menuname-custom (N_ "_Custom"))
(define gnc:pagename-general (N_ "General"))
(define gnc:pagename-accounts (N_ "Accounts"))
diff --git a/gnucash/report/reports/CMakeLists.txt b/gnucash/report/reports/CMakeLists.txt
index 48ae0d89e..7387bba20 100644
--- a/gnucash/report/reports/CMakeLists.txt
+++ b/gnucash/report/reports/CMakeLists.txt
@@ -27,6 +27,7 @@ set (reports_standard_SCHEME
standard/cashflow-barchart.scm
standard/category-barchart.scm
standard/daily-reports.scm
+ standard/dashboard.scm
standard/equity-statement.scm
standard/general-journal.scm
standard/general-ledger.scm
@@ -40,6 +41,7 @@ set (reports_standard_SCHEME
standard/sx-summary.scm
standard/transaction.scm
standard/trial-balance.scm
+ standard/view-column.scm
standard/customer-summary.scm
standard/taxinvoice.scm
standard/receipt.scm
@@ -52,9 +54,7 @@ set (reports_standard_SCHEME
)
set(reports_sample_SCHEME
- sample/dashboard.scm
sample/hello-world.scm
- sample/view-column.scm
sample/welcome-to-gnucash.scm
)
diff --git a/gnucash/report/reports/sample/dashboard.scm b/gnucash/report/reports/standard/dashboard.scm
similarity index 98%
rename from gnucash/report/reports/sample/dashboard.scm
rename to gnucash/report/reports/standard/dashboard.scm
index 7dd187e62..6d9b4ba31 100644
--- a/gnucash/report/reports/sample/dashboard.scm
+++ b/gnucash/report/reports/standard/dashboard.scm
@@ -22,7 +22,7 @@
;; Boston, MA 02110-1301, USA gnu at gnu.org
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report reports sample dashboard))
+(define-module (gnucash report reports standard dashboard))
(export gnc:make-dashboard)
(use-modules (gnucash utilities))
diff --git a/gnucash/report/reports/sample/view-column.scm b/gnucash/report/reports/standard/view-column.scm
similarity index 98%
rename from gnucash/report/reports/sample/view-column.scm
rename to gnucash/report/reports/standard/view-column.scm
index cf1946d83..12b97cf79 100644
--- a/gnucash/report/reports/sample/view-column.scm
+++ b/gnucash/report/reports/standard/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 reports sample view-column))
+(define-module (gnucash report reports standard view-column))
(use-modules (gnucash utilities))
(use-modules (gnucash app-utils))
(use-modules (gnucash gnc-module))
@@ -243,7 +243,7 @@
'name (N_ "Multicolumn View")
'report-guid "d8ba4a2e89e8479ca9f6eccdeb164588"
'menu-name (N_ "Custom Multicolumn Report")
- 'menu-path (list gnc:menuname-utility)
+ 'menu-path (list gnc:menuname-multicolumn)
'renderer render-view
'options-generator make-options
'options-cleanup-cb cleanup-options
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 30e7bdd91..0f4e85d15 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -425,9 +425,7 @@ 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/dashboard.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
@@ -447,6 +445,7 @@ gnucash/report/reports/standard/cash-flow.scm
gnucash/report/reports/standard/category-barchart.scm
gnucash/report/reports/standard/customer-summary.scm
gnucash/report/reports/standard/daily-reports.scm
+gnucash/report/reports/standard/dashboard.scm
gnucash/report/reports/standard/equity-statement.scm
gnucash/report/reports/standard/general-journal.scm
gnucash/report/reports/standard/general-ledger.scm
@@ -467,6 +466,7 @@ gnucash/report/reports/standard/sx-summary.scm
gnucash/report/reports/standard/taxinvoice.scm
gnucash/report/reports/standard/transaction.scm
gnucash/report/reports/standard/trial-balance.scm
+gnucash/report/reports/standard/view-column.scm
gnucash/report/reports/support/balsheet-eg.eguile.scm
gnucash/report/reports/support/receipt.eguile.scm
gnucash/report/reports/support/taxinvoice.eguile.scm
commit da4d72f89bf0bc0ed768b12027209d518ec7ab77
Author: Geert Janssens <geert at kobaltwit.be>
Date: Fri May 17 18:18:03 2019 +0200
Bug 773199 - Rename and rebuild Welcome to GnuCash Report
- separate the multicolumn report into its own source file
- tweak it as suggested in the bug report
diff --git a/gnucash/report/report-gnome/report-gnome.scm b/gnucash/report/report-gnome/report-gnome.scm
index 69a727858..0e2447b3c 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 reports sample welcome-to-gnucash))
+(use-modules (gnucash report reports sample dashboard))
(eval-when (compile load eval expand)
(load-extension "libgncmod-gnome-utils" "scm_init_sw_gnome_utils_module")
@@ -110,12 +110,12 @@
;; push reports (new items added on top of menu)
(gnc:add-report-template-menu-items)
- ;; the Welcome to GnuCash "extravaganza" report
+ ;; the dashboard report
(gnc-add-scm-extension
(gnc:make-menu-item
- (N_ "Welcome Sample Report")
+ (N_ "Dashboard")
"ad80271c890b11dfa79f2dcedfd72085"
- (N_ "Welcome-to-GnuCash report screen")
+ (N_ "A basic dashboard for your accounting data")
(list gnc:menuname-reports gnc:menuname-utility "")
(lambda (window)
- (gnc-main-window-open-report (gnc:make-welcome-report) window)))))
+ (gnc-main-window-open-report (gnc:make-dashboard) window)))))
diff --git a/gnucash/report/reports/CMakeLists.txt b/gnucash/report/reports/CMakeLists.txt
index d669fc1a6..48ae0d89e 100644
--- a/gnucash/report/reports/CMakeLists.txt
+++ b/gnucash/report/reports/CMakeLists.txt
@@ -52,6 +52,7 @@ set (reports_standard_SCHEME
)
set(reports_sample_SCHEME
+ sample/dashboard.scm
sample/hello-world.scm
sample/view-column.scm
sample/welcome-to-gnucash.scm
diff --git a/gnucash/report/reports/sample/welcome-to-gnucash.scm b/gnucash/report/reports/sample/dashboard.scm
similarity index 52%
copy from gnucash/report/reports/sample/welcome-to-gnucash.scm
copy to gnucash/report/reports/sample/dashboard.scm
index acfbea9b1..7dd187e62 100644
--- a/gnucash/report/reports/sample/welcome-to-gnucash.scm
+++ b/gnucash/report/reports/sample/dashboard.scm
@@ -1,17 +1,19 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; welcome-to-gnucash.scm : introductory report for new users
+;; dashboard.scm : dasboard style report based on Bill's welcome
+;; to gnucash demo report
;; Copyright 2001 Bill Gribble <grib at gnumatic.com>
+;; Copyright 2019 Geert Janssens <geert at kobaltwit.be>
+;;
+;; 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.
;;
-;; 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:
;;
@@ -20,10 +22,10 @@
;; Boston, MA 02110-1301, USA gnu at gnu.org
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report reports sample welcome-to-gnucash))
-(export gnc:make-welcome-report)
+(define-module (gnucash report reports sample dashboard))
+(export gnc:make-dashboard)
-(use-modules (gnucash utilities))
+(use-modules (gnucash utilities))
(use-modules (gnucash core-utils)) ; for gnc:version
(use-modules (gnucash gettext))
(use-modules (gnucash gnc-module))
@@ -35,15 +37,13 @@
(gnc:module-load "gnucash/report/report-system" 0)
(define multicolumn-guid "d8ba4a2e89e8479ca9f6eccdeb164588")
-(define welcome-guid "65135608f2014c6ca8412793a8cdf169")
(define acct-summary-guid "3298541c236b494998b236dfad6ad752")
(define exp-piechart-guid "9bf1892805cb4336be6320fe48ce5446")
(define inc-piechart-guid "e1bd09b8a1dd49dd85760db9d82b045c")
(define inc-exp-chart-guid "80769921e87943adade887b9835a7685")
-(define (gnc:make-welcome-report)
+(define (gnc:make-dashboard)
(let* ((view (gnc:make-report multicolumn-guid))
- (sub-welcome (gnc:make-report welcome-guid))
(sub-accounts (gnc:make-report acct-summary-guid))
(sub-expense-pie (gnc:make-report exp-piechart-guid))
(sub-income-pie (gnc:make-report inc-piechart-guid))
@@ -51,59 +51,22 @@
(options #f))
(define (set-option! section name value)
- (gnc:option-set-value
+ (gnc:option-set-value
(gnc:lookup-option options section name) value))
(set! options (gnc:report-options (gnc-report-find view)))
- (set-option! "General" "Report name" (_ "Welcome to GnuCash"))
+ (set-option! "General" "Report name" (_ "Dashboard"))
(set-option! "General" "Number of columns" 2)
- ;; mark the reports as needing to be saved
- (gnc:report-set-needs-save?! (gnc-report-find sub-welcome) #t)
+ ;; mark the reports as needing to be saved
(gnc:report-set-needs-save?! (gnc-report-find sub-accounts) #t)
(gnc:report-set-needs-save?! (gnc-report-find sub-expense-pie) #t)
(gnc:report-set-needs-save?! (gnc-report-find sub-income-pie) #t)
(gnc:report-set-needs-save?! (gnc-report-find sub-bar) #t)
- (set-option! "__general" "report-list"
- (list (list sub-welcome 1 1 #f)
- (list sub-accounts 1 1 #f)
- (list sub-expense-pie 1 1 #f)
+ (set-option! "__general" "report-list"
+ (list (list sub-expense-pie 1 1 #f)
(list sub-income-pie 1 1 #f)
- (list sub-bar 2 1 #f)))
-
- (set! options (gnc:report-options (gnc-report-find sub-expense-pie)))
- (set-option! "Display" "Plot Width" 400)
-
- (set! options (gnc:report-options (gnc-report-find sub-income-pie)))
- (set-option! "Display" "Plot Width" 400)
-
- (set! options (gnc:report-options (gnc-report-find sub-bar)))
- (set-option! "Display" "Plot Width" 800)
-
+ (list sub-bar 2 1 #f)
+ (list sub-accounts 2 1 #f)))
view))
-
-(define (options)
- (gnc:new-options))
-
-(define (renderer report-obj)
- (let ((doc (gnc:make-html-document)))
- (gnc:html-document-add-object!
- doc
- (gnc:make-html-text
- (gnc:html-markup-h2
- (format #f (_ "Welcome to GnuCash ~a !")
- gnc:version))
- (gnc:html-markup-p
- (format #f (_ "GnuCash ~a has lots of nice features. Here are a few.")
- gnc:version))))
- doc))
-
-(gnc:define-report
- 'name (N_ "Welcome to GnuCash")
- 'version 1
- 'report-guid "65135608f2014c6ca8412793a8cdf169"
- 'in-menu? #f
- 'menu-path (list gnc:menuname-utility)
- 'options-generator options
- 'renderer renderer)
diff --git a/gnucash/report/reports/sample/welcome-to-gnucash.scm b/gnucash/report/reports/sample/welcome-to-gnucash.scm
index acfbea9b1..d037e73a0 100644
--- a/gnucash/report/reports/sample/welcome-to-gnucash.scm
+++ b/gnucash/report/reports/sample/welcome-to-gnucash.scm
@@ -1,17 +1,18 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; welcome-to-gnucash.scm : introductory report for new users
+;; welcome-to-gnucash.scm : very minimalistic sampe report
+;; can be used as skeleton to make new reports
;; Copyright 2001 Bill Gribble <grib at gnumatic.com>
;;
-;; 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.
-;;
+;; 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:
;;
@@ -21,9 +22,8 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports sample welcome-to-gnucash))
-(export gnc:make-welcome-report)
-(use-modules (gnucash utilities))
+(use-modules (gnucash utilities))
(use-modules (gnucash core-utils)) ; for gnc:version
(use-modules (gnucash gettext))
(use-modules (gnucash gnc-module))
@@ -34,63 +34,14 @@
(gnc:module-load "gnucash/report/report-system" 0)
-(define multicolumn-guid "d8ba4a2e89e8479ca9f6eccdeb164588")
-(define welcome-guid "65135608f2014c6ca8412793a8cdf169")
-(define acct-summary-guid "3298541c236b494998b236dfad6ad752")
-(define exp-piechart-guid "9bf1892805cb4336be6320fe48ce5446")
-(define inc-piechart-guid "e1bd09b8a1dd49dd85760db9d82b045c")
-(define inc-exp-chart-guid "80769921e87943adade887b9835a7685")
-
-(define (gnc:make-welcome-report)
- (let* ((view (gnc:make-report multicolumn-guid))
- (sub-welcome (gnc:make-report welcome-guid))
- (sub-accounts (gnc:make-report acct-summary-guid))
- (sub-expense-pie (gnc:make-report exp-piechart-guid))
- (sub-income-pie (gnc:make-report inc-piechart-guid))
- (sub-bar (gnc:make-report inc-exp-chart-guid))
- (options #f))
-
- (define (set-option! section name value)
- (gnc:option-set-value
- (gnc:lookup-option options section name) value))
-
- (set! options (gnc:report-options (gnc-report-find view)))
- (set-option! "General" "Report name" (_ "Welcome to GnuCash"))
- (set-option! "General" "Number of columns" 2)
-
- ;; mark the reports as needing to be saved
- (gnc:report-set-needs-save?! (gnc-report-find sub-welcome) #t)
- (gnc:report-set-needs-save?! (gnc-report-find sub-accounts) #t)
- (gnc:report-set-needs-save?! (gnc-report-find sub-expense-pie) #t)
- (gnc:report-set-needs-save?! (gnc-report-find sub-income-pie) #t)
- (gnc:report-set-needs-save?! (gnc-report-find sub-bar) #t)
-
- (set-option! "__general" "report-list"
- (list (list sub-welcome 1 1 #f)
- (list sub-accounts 1 1 #f)
- (list sub-expense-pie 1 1 #f)
- (list sub-income-pie 1 1 #f)
- (list sub-bar 2 1 #f)))
-
- (set! options (gnc:report-options (gnc-report-find sub-expense-pie)))
- (set-option! "Display" "Plot Width" 400)
-
- (set! options (gnc:report-options (gnc-report-find sub-income-pie)))
- (set-option! "Display" "Plot Width" 400)
-
- (set! options (gnc:report-options (gnc-report-find sub-bar)))
- (set-option! "Display" "Plot Width" 800)
-
- view))
-
-(define (options)
+(define (options)
(gnc:new-options))
(define (renderer report-obj)
(let ((doc (gnc:make-html-document)))
- (gnc:html-document-add-object!
+ (gnc:html-document-add-object!
doc
- (gnc:make-html-text
+ (gnc:make-html-text
(gnc:html-markup-h2
(format #f (_ "Welcome to GnuCash ~a !")
gnc:version))
@@ -99,7 +50,7 @@
gnc:version))))
doc))
-(gnc:define-report
+(gnc:define-report
'name (N_ "Welcome to GnuCash")
'version 1
'report-guid "65135608f2014c6ca8412793a8cdf169"
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6cfdc7593..30e7bdd91 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -425,6 +425,7 @@ 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/dashboard.scm
gnucash/report/reports/sample/hello-world.scm
gnucash/report/reports/sample/view-column.scm
gnucash/report/reports/sample/welcome-to-gnucash.scm
commit 7cc9d5cd6984f5484893a42b758c9271b2381243
Author: Geert Janssens <geert at kobaltwit.be>
Date: Fri May 17 16:24:41 2019 +0200
Reports cleanup - declare common guids in a common file to avoid the need for a use-modules call in other reports
diff --git a/gnucash/report/report-system/report-system.scm b/gnucash/report/report-system/report-system.scm
index e7aae7aa1..99d0a0f40 100644
--- a/gnucash/report/report-system/report-system.scm
+++ b/gnucash/report/report-system/report-system.scm
@@ -781,4 +781,15 @@
(load-from-path "report")
(load-from-path "trep-engine")
+;; Report uuids used for the category barcharts
+
+(export category-barchart-income-uuid
+ category-barchart-expense-uuid
+ category-barchart-asset-uuid
+ category-barchart-liability-uuid)
+
+(define category-barchart-income-uuid "44f81bee049b4b3ea908f8dac9a9474e")
+(define category-barchart-expense-uuid "b1f15b2052c149df93e698fe85a81ea6")
+(define category-barchart-asset-uuid "e9cf815f79db44bcb637d0295093ae3d")
+(define category-barchart-liability-uuid "faf410e8f8da481fbc09e4763da40bcc")
(gnc-hook-add-scm-dangler HOOK-SAVE-OPTIONS gnc:save-style-sheet-options)
diff --git a/gnucash/report/reports/standard/category-barchart.scm b/gnucash/report/reports/standard/category-barchart.scm
index 525d223d0..6c7db2246 100644
--- a/gnucash/report/reports/standard/category-barchart.scm
+++ b/gnucash/report/reports/standard/category-barchart.scm
@@ -782,16 +782,6 @@ developing over time"))
(gnc:report-finished)
document))
-;; Export reports
-
-(export category-barchart-income-uuid category-barchart-expense-uuid
- category-barchart-asset-uuid category-barchart-liability-uuid)
-
-(define category-barchart-income-uuid "44f81bee049b4b3ea908f8dac9a9474e")
-(define category-barchart-expense-uuid "b1f15b2052c149df93e698fe85a81ea6")
-(define category-barchart-asset-uuid "e9cf815f79db44bcb637d0295093ae3d")
-(define category-barchart-liability-uuid "faf410e8f8da481fbc09e4763da40bcc")
-
(for-each
(lambda (l)
(let ((tip-and-rev (cddddr l)))
diff --git a/gnucash/report/reports/standard/net-charts.scm b/gnucash/report/reports/standard/net-charts.scm
index 6e8b6b57f..30c0257c3 100644
--- a/gnucash/report/reports/standard/net-charts.scm
+++ b/gnucash/report/reports/standard/net-charts.scm
@@ -33,7 +33,6 @@
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))
-(use-modules (gnucash report reports standard category-barchart)) ; for guids of called reports
(gnc:module-load "gnucash/report/report-system" 0)
diff --git a/gnucash/report/reports/standard/test/test-charts.scm b/gnucash/report/reports/standard/test/test-charts.scm
index 936663ad6..d49fb011c 100644
--- a/gnucash/report/reports/standard/test/test-charts.scm
+++ b/gnucash/report/reports/standard/test/test-charts.scm
@@ -1,6 +1,7 @@
(use-modules (gnucash gnc-module))
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
(use-modules (gnucash engine test test-extras))
+(use-modules (gnucash report reports standard category-barchart))
(use-modules (gnucash report reports standard net-charts))
(use-modules (gnucash report reports standard account-piecharts))
(use-modules (gnucash report reports standard cashflow-barchart))
commit 2ac9e2137849c8d13cc2477ba9c1d3eff51eef81
Author: Geert Janssens <geert at kobaltwit.be>
Date: Fri Apr 5 22:00:11 2019 +0200
Report fs cleanup - move utility reports to sample directory
And have them load by the same generic load mechanism
diff --git a/gnucash/report/CMakeLists.txt b/gnucash/report/CMakeLists.txt
index 5ce629451..519d76e9b 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 50731b065..30995fd40 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 ec2fdee2d..42051faf7 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 94af04771..69a727858 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 2dfe6e4ee..d669fc1a6 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 7ea317770..8f49aa605 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 d14988879..d1d1245f2 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 f375938a5..52568dfc3 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 49a300ddd..cf1946d83 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 79b8d5a15..acfbea9b1 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 at 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 bb407dbae..e4eb69cb5 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 af969bc23..000000000
--- 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 8a849ca91..000000000
--- 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 at 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 b805cd4ec..6cfdc7593 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
commit f2368700a846b1dcdf9309d42bd0fb2ab5a12aca
Author: Geert Janssens <geert at kobaltwit.be>
Date: Fri May 24 16:44:59 2019 +0200
Rename reports/data to reports/support and add README file
diff --git a/gnucash/report/reports/CMakeLists.txt b/gnucash/report/reports/CMakeLists.txt
index 07083858c..2dfe6e4ee 100644
--- a/gnucash/report/reports/CMakeLists.txt
+++ b/gnucash/report/reports/CMakeLists.txt
@@ -1,6 +1,6 @@
add_subdirectory(standard/test)
-add_subdirectory(data)
+add_subdirectory(support)
set (reports_common_SCHEME
aging.scm
@@ -93,4 +93,4 @@ gnc_add_scheme_targets(scm-reports-standard
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})
-set(reports_DIST ${reports_DIST_local} ${reports_data_DIST} ${test_reports_standard_DIST} PARENT_SCOPE)
+set(reports_DIST ${reports_DIST_local} ${reports_support_DIST} ${test_reports_standard_DIST} PARENT_SCOPE)
diff --git a/gnucash/report/reports/data/CMakeLists.txt b/gnucash/report/reports/data/CMakeLists.txt
deleted file mode 100644
index be294083d..000000000
--- a/gnucash/report/reports/data/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-set(reports_DATA
- taxinvoice.eguile.scm
- taxinvoice.css
- receipt.eguile.scm
- receipt.css
- balsheet-eg.css
- balsheet-eg.eguile.scm
-)
-
-install(FILES ${reports_DATA} DESTINATION ${SCHEME_INSTALLED_SOURCE_DIR}/gnucash/report)
-
-set_local_dist(reports_data_DIST_local CMakeLists.txt ${reports_DATA})
-set(reports_data_DIST ${reports_data_DIST_local} PARENT_SCOPE)
diff --git a/gnucash/report/reports/support/CMakeLists.txt b/gnucash/report/reports/support/CMakeLists.txt
new file mode 100644
index 000000000..23195aebe
--- /dev/null
+++ b/gnucash/report/reports/support/CMakeLists.txt
@@ -0,0 +1,17 @@
+set(support_DATA
+ taxinvoice.eguile.scm
+ taxinvoice.css
+ receipt.eguile.scm
+ receipt.css
+ balsheet-eg.css
+ balsheet-eg.eguile.scm
+)
+
+install(FILES ${support_DATA} DESTINATION ${SCHEME_INSTALLED_SOURCE_DIR}/gnucash/report)
+
+set(support_EXTRA_DIST
+ README
+)
+
+set_local_dist(reports_support_DIST_local CMakeLists.txt ${support_DATA} ${support_EXTRA_DIST})
+set(reports_support_DIST ${reports_support_DIST_local} PARENT_SCOPE)
diff --git a/gnucash/report/reports/support/README b/gnucash/report/reports/support/README
new file mode 100644
index 000000000..8f7865e7e
--- /dev/null
+++ b/gnucash/report/reports/support/README
@@ -0,0 +1,5 @@
+This directory is intended to contain files needed by the reports
+but that aren't reports themselves.
+
+Currently that includes the eguile template files and the accompanying
+css files. Other support files could be inserted here as well.
diff --git a/gnucash/report/reports/data/balsheet-eg.css b/gnucash/report/reports/support/balsheet-eg.css
similarity index 100%
rename from gnucash/report/reports/data/balsheet-eg.css
rename to gnucash/report/reports/support/balsheet-eg.css
diff --git a/gnucash/report/reports/data/balsheet-eg.eguile.scm b/gnucash/report/reports/support/balsheet-eg.eguile.scm
similarity index 100%
rename from gnucash/report/reports/data/balsheet-eg.eguile.scm
rename to gnucash/report/reports/support/balsheet-eg.eguile.scm
diff --git a/gnucash/report/reports/data/receipt.css b/gnucash/report/reports/support/receipt.css
similarity index 100%
rename from gnucash/report/reports/data/receipt.css
rename to gnucash/report/reports/support/receipt.css
diff --git a/gnucash/report/reports/data/receipt.eguile.scm b/gnucash/report/reports/support/receipt.eguile.scm
similarity index 100%
rename from gnucash/report/reports/data/receipt.eguile.scm
rename to gnucash/report/reports/support/receipt.eguile.scm
diff --git a/gnucash/report/reports/data/taxinvoice.css b/gnucash/report/reports/support/taxinvoice.css
similarity index 100%
rename from gnucash/report/reports/data/taxinvoice.css
rename to gnucash/report/reports/support/taxinvoice.css
diff --git a/gnucash/report/reports/data/taxinvoice.eguile.scm b/gnucash/report/reports/support/taxinvoice.eguile.scm
similarity index 100%
rename from gnucash/report/reports/data/taxinvoice.eguile.scm
rename to gnucash/report/reports/support/taxinvoice.eguile.scm
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f89d7d808..b805cd4ec 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -424,9 +424,6 @@ gnucash/report/report-gnome/gnc-plugin-page-report.c
gnucash/report/report-gnome/report-gnome.scm
gnucash/report/report-gnome/window-report.c
gnucash/report/reports/aging.scm
-gnucash/report/reports/data/balsheet-eg.eguile.scm
-gnucash/report/reports/data/receipt.eguile.scm
-gnucash/report/reports/data/taxinvoice.eguile.scm
gnucash/report/reports/reports.scm
gnucash/report/reports/standard/account-piecharts.scm
gnucash/report/reports/standard/account-summary.scm
@@ -466,6 +463,9 @@ gnucash/report/reports/standard/sx-summary.scm
gnucash/report/reports/standard/taxinvoice.scm
gnucash/report/reports/standard/transaction.scm
gnucash/report/reports/standard/trial-balance.scm
+gnucash/report/reports/support/balsheet-eg.eguile.scm
+gnucash/report/reports/support/receipt.eguile.scm
+gnucash/report/reports/support/taxinvoice.eguile.scm
gnucash/report/report-system/collectors.scm
gnucash/report/report-system/commodity-utilities.scm
gnucash/report/report-system/eguile-gnc.scm
commit c3b9d38956ba8e9795754b1666b81bb69119c9ee
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Apr 4 23:17:35 2019 +0200
Report fs cleanup - move business report data files to a common reports data directory
diff --git a/gnucash/report/CMakeLists.txt b/gnucash/report/CMakeLists.txt
index e1804feaa..5ce629451 100644
--- a/gnucash/report/CMakeLists.txt
+++ b/gnucash/report/CMakeLists.txt
@@ -1,5 +1,4 @@
-add_subdirectory(business-reports)
add_subdirectory(jqplot)
add_subdirectory(locale-specific)
add_subdirectory(report-gnome)
@@ -9,5 +8,5 @@ add_subdirectory(stylesheets)
add_subdirectory(utility-reports)
set_local_dist(report_DIST_local CMakeLists.txt )
-set(report_DIST ${report_DIST_local} ${business_reports_DIST} ${jqplot_DIST} ${locale_specific_DIST} ${report_gnome_DIST} ${report_system_DIST}
+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)
diff --git a/gnucash/report/business-reports/CMakeLists.txt b/gnucash/report/business-reports/CMakeLists.txt
deleted file mode 100644
index 6cbd003c6..000000000
--- a/gnucash/report/business-reports/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-set(business_reports_DATA
- taxinvoice.eguile.scm
- taxinvoice.css
- receipt.eguile.scm
- receipt.css
- balsheet-eg.css
- balsheet-eg.eguile.scm
-)
-
-install(FILES ${business_reports_DATA} DESTINATION ${SCHEME_INSTALLED_SOURCE_DIR}/gnucash/report)
-
-set_local_dist(business_reports_DIST_local CMakeLists.txt
- ${business_reports_DATA})
-set(business_reports_DIST ${business_reports_DIST_local} PARENT_SCOPE)
diff --git a/gnucash/report/report-system/html-document.scm b/gnucash/report/report-system/html-document.scm
index f7124f6bd..b0c3da577 100644
--- a/gnucash/report/report-system/html-document.scm
+++ b/gnucash/report/report-system/html-document.scm
@@ -146,9 +146,9 @@
(gnc:report-render-starting (gnc:html-document-title doc))
(when headers?
;;This is the only place where <html> appears
- ;;with the exception of 2 reports:
- ;;./share/gnucash/scm/gnucash/report/taxinvoice.eguile.scm:<html>
- ;;./share/gnucash/scm/gnucash/report/balsheet-eg.eguile.scm:<html>
+ ;;with the exception of 2 eguile report templates:
+ ;;./share/gnucash/scm/gnucash/report/reports/data/taxinvoice.eguile.scm:<html>
+ ;;./share/gnucash/scm/gnucash/report/reports/data/balsheet-eg.eguile.scm:<html>
(push "<html>\n")
(push "<head>\n")
diff --git a/gnucash/report/reports/CMakeLists.txt b/gnucash/report/reports/CMakeLists.txt
index f4ad5ba73..07083858c 100644
--- a/gnucash/report/reports/CMakeLists.txt
+++ b/gnucash/report/reports/CMakeLists.txt
@@ -1,5 +1,6 @@
add_subdirectory(standard/test)
+add_subdirectory(data)
set (reports_common_SCHEME
aging.scm
@@ -92,4 +93,4 @@ gnc_add_scheme_targets(scm-reports-standard
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})
-set(reports_DIST ${reports_DIST_local} ${test_reports_standard_DIST} PARENT_SCOPE)
+set(reports_DIST ${reports_DIST_local} ${reports_data_DIST} ${test_reports_standard_DIST} PARENT_SCOPE)
diff --git a/gnucash/report/reports/data/CMakeLists.txt b/gnucash/report/reports/data/CMakeLists.txt
new file mode 100644
index 000000000..be294083d
--- /dev/null
+++ b/gnucash/report/reports/data/CMakeLists.txt
@@ -0,0 +1,13 @@
+set(reports_DATA
+ taxinvoice.eguile.scm
+ taxinvoice.css
+ receipt.eguile.scm
+ receipt.css
+ balsheet-eg.css
+ balsheet-eg.eguile.scm
+)
+
+install(FILES ${reports_DATA} DESTINATION ${SCHEME_INSTALLED_SOURCE_DIR}/gnucash/report)
+
+set_local_dist(reports_data_DIST_local CMakeLists.txt ${reports_DATA})
+set(reports_data_DIST ${reports_data_DIST_local} PARENT_SCOPE)
diff --git a/gnucash/report/business-reports/balsheet-eg.css b/gnucash/report/reports/data/balsheet-eg.css
similarity index 100%
rename from gnucash/report/business-reports/balsheet-eg.css
rename to gnucash/report/reports/data/balsheet-eg.css
diff --git a/gnucash/report/business-reports/balsheet-eg.eguile.scm b/gnucash/report/reports/data/balsheet-eg.eguile.scm
similarity index 100%
rename from gnucash/report/business-reports/balsheet-eg.eguile.scm
rename to gnucash/report/reports/data/balsheet-eg.eguile.scm
diff --git a/gnucash/report/business-reports/receipt.css b/gnucash/report/reports/data/receipt.css
similarity index 100%
rename from gnucash/report/business-reports/receipt.css
rename to gnucash/report/reports/data/receipt.css
diff --git a/gnucash/report/business-reports/receipt.eguile.scm b/gnucash/report/reports/data/receipt.eguile.scm
similarity index 100%
rename from gnucash/report/business-reports/receipt.eguile.scm
rename to gnucash/report/reports/data/receipt.eguile.scm
diff --git a/gnucash/report/business-reports/taxinvoice.css b/gnucash/report/reports/data/taxinvoice.css
similarity index 100%
rename from gnucash/report/business-reports/taxinvoice.css
rename to gnucash/report/reports/data/taxinvoice.css
diff --git a/gnucash/report/business-reports/taxinvoice.eguile.scm b/gnucash/report/reports/data/taxinvoice.eguile.scm
similarity index 100%
rename from gnucash/report/business-reports/taxinvoice.eguile.scm
rename to gnucash/report/reports/data/taxinvoice.eguile.scm
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 78b7abf36..f89d7d808 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -411,9 +411,6 @@ gnucash/register/register-gnome/gnucash-style.c
gnucash/register/register-gnome/pricecell-gnome.c
gnucash/register/register-gnome/quickfillcell-gnome.c
gnucash/register/register-gnome/table-gnome.c
-gnucash/report/business-reports/balsheet-eg.eguile.scm
-gnucash/report/business-reports/receipt.eguile.scm
-gnucash/report/business-reports/taxinvoice.eguile.scm
gnucash/report/locale-specific/us/de_DE.scm
gnucash/report/locale-specific/us/gncmod-locale-reports-us.c
gnucash/report/locale-specific/us/taxtxf-de_DE.scm
@@ -427,6 +424,9 @@ gnucash/report/report-gnome/gnc-plugin-page-report.c
gnucash/report/report-gnome/report-gnome.scm
gnucash/report/report-gnome/window-report.c
gnucash/report/reports/aging.scm
+gnucash/report/reports/data/balsheet-eg.eguile.scm
+gnucash/report/reports/data/receipt.eguile.scm
+gnucash/report/reports/data/taxinvoice.eguile.scm
gnucash/report/reports/reports.scm
gnucash/report/reports/standard/account-piecharts.scm
gnucash/report/reports/standard/account-summary.scm
commit e97bb62f8c69fdc6e0d05e510ae0eac028c30175
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Apr 4 23:04:38 2019 +0200
Report fs cleanup - move business report tests to standard tests directory
diff --git a/gnucash/report/business-reports/CMakeLists.txt b/gnucash/report/business-reports/CMakeLists.txt
index c66bffa6c..6cbd003c6 100644
--- a/gnucash/report/business-reports/CMakeLists.txt
+++ b/gnucash/report/business-reports/CMakeLists.txt
@@ -1,5 +1,3 @@
-add_subdirectory (test)
-
set(business_reports_DATA
taxinvoice.eguile.scm
taxinvoice.css
@@ -13,5 +11,4 @@ install(FILES ${business_reports_DATA} DESTINATION ${SCHEME_INSTALLED_SOURCE_DIR
set_local_dist(business_reports_DIST_local CMakeLists.txt
${business_reports_DATA})
-set(business_reports_DIST ${business_reports_DIST_local}
- ${test_business_reports_DIST} PARENT_SCOPE)
+set(business_reports_DIST ${business_reports_DIST_local} PARENT_SCOPE)
diff --git a/gnucash/report/business-reports/test/CMakeLists.txt b/gnucash/report/business-reports/test/CMakeLists.txt
deleted file mode 100644
index 26fe43693..000000000
--- a/gnucash/report/business-reports/test/CMakeLists.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-
-set(scm_test_business_reports_with_srfi64_SOURCES
- test-invoice.scm
-)
-
-set(GUILE_DEPENDS
- scm-gnc-module
- scm-app-utils
- scm-engine
- scm-test-engine
- scm-gettext
- scm-scm
- scm-test-report-system
- scm-report-stylesheets
- )
-
-if (HAVE_SRFI64)
- gnc_add_scheme_tests("${scm_test_business_reports_with_srfi64_SOURCES}")
-endif (HAVE_SRFI64)
-
-gnc_add_scheme_targets(scm-test-business-reports
- "${scm_test_business_reports_SOURCES}"
- gnucash/report/business-reports/test
- "scm-test-business-support"
- FALSE
-)
-
-add_dependencies(check scm-test-business-reports)
-
-set_dist_list(test_business_reports_DIST CMakeLists.txt
- ${scm_test_business_reports_with_srfi64_SOURCES}
- )
diff --git a/gnucash/report/reports/standard/test/CMakeLists.txt b/gnucash/report/reports/standard/test/CMakeLists.txt
index ffbd625c7..9d0f56bca 100644
--- a/gnucash/report/reports/standard/test/CMakeLists.txt
+++ b/gnucash/report/reports/standard/test/CMakeLists.txt
@@ -14,6 +14,7 @@ set(scm_test_with_srfi64_SOURCES
test-budget.scm
test-register.scm
test-average-balance.scm
+ test-invoice.scm
)
set(scm_test_with_textual_ports_SOURCES
diff --git a/gnucash/report/business-reports/test/test-invoice.scm b/gnucash/report/reports/standard/test/test-invoice.scm
similarity index 100%
rename from gnucash/report/business-reports/test/test-invoice.scm
rename to gnucash/report/reports/standard/test/test-invoice.scm
commit 4a721e1f58e6bd36fc00e622db6660d38588bbe1
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Apr 4 22:45:49 2019 +0200
Report fs cleanup - integrate business reports into the standard reports directory
The business features are no longer an optional plugin so
there's no reason any more to treat them specially.
diff --git a/gnucash/report/business-reports/CMakeLists.txt b/gnucash/report/business-reports/CMakeLists.txt
index 780f4829a..c66bffa6c 100644
--- a/gnucash/report/business-reports/CMakeLists.txt
+++ b/gnucash/report/business-reports/CMakeLists.txt
@@ -1,19 +1,5 @@
add_subdirectory (test)
-set (business_reports_SCHEME
- aging.scm
- customer-summary.scm
- taxinvoice.scm
- receipt.scm
- invoice.scm
- job-report.scm
- owner-report.scm
- payables.scm
- receivables.scm
- balsheet-eg.scm
- business-reports.scm
-)
-
set(business_reports_DATA
taxinvoice.eguile.scm
taxinvoice.css
@@ -23,29 +9,9 @@ set(business_reports_DATA
balsheet-eg.eguile.scm
)
-set(GUILE_OUTPUT_DIR gnucash/report)
-set(GUILE_DEPENDS
- gncmod-html
- scm-app-utils
- scm-gettext
- scm-gnc-module
- scm-engine
- scm-scm
- scm-business-reports-links
- scm-reports
- scm-report-system
- )
-
-gnc_add_scheme_targets(scm-business-reports
- "${business_reports_SCHEME}"
- ${GUILE_OUTPUT_DIR}
- "${GUILE_DEPENDS}"
- TRUE
-)
-
install(FILES ${business_reports_DATA} DESTINATION ${SCHEME_INSTALLED_SOURCE_DIR}/gnucash/report)
set_local_dist(business_reports_DIST_local CMakeLists.txt
- ${business_reports_SCHEME} ${business_reports_DATA})
+ ${business_reports_DATA})
set(business_reports_DIST ${business_reports_DIST_local}
${test_business_reports_DIST} PARENT_SCOPE)
diff --git a/gnucash/report/business-reports/business-reports.scm b/gnucash/report/business-reports/business-reports.scm
deleted file mode 100644
index ac4d42e9e..000000000
--- a/gnucash/report/business-reports/business-reports.scm
+++ /dev/null
@@ -1,41 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; business-reports.scm
-;; load the business report definitions
-;;
-;; Copyright (c) 2002 Derek Atkins <derek at ihtfp.com>
-;;
-;; 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 at gnu.org
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define-module (gnucash report business-reports))
-
-(use-modules (gnucash report invoice))
-(use-modules (gnucash report taxinvoice))
-(use-modules (gnucash report receipt))
-(use-modules (gnucash report owner-report))
-(use-modules (gnucash report job-report))
-(use-modules (gnucash report payables))
-(use-modules (gnucash report receivables))
-(use-modules (gnucash report customer-summary))
-(use-modules (gnucash report balsheet-eg))
-
-(re-export payables-report-create-internal
- receivables-report-create-internal
- owner-report-create)
-
diff --git a/gnucash/report/business-reports/test/test-invoice.scm b/gnucash/report/business-reports/test/test-invoice.scm
index 17db4d12d..04ae97c19 100644
--- a/gnucash/report/business-reports/test/test-invoice.scm
+++ b/gnucash/report/business-reports/test/test-invoice.scm
@@ -1,7 +1,7 @@
(use-modules (gnucash gnc-module))
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
(use-modules (gnucash engine test test-extras))
-(use-modules (gnucash report invoice))
+(use-modules (gnucash report reports standard invoice))
(use-modules (gnucash report stylesheets))
(use-modules (gnucash report report-system))
(use-modules (gnucash report report-system test test-extras))
diff --git a/gnucash/report/report-gnome/CMakeLists.txt b/gnucash/report/report-gnome/CMakeLists.txt
index 70785b763..50731b065 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-business-reports
scm-utility-reports
)
diff --git a/gnucash/report/report-gnome/gncmod-report-gnome.c b/gnucash/report/report-gnome/gncmod-report-gnome.c
index d6f6258b5..ec2fdee2d 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 business-reports)");
lmod ("(gnucash report utility-reports)");
scm_init_sw_report_gnome_module();
diff --git a/gnucash/report/report-gnome/test/CMakeLists.txt b/gnucash/report/report-gnome/test/CMakeLists.txt
index 2ae4bfc7f..8fb560fa5 100644
--- a/gnucash/report/report-gnome/test/CMakeLists.txt
+++ b/gnucash/report/report-gnome/test/CMakeLists.txt
@@ -17,7 +17,6 @@ set(GUILE_DEPENDS
gnc-module
scm-engine
scm-report-gnome
- scm-business-reports
)
add_custom_target(test-report-gnome ALL DEPENDS ${GUILE_DEPENDS})
diff --git a/gnucash/report/reports/CMakeLists.txt b/gnucash/report/reports/CMakeLists.txt
index 61fbf840e..f4ad5ba73 100644
--- a/gnucash/report/reports/CMakeLists.txt
+++ b/gnucash/report/reports/CMakeLists.txt
@@ -1,7 +1,13 @@
add_subdirectory(standard/test)
-set (reports_common_SCHEME reports.scm)
+set (reports_common_SCHEME
+ aging.scm
+)
+
+set (reports_SCHEME
+ reports.scm
+)
set (reports_standard_SCHEME
standard/account-piecharts.scm
@@ -33,9 +39,18 @@ set (reports_standard_SCHEME
standard/sx-summary.scm
standard/transaction.scm
standard/trial-balance.scm
+ standard/customer-summary.scm
+ standard/taxinvoice.scm
+ standard/receipt.scm
+ standard/invoice.scm
+ standard/job-report.scm
+ standard/owner-report.scm
+ standard/payables.scm
+ standard/receivables.scm
+ standard/balsheet-eg.scm
)
-set(GUILE_DEPENDS
+set(scm_rpts_GUILE_DEPENDS
gncmod-html
scm-core-utils
scm-engine
@@ -45,21 +60,36 @@ set(GUILE_DEPENDS
scm-report-system
)
+set(scm_rpt_std_GUILE_DEPENDS
+ ${scm_rpts_GUILE_DEPENDS}
+ scm-app-utils
+ scm-gnc-module
+ scm-reports-common-links
+ scm-reports-standard-links
+ )
+
+gnc_add_scheme_targets(scm-rpt-reports
+ "${reports_SCHEME}"
+ "gnucash/report"
+ "scm-reports-standard;${scm_rpts_GUILE_DEPENDS}"
+ TRUE
+)
+
gnc_add_scheme_targets(scm-reports-common
"${reports_common_SCHEME}"
- "gnucash/report"
- "scm-reports-standard;${GUILE_DEPENDS}"
+ "gnucash/report/reports"
+ "scm-reports-common-links;${scm_rpt_std_GUILE_DEPENDS}"
TRUE
)
gnc_add_scheme_targets(scm-reports-standard
"${reports_standard_SCHEME}"
"gnucash/report/reports/standard"
- "scm-reports-standard-links;${GUILE_DEPENDS}"
+ "${scm_rpt_std_GUILE_DEPENDS}"
TRUE
)
-add_custom_target(scm-reports ALL DEPENDS scm-reports-standard scm-reports-common)
+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_common_SCHEME} ${reports_standard_SCHEME})
+set_local_dist(reports_DIST_local CMakeLists.txt ${reports_SCHEME} ${reports_common_SCHEME} ${reports_standard_SCHEME})
set(reports_DIST ${reports_DIST_local} ${test_reports_standard_DIST} PARENT_SCOPE)
diff --git a/gnucash/report/business-reports/aging.scm b/gnucash/report/reports/aging.scm
similarity index 99%
rename from gnucash/report/business-reports/aging.scm
rename to gnucash/report/reports/aging.scm
index 8ffe1cce9..bd4139624 100644
--- a/gnucash/report/business-reports/aging.scm
+++ b/gnucash/report/reports/aging.scm
@@ -24,7 +24,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report aging))
+(define-module (gnucash report reports aging))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
diff --git a/gnucash/report/reports/reports.scm b/gnucash/report/reports/reports.scm
index f9b5283d7..7ea317770 100644
--- a/gnucash/report/reports/reports.scm
+++ b/gnucash/report/reports/reports.scm
@@ -37,6 +37,10 @@
(export gnc:receivables-report-create)
(export gnc:owner-report-create)
+;(re-export payables-report-create-internal
+;receivables-report-create-internal
+;owner-report-create)
+
(define report-dirs (list
"standard" ; base directory for standard reports included in gnucash
))
@@ -122,15 +126,15 @@
0
))
-(use-modules (gnucash report payables))
+(use-modules (gnucash report reports standard payables))
(define (gnc:payables-report-create account title show-zeros?)
(payables-report-create-internal account title show-zeros?))
-(use-modules (gnucash report receivables))
+(use-modules (gnucash report reports standard receivables))
(define (gnc:receivables-report-create account title show-zeros?)
(receivables-report-create-internal account title show-zeros?))
-(use-modules (gnucash report owner-report))
+(use-modules (gnucash report reports standard owner-report))
(define (gnc:owner-report-create owner account)
; Figure out an account to use if nothing exists here.
(if (null? account)
diff --git a/gnucash/report/business-reports/balsheet-eg.scm b/gnucash/report/reports/standard/balsheet-eg.scm
similarity index 99%
rename from gnucash/report/business-reports/balsheet-eg.scm
rename to gnucash/report/reports/standard/balsheet-eg.scm
index d1b5cf2ae..eac6509dd 100644
--- a/gnucash/report/business-reports/balsheet-eg.scm
+++ b/gnucash/report/reports/standard/balsheet-eg.scm
@@ -31,7 +31,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report balsheet-eg))
+(define-module (gnucash report reports standard balsheet-eg))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))
diff --git a/gnucash/report/business-reports/customer-summary.scm b/gnucash/report/reports/standard/customer-summary.scm
similarity index 99%
rename from gnucash/report/business-reports/customer-summary.scm
rename to gnucash/report/reports/standard/customer-summary.scm
index 7bbb4a579..b42b1c2b3 100644
--- a/gnucash/report/business-reports/customer-summary.scm
+++ b/gnucash/report/reports/standard/customer-summary.scm
@@ -26,7 +26,7 @@
;; not only print a summary for one single owner (here: only
;; customers), but instead a table showing all customers.
-(define-module (gnucash report customer-summary))
+(define-module (gnucash report reports standard customer-summary))
(use-modules (srfi srfi-1))
(use-modules (gnucash gnc-module))
diff --git a/gnucash/report/business-reports/invoice.scm b/gnucash/report/reports/standard/invoice.scm
similarity index 99%
rename from gnucash/report/business-reports/invoice.scm
rename to gnucash/report/reports/standard/invoice.scm
index ad1e619af..0414639f6 100644
--- a/gnucash/report/business-reports/invoice.scm
+++ b/gnucash/report/reports/standard/invoice.scm
@@ -22,7 +22,7 @@
;; Boston, MA 02110-1301, USA gnu at gnu.org
-(define-module (gnucash report invoice))
+(define-module (gnucash report reports standard invoice))
(use-modules (srfi srfi-1))
(use-modules (gnucash gnc-module))
diff --git a/gnucash/report/business-reports/job-report.scm b/gnucash/report/reports/standard/job-report.scm
similarity index 99%
rename from gnucash/report/business-reports/job-report.scm
rename to gnucash/report/reports/standard/job-report.scm
index 7a46c54f1..53932091d 100644
--- a/gnucash/report/business-reports/job-report.scm
+++ b/gnucash/report/reports/standard/job-report.scm
@@ -24,7 +24,7 @@
;; Boston, MA 02110-1301, USA gnu at gnu.org
-(define-module (gnucash report job-report))
+(define-module (gnucash report reports standard job-report))
(use-modules (srfi srfi-1))
(use-modules (gnucash gnc-module))
diff --git a/gnucash/report/business-reports/owner-report.scm b/gnucash/report/reports/standard/owner-report.scm
similarity index 99%
rename from gnucash/report/business-reports/owner-report.scm
rename to gnucash/report/reports/standard/owner-report.scm
index 71f059b9e..cf8172e66 100644
--- a/gnucash/report/business-reports/owner-report.scm
+++ b/gnucash/report/reports/standard/owner-report.scm
@@ -25,7 +25,7 @@
;; Boston, MA 02110-1301, USA gnu at gnu.org
-(define-module (gnucash report owner-report))
+(define-module (gnucash report reports standard owner-report))
(use-modules (srfi srfi-1))
(use-modules (gnucash gnc-module))
diff --git a/gnucash/report/business-reports/payables.scm b/gnucash/report/reports/standard/payables.scm
similarity index 97%
rename from gnucash/report/business-reports/payables.scm
rename to gnucash/report/reports/standard/payables.scm
index 02596c273..3be38e121 100644
--- a/gnucash/report/business-reports/payables.scm
+++ b/gnucash/report/reports/standard/payables.scm
@@ -23,7 +23,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report payables))
+(define-module (gnucash report reports standard payables))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
@@ -31,7 +31,7 @@
(gnc:module-load "gnucash/report/report-system" 0)
-(use-modules (gnucash report aging))
+(use-modules (gnucash report reports aging))
(use-modules (gnucash report reports))
(define acc-page gnc:pagename-general)
diff --git a/gnucash/report/business-reports/receipt.scm b/gnucash/report/reports/standard/receipt.scm
similarity index 99%
rename from gnucash/report/business-reports/receipt.scm
rename to gnucash/report/reports/standard/receipt.scm
index 8fd6c6bb9..e2b0826ab 100644
--- a/gnucash/report/business-reports/receipt.scm
+++ b/gnucash/report/reports/standard/receipt.scm
@@ -14,7 +14,7 @@
;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
;; 02111-1307 USA
-(define-module (gnucash report receipt))
+(define-module (gnucash report reports standard receipt))
(use-modules (ice-9 local-eval)) ; for the-environment
(use-modules (gnucash utilities))
diff --git a/gnucash/report/business-reports/receivables.scm b/gnucash/report/reports/standard/receivables.scm
similarity index 97%
rename from gnucash/report/business-reports/receivables.scm
rename to gnucash/report/reports/standard/receivables.scm
index 0ba85fb07..fa57775ad 100644
--- a/gnucash/report/business-reports/receivables.scm
+++ b/gnucash/report/reports/standard/receivables.scm
@@ -23,7 +23,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report receivables))
+(define-module (gnucash report reports standard receivables))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
@@ -31,7 +31,7 @@
(gnc:module-load "gnucash/report/report-system" 0)
-(use-modules (gnucash report aging))
+(use-modules (gnucash report reports aging))
(use-modules (gnucash report reports))
(define acc-page gnc:pagename-general)
diff --git a/gnucash/report/business-reports/taxinvoice.scm b/gnucash/report/reports/standard/taxinvoice.scm
similarity index 99%
rename from gnucash/report/business-reports/taxinvoice.scm
rename to gnucash/report/reports/standard/taxinvoice.scm
index 683dd1663..7aa9df8d3 100644
--- a/gnucash/report/business-reports/taxinvoice.scm
+++ b/gnucash/report/reports/standard/taxinvoice.scm
@@ -22,7 +22,7 @@
; - specify a different module name below (eg mytaxinvoice)
; - refer to it from .gnucash/config.user
; (see http://wiki.gnucash.org/wiki/Custom_Reports )
-(define-module (gnucash report taxinvoice))
+(define-module (gnucash report reports standard taxinvoice))
(use-modules (ice-9 local-eval)) ; for the-environment
(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 3eb534fff..bb407dbae 100644
--- a/gnucash/report/reports/standard/test/test-stress-options.scm
+++ b/gnucash/report/reports/standard/test/test-stress-options.scm
@@ -7,7 +7,7 @@
(use-modules (gnucash report reports))
(use-modules (gnucash report view-column))
(use-modules (gnucash report stylesheets))
-(use-modules (gnucash report taxinvoice))
+(use-modules (gnucash report reports standard taxinvoice))
(use-modules (gnucash report report-system))
(use-modules (gnucash report report-system test test-extras))
(use-modules (srfi srfi-64))
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 89bd6aa2b..78b7abf36 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -411,20 +411,9 @@ gnucash/register/register-gnome/gnucash-style.c
gnucash/register/register-gnome/pricecell-gnome.c
gnucash/register/register-gnome/quickfillcell-gnome.c
gnucash/register/register-gnome/table-gnome.c
-gnucash/report/business-reports/aging.scm
gnucash/report/business-reports/balsheet-eg.eguile.scm
-gnucash/report/business-reports/balsheet-eg.scm
-gnucash/report/business-reports/business-reports.scm
-gnucash/report/business-reports/customer-summary.scm
-gnucash/report/business-reports/invoice.scm
-gnucash/report/business-reports/job-report.scm
-gnucash/report/business-reports/owner-report.scm
-gnucash/report/business-reports/payables.scm
gnucash/report/business-reports/receipt.eguile.scm
-gnucash/report/business-reports/receipt.scm
-gnucash/report/business-reports/receivables.scm
gnucash/report/business-reports/taxinvoice.eguile.scm
-gnucash/report/business-reports/taxinvoice.scm
gnucash/report/locale-specific/us/de_DE.scm
gnucash/report/locale-specific/us/gncmod-locale-reports-us.c
gnucash/report/locale-specific/us/taxtxf-de_DE.scm
@@ -437,6 +426,7 @@ gnucash/report/report-gnome/gncmod-report-gnome.c
gnucash/report/report-gnome/gnc-plugin-page-report.c
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/standard/account-piecharts.scm
gnucash/report/reports/standard/account-summary.scm
@@ -444,6 +434,7 @@ gnucash/report/reports/standard/advanced-portfolio.scm
gnucash/report/reports/standard/average-balance.scm
gnucash/report/reports/standard/balance-forecast.scm
gnucash/report/reports/standard/balance-sheet.scm
+gnucash/report/reports/standard/balsheet-eg.scm
gnucash/report/reports/standard/balsheet-pnl.scm
gnucash/report/reports/standard/budget-balance-sheet.scm
gnucash/report/reports/standard/budget-barchart.scm
@@ -453,18 +444,26 @@ gnucash/report/reports/standard/budget.scm
gnucash/report/reports/standard/cashflow-barchart.scm
gnucash/report/reports/standard/cash-flow.scm
gnucash/report/reports/standard/category-barchart.scm
+gnucash/report/reports/standard/customer-summary.scm
gnucash/report/reports/standard/daily-reports.scm
gnucash/report/reports/standard/equity-statement.scm
gnucash/report/reports/standard/general-journal.scm
gnucash/report/reports/standard/general-ledger.scm
gnucash/report/reports/standard/income-gst-statement.scm
gnucash/report/reports/standard/income-statement.scm
+gnucash/report/reports/standard/invoice.scm
+gnucash/report/reports/standard/job-report.scm
gnucash/report/reports/standard/net-charts.scm
+gnucash/report/reports/standard/owner-report.scm
+gnucash/report/reports/standard/payables.scm
gnucash/report/reports/standard/portfolio.scm
gnucash/report/reports/standard/price-scatter.scm
+gnucash/report/reports/standard/receipt.scm
+gnucash/report/reports/standard/receivables.scm
gnucash/report/reports/standard/reconcile-report.scm
gnucash/report/reports/standard/register.scm
gnucash/report/reports/standard/sx-summary.scm
+gnucash/report/reports/standard/taxinvoice.scm
gnucash/report/reports/standard/transaction.scm
gnucash/report/reports/standard/trial-balance.scm
gnucash/report/report-system/collectors.scm
commit 8eaf87d35a507acb4b300dac4042ea552f4511a4
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Apr 4 20:39:04 2019 +0200
Report fs cleanup - Allow generic loader to scan more than one directory
This will allow us to group our reports in subdirectories and still
easily load them all with one command.
For now it still only loads from a single standard reports directory.
It can easily be extended by adding extra subdirectories to
the report-dirs variable in reports.scm
diff --git a/gnucash/report/reports/reports.scm b/gnucash/report/reports/reports.scm
index 1c96b7b18..f9b5283d7 100644
--- a/gnucash/report/reports/reports.scm
+++ b/gnucash/report/reports/reports.scm
@@ -37,6 +37,10 @@
(export gnc:receivables-report-create)
(export gnc:owner-report-create)
+(define report-dirs (list
+ "standard" ; base directory for standard reports included in gnucash
+))
+
;; Returns a list of files in a directory
;;
;; Param:
@@ -68,19 +72,25 @@
;;
;; Return value:
;; List of symbols for reports
-(define (get-report-list)
- (map string->symbol (directory-files (gnc-path-get-stdreportsdir))))
-
-(gnc:debug "stdrpt-dir=" (gnc-path-get-stdreportsdir))
-(gnc:debug "dir-files=" (directory-files (gnc-path-get-stdreportsdir)))
-(gnc:debug "report-list=" (get-report-list))
+(define (get-report-list subdir)
+ (let* ((rpt-dir (gnc-build-reports-path subdir))
+ (rpt-list (directory-files rpt-dir)))
+ (gnc:debug "rpt-subdir=" subdir)
+ (gnc:debug "rpt-dir=" rpt-dir)
+ (gnc:debug "dir-files=" rpt-list)
+ rpt-list))
(for-each
- (lambda (x)
- (module-use!
- (current-module)
- (resolve-interface `(gnucash report reports standard ,x))))
- (get-report-list))
+ (lambda (rpt-dir-str)
+ (for-each
+ (lambda (rpt-file-str)
+ (let ((rpt-file (string->symbol rpt-file-str))
+ (rpt-dir (string->symbol rpt-dir-str)))
+ (module-use!
+ (current-module)
+ (resolve-interface `(gnucash report reports ,rpt-dir ,rpt-file)))))
+ (get-report-list rpt-dir-str)))
+ report-dirs)
(use-modules (gnucash gnc-module))
(gnc:module-load "gnucash/engine" 0)
commit 6c5fc4da299b740236d244dc3c7359eea64ca6ab
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Apr 4 20:34:55 2019 +0200
Report fs cleanup - Add a few convenience functions
These will provide easy access to some of the most important
scm related runtime directories
diff --git a/libgnucash/core-utils/core-utils.i b/libgnucash/core-utils/core-utils.i
index 63a108a09..c14b3721c 100644
--- a/libgnucash/core-utils/core-utils.i
+++ b/libgnucash/core-utils/core-utils.i
@@ -56,6 +56,12 @@ void
%newobject gnc_path_get_bindir;
gchar * gnc_path_get_bindir(void);
+%newobject gnc_path_get_scmdir;
+gchar * gnc_path_get_scmdir(void);
+
+%newobject gnc_path_get_reportsdir;
+gchar * gnc_path_get_reportsdir(void);
+
%newobject gnc_path_get_stdreportsdir;
gchar * gnc_path_get_stdreportsdir(void);
@@ -65,8 +71,12 @@ gchar * gnc_path_find_localized_html_file(const gchar *);
%newobject gnc_build_userdata_path;
gchar * gnc_build_userdata_path(const gchar *);
+%newobject gnc_file_path_absolute;
+gchar *gnc_file_path_absolute (const gchar *, const gchar *);
+
gchar * gnc_build_report_path(const gchar *);
gchar * gnc_build_stdreports_path(const gchar *);
+gchar * gnc_build_reports_path(const gchar *);
void gnc_scm_log_warn(const gchar *);
void gnc_scm_log_error(const gchar *);
diff --git a/libgnucash/core-utils/core-utils.scm b/libgnucash/core-utils/core-utils.scm
index 794ab2213..68e956768 100644
--- a/libgnucash/core-utils/core-utils.scm
+++ b/libgnucash/core-utils/core-utils.scm
@@ -35,11 +35,15 @@
(re-export gnc-prefs-is-debugging-enabled)
(re-export gnc-path-get-bindir)
+(re-export gnc-path-get-scmdir)
+(re-export gnc-path-get-reportsdir)
(re-export gnc-path-get-stdreportsdir)
(re-export gnc-path-find-localized-html-file)
(re-export gnc-build-userdata-path)
(re-export gnc-build-report-path)
(re-export gnc-build-stdreports-path)
+(re-export gnc-build-reports-path)
+(re-export gnc-file-path-absolute)
(re-export gnc-utf8?)
(re-export gnc-utf8-strip-invalid-strdup)
(re-export gnc-locale-from-utf8)
diff --git a/libgnucash/core-utils/gnc-filepath-utils.cpp b/libgnucash/core-utils/gnc-filepath-utils.cpp
index ac46d4227..2b0dcb054 100644
--- a/libgnucash/core-utils/gnc-filepath-utils.cpp
+++ b/libgnucash/core-utils/gnc-filepath-utils.cpp
@@ -1024,6 +1024,21 @@ gnc_userdata_dir_as_path (void)
return gnc_userdata_home;
}
+static const bfs::path&
+gnc_userconfig_dir_as_path (void)
+{
+ if (gnc_userdata_home.empty())
+ /* Don't create missing directories automatically except
+ * if the target directory is the temporary directory. This
+ * should be done properly at a higher level (in the gui
+ * code most likely) very early in application startup.
+ * This call is just a fallback to prevent the code from
+ * crashing because no directories were configured. */
+ gnc_filepath_init();
+
+ return gnc_userconfig_home;
+}
+
gchar *gnc_file_path_absolute (const gchar *prefix, const gchar *relative)
{
bfs::path path_relative (relative);
@@ -1054,7 +1069,7 @@ gchar *gnc_file_path_absolute (const gchar *prefix, const gchar *relative)
}
/** @fn gchar * gnc_build_userdata_path (const gchar *filename)
- * @brief Make a path to filename in the user's configuration directory.
+ * @brief Make a path to filename in the user's gnucash data directory.
*
* @param filename The name of the file
*
@@ -1068,6 +1083,21 @@ gnc_build_userdata_path (const gchar *filename)
return g_strdup((gnc_userdata_dir_as_path() / filename).string().c_str());
}
+/** @fn gchar * gnc_build_userconfig_path (const gchar *filename)
+ * @brief Make a path to filename in the user's configuration directory.
+ *
+ * @param filename The name of the file
+ *
+ * @return An absolute path. The returned string should be freed by the user
+ * using g_free().
+ */
+
+gchar *
+gnc_build_userconfig_path (const gchar *filename)
+{
+ return g_strdup((gnc_userconfig_dir_as_path() / filename).string().c_str());
+}
+
/* Test whether c is a valid character for a win32 file name.
* If so return false, otherwise return true.
*/
@@ -1151,6 +1181,22 @@ gnc_build_report_path (const gchar *filename)
return result;
}
+/** @fn gchar * gnc_build_reports_path (const gchar *dirname)
+ * @brief Make a path to dirname in the reports directory.
+ *
+ * @param dirname The name of the subdirectory
+ *
+ * @return An absolute path. The returned string should be freed by the user
+ * using g_free().
+ */
+
+gchar *
+gnc_build_reports_path (const gchar *dirname)
+{
+ gchar *result = g_build_filename(gnc_path_get_reportsdir(), dirname, (gchar *)NULL);
+ return result;
+}
+
/** @fn gchar * gnc_build_stdreports_path (const gchar *filename)
* @brief Make a path to filename in the standard reports directory.
*
diff --git a/libgnucash/core-utils/gnc-filepath-utils.h b/libgnucash/core-utils/gnc-filepath-utils.h
index f46143842..1c73c8cb6 100644
--- a/libgnucash/core-utils/gnc-filepath-utils.h
+++ b/libgnucash/core-utils/gnc-filepath-utils.h
@@ -106,10 +106,12 @@ char * gnc_filepath_init (void);
const gchar *gnc_userdata_dir (void);
gchar *gnc_build_userdata_path (const gchar *filename);
+gchar *gnc_build_userconfig_path (const gchar *filename);
gchar *gnc_build_book_path (const gchar *filename);
gchar *gnc_build_translog_path (const gchar *filename);
gchar *gnc_build_data_path (const gchar *filename);
gchar *gnc_build_report_path (const gchar *filename);
+gchar *gnc_build_reports_path (const gchar *dirname);
gchar *gnc_build_stdreports_path (const gchar *filename);
const gchar *gnc_userconfig_dir (void);
diff --git a/libgnucash/core-utils/gnc-path.c b/libgnucash/core-utils/gnc-path.c
index db95757a4..2d8a306aa 100644
--- a/libgnucash/core-utils/gnc-path.c
+++ b/libgnucash/core-utils/gnc-path.c
@@ -170,11 +170,11 @@ gchar *gnc_path_get_accountsdir()
return result;
}
-/** Returns the file path to the report directory, usually
- * "$prefix/share/gnucash/scm/gnucash/report".
+/** Returns the file path to the directory containing all guile scripts, usually
+ * "$prefix/share/gnucash/scm".
*
* @returns A newly allocated string. */
-gchar *gnc_path_get_reportdir()
+gchar *gnc_path_get_scmdir()
{
/* Careful: if the cmake variable SCHEME_INSTALLED_SOURCE_DIR gets changed
* in toplevel CMakeLists.txt, this path should probably change as well.
@@ -187,13 +187,38 @@ gchar *gnc_path_get_reportdir()
* runtime.
*/
gchar *pkgdatadir = gnc_path_get_pkgdatadir ();
- gchar *result = g_build_filename (pkgdatadir, "scm",
- "gnucash", "report", (char*)NULL);
+ gchar *result = g_build_filename (pkgdatadir, "scm", (char*)NULL);
g_free (pkgdatadir);
return result;
}
+/** Returns the file path to the report directory, usually
+ * "$prefix/share/gnucash/scm/gnucash/report".
+ *
+ * @returns A newly allocated string. */
+gchar *gnc_path_get_reportdir()
+{
+ gchar *scmdir = gnc_path_get_scmdir ();
+ gchar *result = g_build_filename (scmdir, "gnucash", "report", (char*)NULL);
+ g_free (scmdir);
+
+ return result;
+}
+
+/** Returns the file path to the reports directory, usually
+ * "$prefix/share/gnucash/scm/gnucash/report/reports".
+ *
+ * @returns A newly allocated string. */
+gchar *gnc_path_get_reportsdir()
+{
+ gchar *reportdir = gnc_path_get_reportdir ();
+ gchar *result = g_build_filename (reportdir, "reports", NULL);
+ g_free (reportdir);
+ //printf("Returning reportsdir %s\n", result);
+ return result;
+}
+
/** Returns the file path to the standard
* reports, usually
* "$prefix/share/gnucash/scm/gnucash/report/reports/standard".
diff --git a/libgnucash/core-utils/gnc-path.h b/libgnucash/core-utils/gnc-path.h
index 14f3ccace..ac65ea772 100644
--- a/libgnucash/core-utils/gnc-path.h
+++ b/libgnucash/core-utils/gnc-path.h
@@ -92,12 +92,24 @@ gchar *gnc_path_get_localedir(void);
* @returns A newly allocated string. */
gchar *gnc_path_get_accountsdir(void);
+/** Returns the file path to the directory containing all guile scripts, usually
+ * "$prefix/share/gnucash/scm".
+ *
+ * @returns A newly allocated string. */
+gchar *gnc_path_get_scmdir(void);
+
/** Returns the file path to the report directory, usually
* "$prefix/share/gnucash/scm/gnucash/report".
*
* @returns A newly allocated string. */
gchar *gnc_path_get_reportdir(void);
+/** Returns the file path to the reports, usually
+ * "$prefix/share/gnucash/scm/gnucash/report/reports".
+ *
+ * @returns A newly allocated string. */
+gchar *gnc_path_get_reportsdir(void);
+
/** Returns the file path to the standard
* reports, usually
* "$prefix/share/gnucash/scm/gnucash/report/reports/standard".
commit 72f5417c40336dc5790d6fb17cc1b73c0678a860
Author: Geert Janssens <geert at kobaltwit.be>
Date: Fri Mar 29 19:54:15 2019 +0100
Report fs cleanup - put convenience report generators together in reports.scm
This required the report-register-hook related stuff to move somewhere else as
it was causing a circular dependency. I've moved it into report-system.scm
which should already be built by the time reports is used.
With this business-reports.scm is now only loading the business reports.
diff --git a/gnucash/report/business-reports/aging.scm b/gnucash/report/business-reports/aging.scm
index f7876b1a3..8ffe1cce9 100644
--- a/gnucash/report/business-reports/aging.scm
+++ b/gnucash/report/business-reports/aging.scm
@@ -33,7 +33,6 @@
(gnc:module-load "gnucash/report/report-system" 0)
(use-modules (gnucash report reports))
-(use-modules (gnucash report business-reports))
(define optname-to-date (N_ "To"))
(define optname-sort-by (N_ "Sort By"))
diff --git a/gnucash/report/business-reports/business-reports.scm b/gnucash/report/business-reports/business-reports.scm
index 256b64f50..ac4d42e9e 100644
--- a/gnucash/report/business-reports/business-reports.scm
+++ b/gnucash/report/business-reports/business-reports.scm
@@ -24,27 +24,6 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report business-reports))
-(use-modules (gnucash gnc-module))
-(use-modules (gnucash app-utils))
-(use-modules (gnucash report report-system))
-(use-modules (gnucash report reports))
-
-
-;; Creates a new report instance for the given invoice. The given
-;; report-template-id must refer to an existing report template, which
-;; is then used to instantiate the new report instance.
-(define (gnc:invoice-report-create invoice report-template-id)
- (if (gnc:find-report-template report-template-id)
- ;; We found the report template id, so instantiate a report
- ;; and set the invoice option accordingly.
- (let* ((options (gnc:make-report-options report-template-id))
- (invoice-op (gnc:lookup-option options gnc:pagename-general gnc:optname-invoice-number)))
-
- (gnc:option-set-value invoice-op invoice)
- (gnc:make-report report-template-id options))
- ;; Invalid report-template-id, so let's return zero as an invalid report id.
- 0
- ))
(use-modules (gnucash report invoice))
(use-modules (gnucash report taxinvoice))
@@ -56,18 +35,7 @@
(use-modules (gnucash report customer-summary))
(use-modules (gnucash report balsheet-eg))
-(define (gnc:payables-report-create account title show-zeros?)
- (payables-report-create-internal account title show-zeros?))
-
-(define (gnc:receivables-report-create account title show-zeros?)
- (receivables-report-create-internal account title show-zeros?))
-
-(define (gnc:owner-report-create owner account)
- ; Figure out an account to use if nothing exists here.
- (if (null? account)
- (set! account (find-first-account-for-owner owner)))
- (owner-report-create owner account))
+(re-export payables-report-create-internal
+ receivables-report-create-internal
+ owner-report-create)
-(export gnc:invoice-report-create
- gnc:payables-report-create gnc:receivables-report-create
- gnc:owner-report-create)
diff --git a/gnucash/report/business-reports/customer-summary.scm b/gnucash/report/business-reports/customer-summary.scm
index cd4f2f031..7bbb4a579 100644
--- a/gnucash/report/business-reports/customer-summary.scm
+++ b/gnucash/report/business-reports/customer-summary.scm
@@ -35,7 +35,6 @@
(gnc:module-load "gnucash/report/report-system" 0)
(use-modules (gnucash report reports))
-(use-modules (gnucash report business-reports))
;; Option names
(define optname-from-date (N_ "From"))
diff --git a/gnucash/report/business-reports/invoice.scm b/gnucash/report/business-reports/invoice.scm
index 5f0159b59..ad1e619af 100644
--- a/gnucash/report/business-reports/invoice.scm
+++ b/gnucash/report/business-reports/invoice.scm
@@ -31,7 +31,6 @@
(gnc:module-load "gnucash/report/report-system" 0)
(use-modules (gnucash report reports))
-(use-modules (gnucash report business-reports))
(define (addif pred . data) (if pred data '()))
diff --git a/gnucash/report/business-reports/job-report.scm b/gnucash/report/business-reports/job-report.scm
index 469d596d1..7a46c54f1 100644
--- a/gnucash/report/business-reports/job-report.scm
+++ b/gnucash/report/business-reports/job-report.scm
@@ -33,7 +33,6 @@
(gnc:module-load "gnucash/report/report-system" 0)
(use-modules (gnucash report reports))
-(use-modules (gnucash report business-reports))
(define acct-string (N_ "Account"))
(define owner-string (N_ "Job"))
diff --git a/gnucash/report/business-reports/owner-report.scm b/gnucash/report/business-reports/owner-report.scm
index 4235d50c2..71f059b9e 100644
--- a/gnucash/report/business-reports/owner-report.scm
+++ b/gnucash/report/business-reports/owner-report.scm
@@ -34,7 +34,6 @@
(gnc:module-load "gnucash/report/report-system" 0)
(use-modules (gnucash report reports))
-(use-modules (gnucash report business-reports))
;; Option names
(define optname-from-date (N_ "From"))
diff --git a/gnucash/report/business-reports/payables.scm b/gnucash/report/business-reports/payables.scm
index 53a96187c..02596c273 100644
--- a/gnucash/report/business-reports/payables.scm
+++ b/gnucash/report/business-reports/payables.scm
@@ -33,7 +33,6 @@
(use-modules (gnucash report aging))
(use-modules (gnucash report reports))
-(use-modules (gnucash report business-reports))
(define acc-page gnc:pagename-general)
(define this-acc (N_ "Payable Account"))
diff --git a/gnucash/report/business-reports/receipt.scm b/gnucash/report/business-reports/receipt.scm
index e8d637e51..8fd6c6bb9 100644
--- a/gnucash/report/business-reports/receipt.scm
+++ b/gnucash/report/business-reports/receipt.scm
@@ -25,7 +25,6 @@
(gnc:module-load "gnucash/engine" 0)
(use-modules (gnucash report reports))
-(use-modules (gnucash report business-reports))
(use-modules (gnucash report eguile-utilities))
(use-modules (gnucash report eguile-html-utilities))
diff --git a/gnucash/report/business-reports/receivables.scm b/gnucash/report/business-reports/receivables.scm
index 8e25ade78..0ba85fb07 100644
--- a/gnucash/report/business-reports/receivables.scm
+++ b/gnucash/report/business-reports/receivables.scm
@@ -33,7 +33,6 @@
(use-modules (gnucash report aging))
(use-modules (gnucash report reports))
-(use-modules (gnucash report business-reports))
(define acc-page gnc:pagename-general)
(define this-acc (N_ "Receivables Account"))
diff --git a/gnucash/report/business-reports/taxinvoice.scm b/gnucash/report/business-reports/taxinvoice.scm
index a17deb1c1..683dd1663 100644
--- a/gnucash/report/business-reports/taxinvoice.scm
+++ b/gnucash/report/business-reports/taxinvoice.scm
@@ -33,7 +33,6 @@
(gnc:module-load "gnucash/engine" 0)
(use-modules (gnucash report reports))
-(use-modules (gnucash report business-reports))
(use-modules (gnucash report eguile-utilities))
(use-modules (gnucash report eguile-html-utilities))
diff --git a/gnucash/report/report-system/CMakeLists.txt b/gnucash/report/report-system/CMakeLists.txt
index 9fee1071a..3e3243c69 100644
--- a/gnucash/report/report-system/CMakeLists.txt
+++ b/gnucash/report/report-system/CMakeLists.txt
@@ -75,6 +75,7 @@ set (report_system_SCHEME_3
html-utilities.scm
options-utilities.scm
report-utilities.scm
+ report-register-hooks.scm
report.scm
trep-engine.scm
)
diff --git a/gnucash/report/reports/reports.scm b/gnucash/report/report-system/report-register-hooks.scm
similarity index 53%
copy from gnucash/report/reports/reports.scm
copy to gnucash/report/report-system/report-register-hooks.scm
index 9ead2e8fa..72e551445 100644
--- a/gnucash/report/reports/reports.scm
+++ b/gnucash/report/report-system/report-register-hooks.scm
@@ -1,8 +1,8 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; reports.scm
-;; load the standard report definitions
+;; report-register-hooks.scm
+;; helper functions for loading specific reports based on context
;;
-;; Copyright (c) 2001 Linux Developers Group, Inc.
+;; Copyright (c) 2001 Linux Developers Group, Inc.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; This program is free software; you can redistribute it and/or
@@ -23,15 +23,6 @@
;; Boston, MA 02110-1301, USA gnu at gnu.org
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define-module (gnucash report reports))
-(use-modules (srfi srfi-13))
-(use-modules (gnucash utilities))
-(use-modules (gnucash core-utils))
-
-(export gnc:register-report-create)
-(export gnc:register-report-hook)
-
(define gnc:*register-report-hash* (make-hash-table 23))
;; Keep a hash-table of records, keyed off the account type. Each
@@ -66,7 +57,7 @@
(set-non-split type-info create-fcn))
(hash-set! gnc:*register-report-hash* acct-type type-info)))
-(define (lookup-register-report acct-type split)
+(define (gnc:lookup-register-report acct-type split)
(let ((type-info (hash-ref gnc:*register-report-hash* acct-type)))
(gnc:debug "acct-type: " acct-type)
(gnc:debug "ref: " type-info)
@@ -76,63 +67,3 @@
(if (and split (not (null? split)))
(begin (gnc:debug "get-split...") (get-split type-info))
(begin (gnc:debug "get-non-split...") (get-non-split type-info))))))
-
-
-;; Returns a list of files in a directory
-;;
-;; Param:
-;; dir - directory name
-;;
-;; Return value:
-;; list of files in the directory
-
-(define (directory-files dir)
- (cond
- ((file-exists? dir)
- (let ((dir-stream (opendir dir)))
- (let loop ((fname (readdir dir-stream))
- (acc '()))
- (cond
- ((eof-object? fname)
- (closedir dir-stream)
- acc)
- (else
- (loop (readdir dir-stream)
- (if (string-suffix? ".scm" fname)
- (cons (string-drop-right fname 4) acc)
- acc)))))))
- (else
- (gnc:warn "Can't access " dir ".\nEmpty list will be returned.")
- '())))
-
-;; Return a list of symbols representing reports in the standard reports directory
-;;
-;; Return value:
-;; List of symbols for reports
-(define (get-report-list)
- (map string->symbol (directory-files (gnc-path-get-stdreportsdir))))
-
-(gnc:debug "stdrpt-dir=" (gnc-path-get-stdreportsdir))
-(gnc:debug "dir-files=" (directory-files (gnc-path-get-stdreportsdir)))
-(gnc:debug "report-list=" (get-report-list))
-
-(for-each
- (lambda (x)
- (module-use!
- (current-module)
- (resolve-interface `(gnucash report reports standard ,x))))
- (get-report-list))
-
-(use-modules (gnucash gnc-module))
-(gnc:module-load "gnucash/engine" 0)
-
-(define (gnc:register-report-create account split query journal? ledger-type?
- double? title debit-string credit-string)
- (let* ((acct-type (xaccAccountGetType account))
- (create-fcn (lookup-register-report acct-type split)))
- (gnc:debug "create-fcn: " create-fcn)
- (if create-fcn
- (create-fcn account split query journal? double? title
- debit-string credit-string)
- (gnc:register-report-create-internal #f query journal? ledger-type? double?
- title debit-string credit-string))))
diff --git a/gnucash/report/report-system/report-system.scm b/gnucash/report/report-system/report-system.scm
index 369b5cf8c..e7aae7aa1 100644
--- a/gnucash/report/report-system/report-system.scm
+++ b/gnucash/report/report-system/report-system.scm
@@ -754,6 +754,12 @@
(export gnc:trep-options-generator)
(export gnc:trep-renderer)
+;; report-register-hooks.scm
+
+(export gnc:register-report-hook)
+(export gnc:lookup-register-report)
+
+
(load-from-path "commodity-utilities")
(load-from-path "html-barchart")
(load-from-path "html-document")
@@ -771,6 +777,7 @@
(load-from-path "html-utilities")
(load-from-path "options-utilities")
(load-from-path "report-utilities")
+(load-from-path "report-register-hooks")
(load-from-path "report")
(load-from-path "trep-engine")
diff --git a/gnucash/report/reports/reports.scm b/gnucash/report/reports/reports.scm
index 9ead2e8fa..1c96b7b18 100644
--- a/gnucash/report/reports/reports.scm
+++ b/gnucash/report/reports/reports.scm
@@ -26,57 +26,16 @@
(define-module (gnucash report reports))
(use-modules (srfi srfi-13))
-(use-modules (gnucash utilities))
+(use-modules (gnucash app-utils))
(use-modules (gnucash core-utils))
+(use-modules (gnucash report report-system))
+(use-modules (gnucash utilities))
(export gnc:register-report-create)
-(export gnc:register-report-hook)
-
-(define gnc:*register-report-hash* (make-hash-table 23))
-
-;; Keep a hash-table of records, keyed off the account type. Each
-;; record contains a function pointer for that account-type with split
-;; or without split. If no function is found, then run the 'default'
-;; function
-
-(define acct-type-info (make-record-type "AcctTypeInfo" '(split non-split)))
-
-(define make-acct-type-private
- (record-constructor acct-type-info '(split non-split)))
-
-(define (make-acct-type)
- (make-acct-type-private #f #f))
-
-(define get-split
- (record-accessor acct-type-info 'split))
-
-(define set-split
- (record-modifier acct-type-info 'split))
-
-(define get-non-split
- (record-accessor acct-type-info 'non-split))
-
-(define set-non-split
- (record-modifier acct-type-info 'non-split))
-
-(define (gnc:register-report-hook acct-type split? create-fcn)
- (let ((type-info (hash-ref gnc:*register-report-hash* acct-type (make-acct-type))))
- (if split?
- (set-split type-info create-fcn)
- (set-non-split type-info create-fcn))
- (hash-set! gnc:*register-report-hash* acct-type type-info)))
-
-(define (lookup-register-report acct-type split)
- (let ((type-info (hash-ref gnc:*register-report-hash* acct-type)))
- (gnc:debug "acct-type: " acct-type)
- (gnc:debug "ref: " type-info)
- (gnc:debug "hash: " gnc:*register-report-hash*)
- (gnc:debug "split: " split)
- (and type-info
- (if (and split (not (null? split)))
- (begin (gnc:debug "get-split...") (get-split type-info))
- (begin (gnc:debug "get-non-split...") (get-non-split type-info))))))
-
+(export gnc:invoice-report-create)
+(export gnc:payables-report-create)
+(export gnc:receivables-report-create)
+(export gnc:owner-report-create)
;; Returns a list of files in a directory
;;
@@ -129,10 +88,41 @@
(define (gnc:register-report-create account split query journal? ledger-type?
double? title debit-string credit-string)
(let* ((acct-type (xaccAccountGetType account))
- (create-fcn (lookup-register-report acct-type split)))
+ (create-fcn (gnc:lookup-register-report acct-type split)))
(gnc:debug "create-fcn: " create-fcn)
(if create-fcn
(create-fcn account split query journal? double? title
debit-string credit-string)
(gnc:register-report-create-internal #f query journal? ledger-type? double?
title debit-string credit-string))))
+
+;; Creates a new report instance for the given invoice. The given
+;; report-template-id must refer to an existing report template, which
+;; is then used to instantiate the new report instance.
+(define (gnc:invoice-report-create invoice report-template-id)
+ (if (gnc:find-report-template report-template-id)
+ ;; We found the report template id, so instantiate a report
+ ;; and set the invoice option accordingly.
+ (let* ((options (gnc:make-report-options report-template-id))
+ (invoice-op (gnc:lookup-option options gnc:pagename-general gnc:optname-invoice-number)))
+
+ (gnc:option-set-value invoice-op invoice)
+ (gnc:make-report report-template-id options))
+ ;; Invalid report-template-id, so let's return zero as an invalid report id.
+ 0
+ ))
+
+(use-modules (gnucash report payables))
+(define (gnc:payables-report-create account title show-zeros?)
+ (payables-report-create-internal account title show-zeros?))
+
+(use-modules (gnucash report receivables))
+(define (gnc:receivables-report-create account title show-zeros?)
+ (receivables-report-create-internal account title show-zeros?))
+
+(use-modules (gnucash report owner-report))
+(define (gnc:owner-report-create owner account)
+ ; Figure out an account to use if nothing exists here.
+ (if (null? account)
+ (set! account (find-first-account-for-owner owner)))
+ (owner-report-create owner account))
diff --git a/gnucash/report/reports/standard/test/test-stress-options.scm b/gnucash/report/reports/standard/test/test-stress-options.scm
index 0d79fdce4..3eb534fff 100644
--- a/gnucash/report/reports/standard/test/test-stress-options.scm
+++ b/gnucash/report/reports/standard/test/test-stress-options.scm
@@ -5,7 +5,6 @@
(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 business-reports))
(use-modules (gnucash report view-column))
(use-modules (gnucash report stylesheets))
(use-modules (gnucash report taxinvoice))
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 91cce51f9..89bd6aa2b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -489,6 +489,7 @@ gnucash/report/report-system/html-text.scm
gnucash/report/report-system/html-utilities.scm
gnucash/report/report-system/options-utilities.scm
gnucash/report/report-system/report-collectors.scm
+gnucash/report/report-system/report-register-hooks.scm
gnucash/report/report-system/report.scm
gnucash/report/report-system/report-system.scm
gnucash/report/report-system/report-utilities.scm
commit 20eb1cc6cd20b9bedfdc349b6b08b798f8ab2a5d
Author: Geert Janssens <geert at kobaltwit.be>
Date: Fri Mar 29 17:46:27 2019 +0100
Report fs cleanup - move business related anchor generating functions with the others
diff --git a/gnucash/report/business-reports/business-reports.scm b/gnucash/report/business-reports/business-reports.scm
index 15dfefd51..256b64f50 100644
--- a/gnucash/report/business-reports/business-reports.scm
+++ b/gnucash/report/business-reports/business-reports.scm
@@ -29,70 +29,6 @@
(use-modules (gnucash report report-system))
(use-modules (gnucash report reports))
-;; to define gnc-build-url
-(gnc:module-load "gnucash/html" 0)
-
-(define (guid-ref idstr type guid)
- (gnc-build-url type (string-append idstr guid) ""))
-
-(define (gnc:customer-anchor-text customer)
- (guid-ref "customer=" URL-TYPE-CUSTOMER (gncCustomerReturnGUID customer)))
-
-(define (gnc:job-anchor-text job)
- (guid-ref "job=" URL-TYPE-JOB (gncJobReturnGUID job)))
-
-(define (gnc:vendor-anchor-text vendor)
- (guid-ref "vendor=" URL-TYPE-VENDOR (gncVendorReturnGUID vendor)))
-
-(define (gnc:employee-anchor-text employee)
- (guid-ref "employee=" URL-TYPE-EMPLOYEE (gncEmployeeReturnGUID employee)))
-
-(define (gnc:invoice-anchor-text invoice)
- (guid-ref "invoice=" URL-TYPE-INVOICE (gncInvoiceReturnGUID invoice)))
-
-(define (gnc:owner-anchor-text owner)
- (let ((type (gncOwnerGetType (gncOwnerGetEndOwner owner))))
- (cond
- ((eqv? type GNC-OWNER-CUSTOMER)
- (gnc:customer-anchor-text (gncOwnerGetCustomer owner)))
-
- ((eqv? type GNC-OWNER-VENDOR)
- (gnc:vendor-anchor-text (gncOwnerGetVendor owner)))
-
- ((eqv? type GNC-OWNER-EMPLOYEE)
- (gnc:employee-anchor-text (gncOwnerGetEmployee owner)))
-
- ((eqv? type GNC-OWNER-JOB)
- (gnc:job-anchor-text (gncOwnerGetJob owner)))
-
- (else
- ""))))
-
-(define (gnc:owner-report-text owner acc)
- (let* ((end-owner (gncOwnerGetEndOwner owner))
- (type (gncOwnerGetType end-owner))
- (ref #f))
-
- (cond
- ((eqv? type GNC-OWNER-CUSTOMER)
- (set! ref "owner=c:"))
-
- ((eqv? type GNC-OWNER-VENDOR)
- (set! ref "owner=v:"))
-
- ((eqv? type GNC-OWNER-EMPLOYEE)
- (set! ref "owner=e:"))
-
- (else (set! ref "unknown-type=")))
-
- (if ref
- (begin
- (set! ref (string-append ref (gncOwnerReturnGUID end-owner)))
- (if (not (null? acc))
- (set! ref (string-append ref "&acct="
- (gncAccountGetGUID acc))))
- (gnc-build-url URL-TYPE-OWNERREPORT ref ""))
- ref)))
;; Creates a new report instance for the given invoice. The given
;; report-template-id must refer to an existing report template, which
@@ -133,7 +69,5 @@
(owner-report-create owner account))
(export gnc:invoice-report-create
- gnc:customer-anchor-text gnc:job-anchor-text gnc:vendor-anchor-text
- gnc:invoice-anchor-text gnc:owner-anchor-text gnc:owner-report-text
gnc:payables-report-create gnc:receivables-report-create
gnc:owner-report-create)
diff --git a/gnucash/report/report-system/html-utilities.scm b/gnucash/report/report-system/html-utilities.scm
index 202651211..474430b12 100644
--- a/gnucash/report/report-system/html-utilities.scm
+++ b/gnucash/report/report-system/html-utilities.scm
@@ -53,6 +53,68 @@
(string-append "price-guid=" (gncPriceGetGUID price))
""))
+(define (guid-ref idstr type guid)
+ (gnc-build-url type (string-append idstr guid) ""))
+
+(define (gnc:customer-anchor-text customer)
+ (guid-ref "customer=" URL-TYPE-CUSTOMER (gncCustomerReturnGUID customer)))
+
+(define (gnc:job-anchor-text job)
+ (guid-ref "job=" URL-TYPE-JOB (gncJobReturnGUID job)))
+
+(define (gnc:vendor-anchor-text vendor)
+ (guid-ref "vendor=" URL-TYPE-VENDOR (gncVendorReturnGUID vendor)))
+
+(define (gnc:employee-anchor-text employee)
+ (guid-ref "employee=" URL-TYPE-EMPLOYEE (gncEmployeeReturnGUID employee)))
+
+(define (gnc:invoice-anchor-text invoice)
+ (guid-ref "invoice=" URL-TYPE-INVOICE (gncInvoiceReturnGUID invoice)))
+
+(define (gnc:owner-anchor-text owner)
+ (let ((type (gncOwnerGetType (gncOwnerGetEndOwner owner))))
+ (cond
+ ((eqv? type GNC-OWNER-CUSTOMER)
+ (gnc:customer-anchor-text (gncOwnerGetCustomer owner)))
+
+ ((eqv? type GNC-OWNER-VENDOR)
+ (gnc:vendor-anchor-text (gncOwnerGetVendor owner)))
+
+ ((eqv? type GNC-OWNER-EMPLOYEE)
+ (gnc:employee-anchor-text (gncOwnerGetEmployee owner)))
+
+ ((eqv? type GNC-OWNER-JOB)
+ (gnc:job-anchor-text (gncOwnerGetJob owner)))
+
+ (else
+ ""))))
+
+(define (gnc:owner-report-text owner acc)
+ (let* ((end-owner (gncOwnerGetEndOwner owner))
+ (type (gncOwnerGetType end-owner))
+ (ref #f))
+
+ (cond
+ ((eqv? type GNC-OWNER-CUSTOMER)
+ (set! ref "owner=c:"))
+
+ ((eqv? type GNC-OWNER-VENDOR)
+ (set! ref "owner=v:"))
+
+ ((eqv? type GNC-OWNER-EMPLOYEE)
+ (set! ref "owner=e:"))
+
+ (else (set! ref "unknown-type=")))
+
+ (if ref
+ (begin
+ (set! ref (string-append ref (gncOwnerReturnGUID end-owner)))
+ (if (not (null? acc))
+ (set! ref (string-append ref "&acct="
+ (gncAccountGetGUID acc))))
+ (gnc-build-url URL-TYPE-OWNERREPORT ref ""))
+ ref)))
+
;; Make a new report and return the anchor to it. The new report of
;; type 'reportname' will have the option values copied from
;; 'src-options', and additionally this function sets all options
diff --git a/gnucash/report/report-system/report-system.scm b/gnucash/report/report-system/report-system.scm
index de16b73fc..369b5cf8c 100644
--- a/gnucash/report/report-system/report-system.scm
+++ b/gnucash/report/report-system/report-system.scm
@@ -103,6 +103,12 @@
(export gnc:html-split-anchor)
(export gnc:html-transaction-anchor)
(export gnc:html-price-anchor)
+(export gnc:customer-anchor-text)
+(export gnc:job-anchor-text)
+(export gnc:vendor-anchor-text)
+(export gnc:invoice-anchor-text)
+(export gnc:owner-anchor-text)
+(export gnc:owner-report-text)
(export gnc:assign-colors)
(export gnc:html-table-append-ruler!)
(export gnc:html-table-append-ruler/markup!)
commit 438cf3c2bd910c01c2b70e5bb209bbc48dcefb46
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu May 16 18:17:17 2019 +0200
Report fs cleanup - move standard reports to new location
The end goal of this cleanup is to have all reports grouped in
subdirectories of the new 'reports' directory.
This first commit moves the standard reports
which mostly involves renaming several modules and targets.
diff --git a/.gitignore b/.gitignore
index 749f5a5ec..718b2dbe8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -177,7 +177,7 @@ gnucash/report/report-gnome/gnucash
gnucash/report/report-gnome/test/test-link-module
gnucash/report/report-system/gnucash
gnucash/report/report-system/test/test-link-module
-gnucash/report/standard-reports/gnucash
+gnucash/report/reports/gnucash
gnucash/report/stylesheets/gnucash
gnucash/report/utility-reports/gnucash
swig-*.c
diff --git a/gnucash/report/CMakeLists.txt b/gnucash/report/CMakeLists.txt
index c27148319..e1804feaa 100644
--- a/gnucash/report/CMakeLists.txt
+++ b/gnucash/report/CMakeLists.txt
@@ -4,10 +4,10 @@ add_subdirectory(jqplot)
add_subdirectory(locale-specific)
add_subdirectory(report-gnome)
add_subdirectory(report-system)
-add_subdirectory(standard-reports)
+add_subdirectory(reports)
add_subdirectory(stylesheets)
add_subdirectory(utility-reports)
set_local_dist(report_DIST_local CMakeLists.txt )
set(report_DIST ${report_DIST_local} ${business_reports_DIST} ${jqplot_DIST} ${locale_specific_DIST} ${report_gnome_DIST} ${report_system_DIST}
- ${standard_reports_DIST} ${stylesheets_DIST} ${utility_reports_DIST} PARENT_SCOPE)
\ No newline at end of file
+ ${reports_DIST} ${stylesheets_DIST} ${utility_reports_DIST} PARENT_SCOPE)
diff --git a/gnucash/report/business-reports/CMakeLists.txt b/gnucash/report/business-reports/CMakeLists.txt
index 7d63798c1..780f4829a 100644
--- a/gnucash/report/business-reports/CMakeLists.txt
+++ b/gnucash/report/business-reports/CMakeLists.txt
@@ -32,7 +32,7 @@ set(GUILE_DEPENDS
scm-engine
scm-scm
scm-business-reports-links
- scm-standard-reports
+ scm-reports
scm-report-system
)
diff --git a/gnucash/report/business-reports/aging.scm b/gnucash/report/business-reports/aging.scm
index 4c2dc4528..f7876b1a3 100644
--- a/gnucash/report/business-reports/aging.scm
+++ b/gnucash/report/business-reports/aging.scm
@@ -32,7 +32,7 @@
(gnc:module-load "gnucash/report/report-system" 0)
-(use-modules (gnucash report standard-reports))
+(use-modules (gnucash report reports))
(use-modules (gnucash report business-reports))
(define optname-to-date (N_ "To"))
diff --git a/gnucash/report/business-reports/business-reports.scm b/gnucash/report/business-reports/business-reports.scm
index ffc54ee97..15dfefd51 100644
--- a/gnucash/report/business-reports/business-reports.scm
+++ b/gnucash/report/business-reports/business-reports.scm
@@ -27,7 +27,7 @@
(use-modules (gnucash gnc-module))
(use-modules (gnucash app-utils))
(use-modules (gnucash report report-system))
-(use-modules (gnucash report standard-reports))
+(use-modules (gnucash report reports))
;; to define gnc-build-url
(gnc:module-load "gnucash/html" 0)
diff --git a/gnucash/report/business-reports/customer-summary.scm b/gnucash/report/business-reports/customer-summary.scm
index 80df98c12..cd4f2f031 100644
--- a/gnucash/report/business-reports/customer-summary.scm
+++ b/gnucash/report/business-reports/customer-summary.scm
@@ -34,7 +34,7 @@
(use-modules (gnucash gettext))
(gnc:module-load "gnucash/report/report-system" 0)
-(use-modules (gnucash report standard-reports))
+(use-modules (gnucash report reports))
(use-modules (gnucash report business-reports))
;; Option names
diff --git a/gnucash/report/business-reports/invoice.scm b/gnucash/report/business-reports/invoice.scm
index 0a6db327f..5f0159b59 100644
--- a/gnucash/report/business-reports/invoice.scm
+++ b/gnucash/report/business-reports/invoice.scm
@@ -30,7 +30,7 @@
(use-modules (gnucash utilities))
(gnc:module-load "gnucash/report/report-system" 0)
-(use-modules (gnucash report standard-reports))
+(use-modules (gnucash report reports))
(use-modules (gnucash report business-reports))
(define (addif pred . data) (if pred data '()))
diff --git a/gnucash/report/business-reports/job-report.scm b/gnucash/report/business-reports/job-report.scm
index e8a7ef84e..469d596d1 100644
--- a/gnucash/report/business-reports/job-report.scm
+++ b/gnucash/report/business-reports/job-report.scm
@@ -32,7 +32,7 @@
(use-modules (gnucash gettext))
(gnc:module-load "gnucash/report/report-system" 0)
-(use-modules (gnucash report standard-reports))
+(use-modules (gnucash report reports))
(use-modules (gnucash report business-reports))
(define acct-string (N_ "Account"))
diff --git a/gnucash/report/business-reports/owner-report.scm b/gnucash/report/business-reports/owner-report.scm
index 787c998ab..4235d50c2 100644
--- a/gnucash/report/business-reports/owner-report.scm
+++ b/gnucash/report/business-reports/owner-report.scm
@@ -33,7 +33,7 @@
(use-modules (gnucash gettext))
(gnc:module-load "gnucash/report/report-system" 0)
-(use-modules (gnucash report standard-reports))
+(use-modules (gnucash report reports))
(use-modules (gnucash report business-reports))
;; Option names
diff --git a/gnucash/report/business-reports/payables.scm b/gnucash/report/business-reports/payables.scm
index 8bf4079f0..53a96187c 100644
--- a/gnucash/report/business-reports/payables.scm
+++ b/gnucash/report/business-reports/payables.scm
@@ -32,7 +32,7 @@
(gnc:module-load "gnucash/report/report-system" 0)
(use-modules (gnucash report aging))
-(use-modules (gnucash report standard-reports))
+(use-modules (gnucash report reports))
(use-modules (gnucash report business-reports))
(define acc-page gnc:pagename-general)
diff --git a/gnucash/report/business-reports/receipt.scm b/gnucash/report/business-reports/receipt.scm
index 4f2079e95..e8d637e51 100644
--- a/gnucash/report/business-reports/receipt.scm
+++ b/gnucash/report/business-reports/receipt.scm
@@ -24,7 +24,7 @@
(gnc:module-load "gnucash/html" 0)
(gnc:module-load "gnucash/engine" 0)
-(use-modules (gnucash report standard-reports))
+(use-modules (gnucash report reports))
(use-modules (gnucash report business-reports))
(use-modules (gnucash report eguile-utilities))
diff --git a/gnucash/report/business-reports/receivables.scm b/gnucash/report/business-reports/receivables.scm
index 3c0f4f826..8e25ade78 100644
--- a/gnucash/report/business-reports/receivables.scm
+++ b/gnucash/report/business-reports/receivables.scm
@@ -32,7 +32,7 @@
(gnc:module-load "gnucash/report/report-system" 0)
(use-modules (gnucash report aging))
-(use-modules (gnucash report standard-reports))
+(use-modules (gnucash report reports))
(use-modules (gnucash report business-reports))
(define acc-page gnc:pagename-general)
diff --git a/gnucash/report/business-reports/taxinvoice.scm b/gnucash/report/business-reports/taxinvoice.scm
index e4338699c..a17deb1c1 100644
--- a/gnucash/report/business-reports/taxinvoice.scm
+++ b/gnucash/report/business-reports/taxinvoice.scm
@@ -32,7 +32,7 @@
(gnc:module-load "gnucash/html" 0)
(gnc:module-load "gnucash/engine" 0)
-(use-modules (gnucash report standard-reports))
+(use-modules (gnucash report reports))
(use-modules (gnucash report business-reports))
(use-modules (gnucash report eguile-utilities))
diff --git a/gnucash/report/report-gnome/CMakeLists.txt b/gnucash/report/report-gnome/CMakeLists.txt
index 7f20c3fa0..70785b763 100644
--- a/gnucash/report/report-gnome/CMakeLists.txt
+++ b/gnucash/report/report-gnome/CMakeLists.txt
@@ -62,7 +62,7 @@ set(GUILE_DEPENDS
scm-gnc-module
scm-scm
scm-report-system
- scm-standard-reports
+ scm-reports
scm-business-reports
scm-utility-reports
)
diff --git a/gnucash/report/report-gnome/gncmod-report-gnome.c b/gnucash/report/report-gnome/gncmod-report-gnome.c
index 70da204d4..d6f6258b5 100644
--- a/gnucash/report/report-gnome/gncmod-report-gnome.c
+++ b/gnucash/report/report-gnome/gncmod-report-gnome.c
@@ -88,7 +88,7 @@ libgncmod_report_gnome_gnc_module_init(int refcount)
return FALSE;
}
- lmod ("(gnucash report standard-reports)");
+ lmod ("(gnucash report reports)");
lmod ("(gnucash report business-reports)");
lmod ("(gnucash report utility-reports)");
diff --git a/gnucash/report/reports/CMakeLists.txt b/gnucash/report/reports/CMakeLists.txt
new file mode 100644
index 000000000..61fbf840e
--- /dev/null
+++ b/gnucash/report/reports/CMakeLists.txt
@@ -0,0 +1,65 @@
+
+add_subdirectory(standard/test)
+
+set (reports_common_SCHEME reports.scm)
+
+set (reports_standard_SCHEME
+ standard/account-piecharts.scm
+ standard/account-summary.scm
+ standard/advanced-portfolio.scm
+ standard/average-balance.scm
+ standard/balance-sheet.scm
+ standard/balance-forecast.scm
+ standard/balsheet-pnl.scm
+ standard/budget-balance-sheet.scm
+ standard/budget-barchart.scm
+ standard/budget-flow.scm
+ standard/budget-income-statement.scm
+ standard/budget.scm
+ standard/cash-flow.scm
+ standard/cashflow-barchart.scm
+ standard/category-barchart.scm
+ standard/daily-reports.scm
+ standard/equity-statement.scm
+ standard/general-journal.scm
+ standard/general-ledger.scm
+ standard/income-gst-statement.scm
+ standard/income-statement.scm
+ standard/net-charts.scm
+ standard/portfolio.scm
+ standard/price-scatter.scm
+ standard/reconcile-report.scm
+ standard/register.scm
+ standard/sx-summary.scm
+ standard/transaction.scm
+ standard/trial-balance.scm
+ )
+
+set(GUILE_DEPENDS
+ gncmod-html
+ scm-core-utils
+ scm-engine
+ scm-gettext
+ scm-scm
+ scm-gnome-utils
+ scm-report-system
+ )
+
+gnc_add_scheme_targets(scm-reports-common
+ "${reports_common_SCHEME}"
+ "gnucash/report"
+ "scm-reports-standard;${GUILE_DEPENDS}"
+ TRUE
+)
+
+gnc_add_scheme_targets(scm-reports-standard
+ "${reports_standard_SCHEME}"
+ "gnucash/report/reports/standard"
+ "scm-reports-standard-links;${GUILE_DEPENDS}"
+ TRUE
+)
+
+add_custom_target(scm-reports ALL DEPENDS scm-reports-standard scm-reports-common)
+
+set_local_dist(reports_DIST_local CMakeLists.txt ${reports_common_SCHEME} ${reports_standard_SCHEME})
+set(reports_DIST ${reports_DIST_local} ${test_reports_standard_DIST} PARENT_SCOPE)
diff --git a/gnucash/report/standard-reports/standard-reports.scm b/gnucash/report/reports/reports.scm
similarity index 97%
rename from gnucash/report/standard-reports/standard-reports.scm
rename to gnucash/report/reports/reports.scm
index 235f763c8..9ead2e8fa 100644
--- a/gnucash/report/standard-reports/standard-reports.scm
+++ b/gnucash/report/reports/reports.scm
@@ -1,5 +1,5 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; standard-reports.scm
+;; reports.scm
;; load the standard report definitions
;;
;; Copyright (c) 2001 Linux Developers Group, Inc.
@@ -24,7 +24,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report standard-reports))
+(define-module (gnucash report reports))
(use-modules (srfi srfi-13))
(use-modules (gnucash utilities))
(use-modules (gnucash core-utils))
@@ -120,7 +120,7 @@
(lambda (x)
(module-use!
(current-module)
- (resolve-interface `(gnucash report standard-reports ,x))))
+ (resolve-interface `(gnucash report reports standard ,x))))
(get-report-list))
(use-modules (gnucash gnc-module))
diff --git a/gnucash/report/standard-reports/account-piecharts.scm b/gnucash/report/reports/standard/account-piecharts.scm
similarity index 99%
rename from gnucash/report/standard-reports/account-piecharts.scm
rename to gnucash/report/reports/standard/account-piecharts.scm
index c00c62d4a..2b55d796c 100644
--- a/gnucash/report/standard-reports/account-piecharts.scm
+++ b/gnucash/report/reports/standard/account-piecharts.scm
@@ -23,7 +23,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report standard-reports account-piecharts))
+(define-module (gnucash report reports standard account-piecharts))
(use-modules (gnucash utilities))
(use-modules (srfi srfi-1))
diff --git a/gnucash/report/standard-reports/account-summary.scm b/gnucash/report/reports/standard/account-summary.scm
similarity index 99%
rename from gnucash/report/standard-reports/account-summary.scm
rename to gnucash/report/reports/standard/account-summary.scm
index b45dfea6b..86ddb838d 100644
--- a/gnucash/report/standard-reports/account-summary.scm
+++ b/gnucash/report/reports/standard/account-summary.scm
@@ -48,7 +48,7 @@
;; Boston, MA 02110-1301, USA gnu at gnu.org
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report standard-reports account-summary))
+(define-module (gnucash report reports standard account-summary))
(use-modules (srfi srfi-1))
(use-modules (gnucash utilities))
diff --git a/gnucash/report/standard-reports/advanced-portfolio.scm b/gnucash/report/reports/standard/advanced-portfolio.scm
similarity index 99%
rename from gnucash/report/standard-reports/advanced-portfolio.scm
rename to gnucash/report/reports/standard/advanced-portfolio.scm
index 44bd6293b..639cda111 100644
--- a/gnucash/report/standard-reports/advanced-portfolio.scm
+++ b/gnucash/report/reports/standard/advanced-portfolio.scm
@@ -25,7 +25,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report standard-reports advanced-portfolio))
+(define-module (gnucash report reports standard advanced-portfolio))
(use-modules (gnucash utilities))
(use-modules (srfi srfi-1))
diff --git a/gnucash/report/standard-reports/average-balance.scm b/gnucash/report/reports/standard/average-balance.scm
similarity index 99%
rename from gnucash/report/standard-reports/average-balance.scm
rename to gnucash/report/reports/standard/average-balance.scm
index 235aaf47c..921238ed1 100644
--- a/gnucash/report/standard-reports/average-balance.scm
+++ b/gnucash/report/reports/standard/average-balance.scm
@@ -26,7 +26,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report standard-reports average-balance))
+(define-module (gnucash report reports standard average-balance))
(use-modules (srfi srfi-1))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
diff --git a/gnucash/report/standard-reports/balance-forecast.scm b/gnucash/report/reports/standard/balance-forecast.scm
similarity index 99%
rename from gnucash/report/standard-reports/balance-forecast.scm
rename to gnucash/report/reports/standard/balance-forecast.scm
index 581c0ee98..4314bf5e3 100644
--- a/gnucash/report/standard-reports/balance-forecast.scm
+++ b/gnucash/report/reports/standard/balance-forecast.scm
@@ -23,7 +23,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report standard-reports balance-forecast))
+(define-module (gnucash report reports standard balance-forecast))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))
diff --git a/gnucash/report/standard-reports/balance-sheet.scm b/gnucash/report/reports/standard/balance-sheet.scm
similarity index 99%
rename from gnucash/report/standard-reports/balance-sheet.scm
rename to gnucash/report/reports/standard/balance-sheet.scm
index d3d2b2e3b..9ff740b42 100644
--- a/gnucash/report/standard-reports/balance-sheet.scm
+++ b/gnucash/report/reports/standard/balance-sheet.scm
@@ -62,7 +62,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report standard-reports balance-sheet))
+(define-module (gnucash report reports standard balance-sheet))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))
diff --git a/gnucash/report/standard-reports/balsheet-pnl.scm b/gnucash/report/reports/standard/balsheet-pnl.scm
similarity index 99%
rename from gnucash/report/standard-reports/balsheet-pnl.scm
rename to gnucash/report/reports/standard/balsheet-pnl.scm
index 44795c88d..6bfb33e02 100644
--- a/gnucash/report/standard-reports/balsheet-pnl.scm
+++ b/gnucash/report/reports/standard/balsheet-pnl.scm
@@ -25,7 +25,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report standard-reports balsheet-pnl))
+(define-module (gnucash report reports standard balsheet-pnl))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))
diff --git a/gnucash/report/standard-reports/budget-balance-sheet.scm b/gnucash/report/reports/standard/budget-balance-sheet.scm
similarity index 99%
rename from gnucash/report/standard-reports/budget-balance-sheet.scm
rename to gnucash/report/reports/standard/budget-balance-sheet.scm
index 0948bdef0..67c363252 100644
--- a/gnucash/report/standard-reports/budget-balance-sheet.scm
+++ b/gnucash/report/reports/standard/budget-balance-sheet.scm
@@ -28,7 +28,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report standard-reports budget-balance-sheet))
+(define-module (gnucash report reports standard budget-balance-sheet))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))
diff --git a/gnucash/report/standard-reports/budget-barchart.scm b/gnucash/report/reports/standard/budget-barchart.scm
similarity index 99%
rename from gnucash/report/standard-reports/budget-barchart.scm
rename to gnucash/report/reports/standard/budget-barchart.scm
index acb14dfc9..2dd2448b0 100644
--- a/gnucash/report/standard-reports/budget-barchart.scm
+++ b/gnucash/report/reports/standard/budget-barchart.scm
@@ -24,7 +24,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report standard-reports budget-barchart))
+(define-module (gnucash report reports standard budget-barchart))
(use-modules (srfi srfi-1))
(use-modules (gnucash utilities))
diff --git a/gnucash/report/standard-reports/budget-flow.scm b/gnucash/report/reports/standard/budget-flow.scm
similarity index 99%
rename from gnucash/report/standard-reports/budget-flow.scm
rename to gnucash/report/reports/standard/budget-flow.scm
index 1b496fdb1..3aa7d0315 100644
--- a/gnucash/report/standard-reports/budget-flow.scm
+++ b/gnucash/report/reports/standard/budget-flow.scm
@@ -25,7 +25,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report standard-reports budget-flow))
+(define-module (gnucash report reports standard budget-flow))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))
diff --git a/gnucash/report/standard-reports/budget-income-statement.scm b/gnucash/report/reports/standard/budget-income-statement.scm
similarity index 99%
rename from gnucash/report/standard-reports/budget-income-statement.scm
rename to gnucash/report/reports/standard/budget-income-statement.scm
index c220781ed..015325536 100644
--- a/gnucash/report/standard-reports/budget-income-statement.scm
+++ b/gnucash/report/reports/standard/budget-income-statement.scm
@@ -40,7 +40,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report standard-reports budget-income-statement))
+(define-module (gnucash report reports standard budget-income-statement))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))
diff --git a/gnucash/report/standard-reports/budget.scm b/gnucash/report/reports/standard/budget.scm
similarity index 99%
rename from gnucash/report/standard-reports/budget.scm
rename to gnucash/report/reports/standard/budget.scm
index 32028e86e..1cf59bf77 100644
--- a/gnucash/report/standard-reports/budget.scm
+++ b/gnucash/report/reports/standard/budget.scm
@@ -25,7 +25,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report standard-reports budget))
+(define-module (gnucash report reports standard budget))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
diff --git a/gnucash/report/standard-reports/cash-flow.scm b/gnucash/report/reports/standard/cash-flow.scm
similarity index 99%
rename from gnucash/report/standard-reports/cash-flow.scm
rename to gnucash/report/reports/standard/cash-flow.scm
index fd61a006d..229da7d44 100644
--- a/gnucash/report/standard-reports/cash-flow.scm
+++ b/gnucash/report/reports/standard/cash-flow.scm
@@ -27,7 +27,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report standard-reports cash-flow))
+(define-module (gnucash report reports standard cash-flow))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))
diff --git a/gnucash/report/standard-reports/cashflow-barchart.scm b/gnucash/report/reports/standard/cashflow-barchart.scm
similarity index 99%
rename from gnucash/report/standard-reports/cashflow-barchart.scm
rename to gnucash/report/reports/standard/cashflow-barchart.scm
index 14b9d94ec..ae6712723 100644
--- a/gnucash/report/standard-reports/cashflow-barchart.scm
+++ b/gnucash/report/reports/standard/cashflow-barchart.scm
@@ -27,13 +27,13 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report standard-reports cashflow-barchart))
+(define-module (gnucash report reports standard cashflow-barchart))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))
(use-modules (gnucash engine))
-(use-modules (gnucash report standard-reports cash-flow))
+(use-modules (gnucash report reports standard cash-flow))
(gnc:module-load "gnucash/report/report-system" 0)
diff --git a/gnucash/report/standard-reports/category-barchart.scm b/gnucash/report/reports/standard/category-barchart.scm
similarity index 99%
rename from gnucash/report/standard-reports/category-barchart.scm
rename to gnucash/report/reports/standard/category-barchart.scm
index ae3a6ab88..525d223d0 100644
--- a/gnucash/report/standard-reports/category-barchart.scm
+++ b/gnucash/report/reports/standard/category-barchart.scm
@@ -23,7 +23,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; depends must be outside module scope -- and should eventually go away.
-(define-module (gnucash report standard-reports category-barchart))
+(define-module (gnucash report reports standard category-barchart))
(use-modules (srfi srfi-1))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
diff --git a/gnucash/report/standard-reports/daily-reports.scm b/gnucash/report/reports/standard/daily-reports.scm
similarity index 99%
rename from gnucash/report/standard-reports/daily-reports.scm
rename to gnucash/report/reports/standard/daily-reports.scm
index 4e5203fb0..0efb34b59 100644
--- a/gnucash/report/standard-reports/daily-reports.scm
+++ b/gnucash/report/reports/standard/daily-reports.scm
@@ -25,7 +25,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report standard-reports daily-reports))
+(define-module (gnucash report reports standard daily-reports))
(use-modules (gnucash utilities))
(use-modules (srfi srfi-1))
diff --git a/gnucash/report/standard-reports/equity-statement.scm b/gnucash/report/reports/standard/equity-statement.scm
similarity index 99%
rename from gnucash/report/standard-reports/equity-statement.scm
rename to gnucash/report/reports/standard/equity-statement.scm
index a687bd074..07d66879a 100644
--- a/gnucash/report/standard-reports/equity-statement.scm
+++ b/gnucash/report/reports/standard/equity-statement.scm
@@ -45,7 +45,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report standard-reports equity-statement))
+(define-module (gnucash report reports standard equity-statement))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))
diff --git a/gnucash/report/standard-reports/general-journal.scm b/gnucash/report/reports/standard/general-journal.scm
similarity index 98%
rename from gnucash/report/standard-reports/general-journal.scm
rename to gnucash/report/reports/standard/general-journal.scm
index 23e3cb7c0..bf5deb891 100644
--- a/gnucash/report/standard-reports/general-journal.scm
+++ b/gnucash/report/reports/standard/general-journal.scm
@@ -26,7 +26,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report standard-reports general-journal))
+(define-module (gnucash report reports standard general-journal))
(export gnc:make-general-journal-report)
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
diff --git a/gnucash/report/standard-reports/general-ledger.scm b/gnucash/report/reports/standard/general-ledger.scm
similarity index 98%
rename from gnucash/report/standard-reports/general-ledger.scm
rename to gnucash/report/reports/standard/general-ledger.scm
index 521b89263..493da07f1 100644
--- a/gnucash/report/standard-reports/general-ledger.scm
+++ b/gnucash/report/reports/standard/general-ledger.scm
@@ -29,7 +29,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report standard-reports general-ledger))
+(define-module (gnucash report reports standard general-ledger))
(export gnc:make-general-ledger-report)
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
diff --git a/gnucash/report/standard-reports/income-gst-statement.scm b/gnucash/report/reports/standard/income-gst-statement.scm
similarity index 99%
rename from gnucash/report/standard-reports/income-gst-statement.scm
rename to gnucash/report/reports/standard/income-gst-statement.scm
index be947db4c..281b8d62f 100644
--- a/gnucash/report/standard-reports/income-gst-statement.scm
+++ b/gnucash/report/reports/standard/income-gst-statement.scm
@@ -25,7 +25,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report standard-reports income-gst-statement))
+(define-module (gnucash report reports standard income-gst-statement))
(use-modules (gnucash utilities))
(use-modules (srfi srfi-1))
diff --git a/gnucash/report/standard-reports/income-statement.scm b/gnucash/report/reports/standard/income-statement.scm
similarity index 99%
rename from gnucash/report/standard-reports/income-statement.scm
rename to gnucash/report/reports/standard/income-statement.scm
index 412b1d6a4..8252eef92 100644
--- a/gnucash/report/standard-reports/income-statement.scm
+++ b/gnucash/report/reports/standard/income-statement.scm
@@ -41,7 +41,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report standard-reports income-statement))
+(define-module (gnucash report reports standard income-statement))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))
diff --git a/gnucash/report/standard-reports/net-charts.scm b/gnucash/report/reports/standard/net-charts.scm
similarity index 99%
rename from gnucash/report/standard-reports/net-charts.scm
rename to gnucash/report/reports/standard/net-charts.scm
index 8defa587e..6e8b6b57f 100644
--- a/gnucash/report/standard-reports/net-charts.scm
+++ b/gnucash/report/reports/standard/net-charts.scm
@@ -26,14 +26,14 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report standard-reports net-charts))
+(define-module (gnucash report reports standard net-charts))
(use-modules (srfi srfi-1))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))
-(use-modules (gnucash report standard-reports category-barchart)) ; for guids of called reports
+(use-modules (gnucash report reports standard category-barchart)) ; for guids of called reports
(gnc:module-load "gnucash/report/report-system" 0)
diff --git a/gnucash/report/standard-reports/portfolio.scm b/gnucash/report/reports/standard/portfolio.scm
similarity index 99%
rename from gnucash/report/standard-reports/portfolio.scm
rename to gnucash/report/reports/standard/portfolio.scm
index c4faa6872..5721b067e 100644
--- a/gnucash/report/standard-reports/portfolio.scm
+++ b/gnucash/report/reports/standard/portfolio.scm
@@ -21,7 +21,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report standard-reports portfolio))
+(define-module (gnucash report reports standard portfolio))
(use-modules (gnucash utilities))
(use-modules (srfi srfi-1))
diff --git a/gnucash/report/standard-reports/price-scatter.scm b/gnucash/report/reports/standard/price-scatter.scm
similarity index 99%
rename from gnucash/report/standard-reports/price-scatter.scm
rename to gnucash/report/reports/standard/price-scatter.scm
index a926138f8..ec0cc6a05 100644
--- a/gnucash/report/standard-reports/price-scatter.scm
+++ b/gnucash/report/reports/standard/price-scatter.scm
@@ -22,7 +22,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report standard-reports price-scatter))
+(define-module (gnucash report reports standard price-scatter))
(use-modules (gnucash utilities))
(use-modules (srfi srfi-1))
diff --git a/gnucash/report/standard-reports/reconcile-report.scm b/gnucash/report/reports/standard/reconcile-report.scm
similarity index 98%
rename from gnucash/report/standard-reports/reconcile-report.scm
rename to gnucash/report/reports/standard/reconcile-report.scm
index fc5eb8b23..719eb33a0 100644
--- a/gnucash/report/standard-reports/reconcile-report.scm
+++ b/gnucash/report/reports/standard/reconcile-report.scm
@@ -24,7 +24,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report standard-reports reconcile-report))
+(define-module (gnucash report reports standard reconcile-report))
(use-modules (gnucash gettext))
(use-modules (gnucash gnc-module))
diff --git a/gnucash/report/standard-reports/register.scm b/gnucash/report/reports/standard/register.scm
similarity index 99%
rename from gnucash/report/standard-reports/register.scm
rename to gnucash/report/reports/standard/register.scm
index 213617c58..152e8e503 100644
--- a/gnucash/report/standard-reports/register.scm
+++ b/gnucash/report/reports/standard/register.scm
@@ -20,7 +20,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report standard-reports register))
+(define-module (gnucash report reports standard register))
(use-modules (gnucash utilities))
(use-modules (srfi srfi-1))
diff --git a/gnucash/report/standard-reports/sx-summary.scm b/gnucash/report/reports/standard/sx-summary.scm
similarity index 99%
rename from gnucash/report/standard-reports/sx-summary.scm
rename to gnucash/report/reports/standard/sx-summary.scm
index 2891ad725..e1010c131 100644
--- a/gnucash/report/standard-reports/sx-summary.scm
+++ b/gnucash/report/reports/standard/sx-summary.scm
@@ -31,7 +31,7 @@
;; periods. Apart from this, all display options are taken from
;; account-summary unchangedly.
-(define-module (gnucash report standard-reports sx-summary))
+(define-module (gnucash report reports standard sx-summary))
(use-modules (srfi srfi-1))
(use-modules (gnucash utilities))
diff --git a/gnucash/report/standard-reports/test/CMakeLists.txt b/gnucash/report/reports/standard/test/CMakeLists.txt
similarity index 69%
rename from gnucash/report/standard-reports/test/CMakeLists.txt
rename to gnucash/report/reports/standard/test/CMakeLists.txt
index 7cd7159e7..ffbd625c7 100644
--- a/gnucash/report/standard-reports/test/CMakeLists.txt
+++ b/gnucash/report/reports/standard/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(scm_test_standard_reports_SOURCES
+set(scm_test_reports_standard_SOURCES
test-cash-flow.scm
)
@@ -28,7 +28,7 @@ set(GUILE_DEPENDS
scm-gettext
scm-scm
scm-test-report-system
- scm-standard-reports
+ scm-reports
scm-report-stylesheets
)
@@ -39,18 +39,18 @@ if (HAVE_SRFI64)
endif (HAVE_TEXT_PORTS)
endif (HAVE_SRFI64)
-gnc_add_scheme_tests("${scm_test_standard_reports_SOURCES}")
+gnc_add_scheme_tests("${scm_test_reports_standard_SOURCES}")
-gnc_add_scheme_targets(scm-test-standard-reports
- "${scm_test_standard_reports_SOURCES}"
- gnucash/report/standard-reports/test
+gnc_add_scheme_targets(scm-test-reports-standard
+ "${scm_test_reports_standard_SOURCES}"
+ gnucash/report/reports/standard/test
"${GUILE_DEPENDS}"
FALSE
)
-add_dependencies(check scm-test-standard-reports)
+add_dependencies(check scm-test-reports-standard)
-set_dist_list(test_standard_reports_DIST CMakeLists.txt
+set_dist_list(test_reports_standard_DIST CMakeLists.txt
${scm_test_with_srfi64_SOURCES}
${scm_test_with_textual_ports_SOURCES}
- ${scm_test_standard_reports_SOURCES})
+ ${scm_test_reports_standard_SOURCES})
diff --git a/gnucash/report/standard-reports/test/test-average-balance.scm b/gnucash/report/reports/standard/test/test-average-balance.scm
similarity index 97%
rename from gnucash/report/standard-reports/test/test-average-balance.scm
rename to gnucash/report/reports/standard/test/test-average-balance.scm
index c40ca3d22..72d631fd2 100644
--- a/gnucash/report/standard-reports/test/test-average-balance.scm
+++ b/gnucash/report/reports/standard/test/test-average-balance.scm
@@ -2,9 +2,9 @@
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
(gnc:module-begin-syntax (gnc:module-load "gnucash/report/report-system" 0))
(use-modules (gnucash engine test test-extras))
-(use-modules (gnucash report standard-reports average-balance))
+(use-modules (gnucash report reports standard average-balance))
(use-modules (gnucash report report-system))
-(use-modules (gnucash report standard-reports budget))
+(use-modules (gnucash report reports standard budget))
(use-modules (gnucash report report-system test test-extras))
(use-modules (gnucash report stylesheets))
(use-modules (gnucash engine test srfi64-extras))
diff --git a/gnucash/report/standard-reports/test/test-balsheet-pnl.scm b/gnucash/report/reports/standard/test/test-balsheet-pnl.scm
similarity index 99%
rename from gnucash/report/standard-reports/test/test-balsheet-pnl.scm
rename to gnucash/report/reports/standard/test/test-balsheet-pnl.scm
index 954798e09..07fdede9f 100644
--- a/gnucash/report/standard-reports/test/test-balsheet-pnl.scm
+++ b/gnucash/report/reports/standard/test/test-balsheet-pnl.scm
@@ -1,8 +1,8 @@
(use-modules (gnucash gnc-module))
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
(use-modules (gnucash engine test test-extras))
-(use-modules (gnucash report standard-reports balance-sheet))
-(use-modules (gnucash report standard-reports income-statement))
+(use-modules (gnucash report reports standard balance-sheet))
+(use-modules (gnucash report reports standard income-statement))
(use-modules (gnucash report stylesheets))
(use-modules (gnucash report report-system))
(use-modules (gnucash report report-system test test-extras))
diff --git a/gnucash/report/standard-reports/test/test-budget.scm b/gnucash/report/reports/standard/test/test-budget.scm
similarity index 99%
rename from gnucash/report/standard-reports/test/test-budget.scm
rename to gnucash/report/reports/standard/test/test-budget.scm
index f1fb8ce23..33f44e690 100644
--- a/gnucash/report/standard-reports/test/test-budget.scm
+++ b/gnucash/report/reports/standard/test/test-budget.scm
@@ -30,7 +30,7 @@
(use-modules (gnucash app-utils))
(use-modules (gnucash engine))
(use-modules (sw_engine))
-(use-modules (gnucash report standard-reports budget))
+(use-modules (gnucash report reports standard budget))
(use-modules (gnucash report report-system test test-extras))
(use-modules (gnucash report stylesheets))
(use-modules (gnucash engine test test-extras))
diff --git a/gnucash/report/standard-reports/test/test-cash-flow.scm b/gnucash/report/reports/standard/test/test-cash-flow.scm
similarity index 99%
rename from gnucash/report/standard-reports/test/test-cash-flow.scm
rename to gnucash/report/reports/standard/test/test-cash-flow.scm
index 8061376ed..e40507270 100644
--- a/gnucash/report/standard-reports/test/test-cash-flow.scm
+++ b/gnucash/report/reports/standard/test/test-cash-flow.scm
@@ -3,7 +3,7 @@
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
(use-modules (gnucash engine test test-extras))
-(use-modules (gnucash report standard-reports cash-flow))
+(use-modules (gnucash report reports standard cash-flow))
(use-modules (gnucash report report-system))
(define (run-test)
diff --git a/gnucash/report/standard-reports/test/test-cashflow-barchart.scm b/gnucash/report/reports/standard/test/test-cashflow-barchart.scm
similarity index 99%
rename from gnucash/report/standard-reports/test/test-cashflow-barchart.scm
rename to gnucash/report/reports/standard/test/test-cashflow-barchart.scm
index 6c251b212..05acb66fa 100644
--- a/gnucash/report/standard-reports/test/test-cashflow-barchart.scm
+++ b/gnucash/report/reports/standard/test/test-cashflow-barchart.scm
@@ -28,7 +28,7 @@
(use-modules (gnucash engine test srfi64-extras))
(use-modules (gnucash report report-system))
(use-modules (gnucash report report-system test test-extras))
-(use-modules (gnucash report standard-reports cashflow-barchart))
+(use-modules (gnucash report reports standard cashflow-barchart))
(use-modules (gnucash report stylesheets))
(use-modules (srfi srfi-1))
(use-modules (srfi srfi-64))
diff --git a/gnucash/report/standard-reports/test/test-charts.scm b/gnucash/report/reports/standard/test/test-charts.scm
similarity index 97%
rename from gnucash/report/standard-reports/test/test-charts.scm
rename to gnucash/report/reports/standard/test/test-charts.scm
index b181cab38..936663ad6 100644
--- a/gnucash/report/standard-reports/test/test-charts.scm
+++ b/gnucash/report/reports/standard/test/test-charts.scm
@@ -1,11 +1,11 @@
(use-modules (gnucash gnc-module))
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
(use-modules (gnucash engine test test-extras))
-(use-modules (gnucash report standard-reports net-charts))
-(use-modules (gnucash report standard-reports account-piecharts))
-(use-modules (gnucash report standard-reports cashflow-barchart))
-(use-modules (gnucash report standard-reports daily-reports))
-(use-modules (gnucash report standard-reports price-scatter))
+(use-modules (gnucash report reports standard net-charts))
+(use-modules (gnucash report reports standard account-piecharts))
+(use-modules (gnucash report reports standard cashflow-barchart))
+(use-modules (gnucash report reports standard daily-reports))
+(use-modules (gnucash report reports standard price-scatter))
(use-modules (gnucash report stylesheets))
(use-modules (gnucash report report-system))
(use-modules (gnucash report report-system test test-extras))
diff --git a/gnucash/report/standard-reports/test/test-income-gst.scm b/gnucash/report/reports/standard/test/test-income-gst.scm
similarity index 99%
rename from gnucash/report/standard-reports/test/test-income-gst.scm
rename to gnucash/report/reports/standard/test/test-income-gst.scm
index ae7303b38..77ffacaa3 100644
--- a/gnucash/report/standard-reports/test/test-income-gst.scm
+++ b/gnucash/report/reports/standard/test/test-income-gst.scm
@@ -1,7 +1,7 @@
(use-modules (gnucash gnc-module))
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
(use-modules (gnucash engine test test-extras))
-(use-modules (gnucash report standard-reports income-gst-statement))
+(use-modules (gnucash report reports standard income-gst-statement))
(use-modules (gnucash report stylesheets))
(use-modules (gnucash report report-system))
(use-modules (gnucash report report-system test test-extras))
diff --git a/gnucash/report/standard-reports/test/test-register.scm b/gnucash/report/reports/standard/test/test-register.scm
similarity index 98%
rename from gnucash/report/standard-reports/test/test-register.scm
rename to gnucash/report/reports/standard/test/test-register.scm
index 05ed5db82..aebe5c0ca 100644
--- a/gnucash/report/standard-reports/test/test-register.scm
+++ b/gnucash/report/reports/standard/test/test-register.scm
@@ -35,7 +35,7 @@
(use-modules (gnucash app-utils))
(use-modules (gnucash engine))
(use-modules (sw_engine))
-(use-modules (gnucash report standard-reports register))
+(use-modules (gnucash report reports standard register))
(use-modules (gnucash report report-system test test-extras))
(use-modules (gnucash report stylesheets))
(use-modules (gnucash engine test test-extras))
diff --git a/gnucash/report/standard-reports/test/test-standard-category-report.scm b/gnucash/report/reports/standard/test/test-standard-category-report.scm
similarity index 99%
rename from gnucash/report/standard-reports/test/test-standard-category-report.scm
rename to gnucash/report/reports/standard/test/test-standard-category-report.scm
index 77ef08ce6..cdfac0282 100644
--- a/gnucash/report/standard-reports/test/test-standard-category-report.scm
+++ b/gnucash/report/reports/standard/test/test-standard-category-report.scm
@@ -35,9 +35,9 @@
(use-modules (gnucash app-utils))
(use-modules (gnucash engine))
(use-modules (sw_engine))
-(use-modules (gnucash report standard-reports net-charts))
+(use-modules (gnucash report reports standard net-charts))
(use-modules (gnucash report report-system test test-extras))
-(use-modules (gnucash report standard-reports category-barchart))
+(use-modules (gnucash report reports standard category-barchart))
(use-modules (gnucash report stylesheets))
(use-modules (gnucash engine test test-extras))
(use-modules (gnucash report report-system test test-extras))
diff --git a/gnucash/report/standard-reports/test/test-standard-net-barchart.scm b/gnucash/report/reports/standard/test/test-standard-net-barchart.scm
similarity index 99%
rename from gnucash/report/standard-reports/test/test-standard-net-barchart.scm
rename to gnucash/report/reports/standard/test/test-standard-net-barchart.scm
index 8a6f43637..9623122d3 100644
--- a/gnucash/report/standard-reports/test/test-standard-net-barchart.scm
+++ b/gnucash/report/reports/standard/test/test-standard-net-barchart.scm
@@ -27,7 +27,7 @@
(use-modules (gnucash engine test test-extras))
(use-modules (gnucash engine test srfi64-extras))
(use-modules (gnucash report report-system test test-extras))
-(use-modules (gnucash report standard-reports net-charts))
+(use-modules (gnucash report reports standard net-charts))
;; Explicitly set locale to make the report output predictable
(setlocale LC_ALL "C")
diff --git a/gnucash/report/standard-reports/test/test-standard-net-linechart.scm b/gnucash/report/reports/standard/test/test-standard-net-linechart.scm
similarity index 99%
rename from gnucash/report/standard-reports/test/test-standard-net-linechart.scm
rename to gnucash/report/reports/standard/test/test-standard-net-linechart.scm
index d52b04ec7..f998bfe7f 100644
--- a/gnucash/report/standard-reports/test/test-standard-net-linechart.scm
+++ b/gnucash/report/reports/standard/test/test-standard-net-linechart.scm
@@ -27,7 +27,7 @@
(use-modules (gnucash engine test test-extras))
(use-modules (gnucash engine test srfi64-extras))
(use-modules (gnucash report report-system test test-extras))
-(use-modules (gnucash report standard-reports net-charts))
+(use-modules (gnucash report reports standard net-charts))
;; Explicitly set locale to make the report output predictable
(setlocale LC_ALL "C")
diff --git a/gnucash/report/standard-reports/test/test-stress-options.scm b/gnucash/report/reports/standard/test/test-stress-options.scm
similarity index 99%
rename from gnucash/report/standard-reports/test/test-stress-options.scm
rename to gnucash/report/reports/standard/test/test-stress-options.scm
index e85cd61a8..0d79fdce4 100644
--- a/gnucash/report/standard-reports/test/test-stress-options.scm
+++ b/gnucash/report/reports/standard/test/test-stress-options.scm
@@ -4,7 +4,7 @@
(use-modules (gnucash gnc-module))
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
(use-modules (gnucash engine test test-extras))
-(use-modules (gnucash report standard-reports))
+(use-modules (gnucash report reports))
(use-modules (gnucash report business-reports))
(use-modules (gnucash report view-column))
(use-modules (gnucash report stylesheets))
diff --git a/gnucash/report/standard-reports/test/test-transaction.scm b/gnucash/report/reports/standard/test/test-transaction.scm
similarity index 99%
rename from gnucash/report/standard-reports/test/test-transaction.scm
rename to gnucash/report/reports/standard/test/test-transaction.scm
index 31a791caa..3e1a5c13a 100644
--- a/gnucash/report/standard-reports/test/test-transaction.scm
+++ b/gnucash/report/reports/standard/test/test-transaction.scm
@@ -1,8 +1,8 @@
(use-modules (gnucash gnc-module))
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
(use-modules (gnucash engine test test-extras))
-(use-modules (gnucash report standard-reports transaction))
-(use-modules (gnucash report standard-reports reconcile-report))
+(use-modules (gnucash report reports standard transaction))
+(use-modules (gnucash report reports standard reconcile-report))
(use-modules (gnucash report stylesheets))
(use-modules (gnucash report report-system))
(use-modules (gnucash report report-system test test-extras))
diff --git a/gnucash/report/standard-reports/transaction.scm b/gnucash/report/reports/standard/transaction.scm
similarity index 96%
rename from gnucash/report/standard-reports/transaction.scm
rename to gnucash/report/reports/standard/transaction.scm
index 868526193..2c4b296b0 100644
--- a/gnucash/report/standard-reports/transaction.scm
+++ b/gnucash/report/reports/standard/transaction.scm
@@ -22,7 +22,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report standard-reports transaction))
+(define-module (gnucash report reports standard transaction))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))
diff --git a/gnucash/report/standard-reports/trial-balance.scm b/gnucash/report/reports/standard/trial-balance.scm
similarity index 99%
rename from gnucash/report/standard-reports/trial-balance.scm
rename to gnucash/report/reports/standard/trial-balance.scm
index 4f6c8c7da..4c1780534 100644
--- a/gnucash/report/standard-reports/trial-balance.scm
+++ b/gnucash/report/reports/standard/trial-balance.scm
@@ -50,7 +50,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report standard-reports trial-balance))
+(define-module (gnucash report reports standard trial-balance))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))
diff --git a/gnucash/report/standard-reports/CMakeLists.txt b/gnucash/report/standard-reports/CMakeLists.txt
deleted file mode 100644
index df87daf30..000000000
--- a/gnucash/report/standard-reports/CMakeLists.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-
-add_subdirectory(test)
-
-set (standard_reports_SCHEME standard-reports.scm)
-
-set (standard_reports_SCHEME_2
- account-piecharts.scm
- account-summary.scm
- advanced-portfolio.scm
- average-balance.scm
- balance-sheet.scm
- balance-forecast.scm
- balsheet-pnl.scm
- budget-balance-sheet.scm
- budget-barchart.scm
- budget-flow.scm
- budget-income-statement.scm
- budget.scm
- cash-flow.scm
- cashflow-barchart.scm
- category-barchart.scm
- daily-reports.scm
- equity-statement.scm
- general-journal.scm
- general-ledger.scm
- income-gst-statement.scm
- income-statement.scm
- net-charts.scm
- portfolio.scm
- price-scatter.scm
- reconcile-report.scm
- register.scm
- sx-summary.scm
- transaction.scm
- trial-balance.scm
- )
-
-set(GUILE_DEPENDS
- gncmod-html
- scm-core-utils
- scm-engine
- scm-gettext
- scm-scm
- scm-gnome-utils
- scm-report-system
- )
-
-gnc_add_scheme_targets(scm-standard-reports-1
- "${standard_reports_SCHEME}"
- "gnucash/report"
- "scm-standard-reports-2;${GUILE_DEPENDS}"
- TRUE
-)
-
-gnc_add_scheme_targets(scm-standard-reports-2
- "${standard_reports_SCHEME_2}"
- "gnucash/report/standard-reports"
- "scm-standard-reports-2-links;${GUILE_DEPENDS}"
- TRUE
-)
-
-add_custom_target(scm-standard-reports ALL DEPENDS scm-standard-reports-2 scm-standard-reports-1)
-
-set_local_dist(standard_reports_DIST_local CMakeLists.txt ${standard_reports_SCHEME} ${standard_reports_SCHEME_2})
-set(standard_reports_DIST ${standard_reports_DIST_local} ${test_standard_reports_DIST} PARENT_SCOPE)
diff --git a/gnucash/report/utility-reports/utility-reports.scm b/gnucash/report/utility-reports/utility-reports.scm
index 1e2eeb512..8a849ca91 100644
--- a/gnucash/report/utility-reports/utility-reports.scm
+++ b/gnucash/report/utility-reports/utility-reports.scm
@@ -1,6 +1,6 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; standard-reports.scm
-;; load the standard report definitions
+;; utility-reports.scm
+;; load the utility report definitions
;;
;; Copyright (c) 2001 Linux Developers Group, Inc.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/libgnucash/core-utils/gnc-path.c b/libgnucash/core-utils/gnc-path.c
index e6e7e13e4..db95757a4 100644
--- a/libgnucash/core-utils/gnc-path.c
+++ b/libgnucash/core-utils/gnc-path.c
@@ -196,13 +196,13 @@ gchar *gnc_path_get_reportdir()
/** Returns the file path to the standard
* reports, usually
- * "$prefix/share/gnucash/scm/gnucash/report/standard-reports".
+ * "$prefix/share/gnucash/scm/gnucash/report/reports/standard".
*
* @returns A newly allocated string. */
gchar *gnc_path_get_stdreportsdir()
{
gchar *reportdir = gnc_path_get_reportdir ();
- gchar *result = g_build_filename (reportdir, "standard-reports", NULL);
+ gchar *result = g_build_filename (reportdir, "reports", "standard", NULL);
g_free (reportdir);
//printf("Returning stdreportsdir %s\n", result);
return result;
diff --git a/libgnucash/core-utils/gnc-path.h b/libgnucash/core-utils/gnc-path.h
index d9d8f768a..14f3ccace 100644
--- a/libgnucash/core-utils/gnc-path.h
+++ b/libgnucash/core-utils/gnc-path.h
@@ -100,7 +100,7 @@ gchar *gnc_path_get_reportdir(void);
/** Returns the file path to the standard
* reports, usually
- * "$prefix/share/gnucash/scm/gnucash/report/standard-reports".
+ * "$prefix/share/gnucash/scm/gnucash/report/reports/standard".
*
* @returns A newly allocated string. */
gchar *gnc_path_get_stdreportsdir(void);
diff --git a/libgnucash/doc/user-prefs-howto.txt b/libgnucash/doc/user-prefs-howto.txt
index 551b9fa66..ccbd3eae4 100644
--- a/libgnucash/doc/user-prefs-howto.txt
+++ b/libgnucash/doc/user-prefs-howto.txt
@@ -48,7 +48,7 @@ cache_pin =
The third argument here is the default value in case the lookup
fails. The C function prototypes for lookup of other options can be found in
src/app-utils/global-options.h. A lookup of a global preference in
-Scheme can be seen e.g. in src/report/standard-reports/register.scm
+Scheme can be seen e.g. in src/report/reports/standard/register.scm
line 556:
\verbatim
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a8d79d06b..91cce51f9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -437,6 +437,36 @@ gnucash/report/report-gnome/gncmod-report-gnome.c
gnucash/report/report-gnome/gnc-plugin-page-report.c
gnucash/report/report-gnome/report-gnome.scm
gnucash/report/report-gnome/window-report.c
+gnucash/report/reports/reports.scm
+gnucash/report/reports/standard/account-piecharts.scm
+gnucash/report/reports/standard/account-summary.scm
+gnucash/report/reports/standard/advanced-portfolio.scm
+gnucash/report/reports/standard/average-balance.scm
+gnucash/report/reports/standard/balance-forecast.scm
+gnucash/report/reports/standard/balance-sheet.scm
+gnucash/report/reports/standard/balsheet-pnl.scm
+gnucash/report/reports/standard/budget-balance-sheet.scm
+gnucash/report/reports/standard/budget-barchart.scm
+gnucash/report/reports/standard/budget-flow.scm
+gnucash/report/reports/standard/budget-income-statement.scm
+gnucash/report/reports/standard/budget.scm
+gnucash/report/reports/standard/cashflow-barchart.scm
+gnucash/report/reports/standard/cash-flow.scm
+gnucash/report/reports/standard/category-barchart.scm
+gnucash/report/reports/standard/daily-reports.scm
+gnucash/report/reports/standard/equity-statement.scm
+gnucash/report/reports/standard/general-journal.scm
+gnucash/report/reports/standard/general-ledger.scm
+gnucash/report/reports/standard/income-gst-statement.scm
+gnucash/report/reports/standard/income-statement.scm
+gnucash/report/reports/standard/net-charts.scm
+gnucash/report/reports/standard/portfolio.scm
+gnucash/report/reports/standard/price-scatter.scm
+gnucash/report/reports/standard/reconcile-report.scm
+gnucash/report/reports/standard/register.scm
+gnucash/report/reports/standard/sx-summary.scm
+gnucash/report/reports/standard/transaction.scm
+gnucash/report/reports/standard/trial-balance.scm
gnucash/report/report-system/collectors.scm
gnucash/report/report-system/commodity-utilities.scm
gnucash/report/report-system/eguile-gnc.scm
@@ -463,36 +493,6 @@ gnucash/report/report-system/report.scm
gnucash/report/report-system/report-system.scm
gnucash/report/report-system/report-utilities.scm
gnucash/report/report-system/trep-engine.scm
-gnucash/report/standard-reports/account-piecharts.scm
-gnucash/report/standard-reports/account-summary.scm
-gnucash/report/standard-reports/advanced-portfolio.scm
-gnucash/report/standard-reports/average-balance.scm
-gnucash/report/standard-reports/balance-forecast.scm
-gnucash/report/standard-reports/balance-sheet.scm
-gnucash/report/standard-reports/balsheet-pnl.scm
-gnucash/report/standard-reports/budget-balance-sheet.scm
-gnucash/report/standard-reports/budget-barchart.scm
-gnucash/report/standard-reports/budget-flow.scm
-gnucash/report/standard-reports/budget-income-statement.scm
-gnucash/report/standard-reports/budget.scm
-gnucash/report/standard-reports/cashflow-barchart.scm
-gnucash/report/standard-reports/cash-flow.scm
-gnucash/report/standard-reports/category-barchart.scm
-gnucash/report/standard-reports/daily-reports.scm
-gnucash/report/standard-reports/equity-statement.scm
-gnucash/report/standard-reports/general-journal.scm
-gnucash/report/standard-reports/general-ledger.scm
-gnucash/report/standard-reports/income-gst-statement.scm
-gnucash/report/standard-reports/income-statement.scm
-gnucash/report/standard-reports/net-charts.scm
-gnucash/report/standard-reports/portfolio.scm
-gnucash/report/standard-reports/price-scatter.scm
-gnucash/report/standard-reports/reconcile-report.scm
-gnucash/report/standard-reports/register.scm
-gnucash/report/standard-reports/standard-reports.scm
-gnucash/report/standard-reports/sx-summary.scm
-gnucash/report/standard-reports/transaction.scm
-gnucash/report/standard-reports/trial-balance.scm
gnucash/report/stylesheets/gncmod-stylesheets.c
gnucash/report/stylesheets/gnc-plugin-stylesheets.c
gnucash/report/stylesheets/stylesheet-easy.scm
Summary of changes:
.gitignore | 2 +-
common/cmake_modules/GncAddSchemeTargets.cmake | 16 ++-
common/cmake_modules/GncAddTest.cmake | 4 +-
common/test-core/CMakeLists.txt | 4 +-
common/test-core/unittest-support.scm | 2 +-
gnucash/gnome-utils/test/CMakeLists.txt | 4 +-
gnucash/report/CMakeLists.txt | 8 +-
gnucash/report/business-reports/CMakeLists.txt | 51 --------
.../report/business-reports/business-reports.scm | 139 --------------------
.../report/business-reports/test/CMakeLists.txt | 32 -----
.../report/locale-specific/us/test/CMakeLists.txt | 4 +-
gnucash/report/report-gnome/CMakeLists.txt | 4 +-
gnucash/report/report-gnome/gncmod-report-gnome.c | 4 +-
gnucash/report/report-gnome/report-gnome.scm | 17 ++-
gnucash/report/report-gnome/test/CMakeLists.txt | 5 +-
gnucash/report/report-system/CMakeLists.txt | 1 +
gnucash/report/report-system/html-document.scm | 6 +-
gnucash/report/report-system/html-utilities.scm | 62 +++++++++
.../report-register-hooks.scm} | 77 +----------
gnucash/report/report-system/report-system.scm | 25 ++++
gnucash/report/report-system/report.scm | 1 +
gnucash/report/report-system/test/CMakeLists.txt | 20 ++-
.../report-system/test/test-commodity-utils.scm | 4 +-
.../report/report-system/test/test-html-fonts.scm | 4 +-
.../test/test-html-utilities-srfi64.scm | 6 +-
.../report/report-system/test/test-report-html.scm | 4 +-
...st-extras.scm => test-report-system-extras.scm} | 4 +-
.../report-system/test/test-report-system.scm | 4 +-
.../report-system/test/test-report-utilities.scm | 6 +-
.../report/report-system/test/test-test-extras.scm | 4 +-
gnucash/report/reports/CMakeLists.txt | 124 ++++++++++++++++++
.../report/{business-reports => reports}/aging.scm | 5 +-
gnucash/report/reports/reports.scm | 145 +++++++++++++++++++++
.../sample}/hello-world.scm | 2 +-
.../sample}/test-graphing.scm | 2 +-
.../report/reports/sample/welcome-to-gnucash.scm | 60 +++++++++
.../standard}/account-piecharts.scm | 2 +-
.../standard}/account-summary.scm | 2 +-
.../standard}/advanced-portfolio.scm | 2 +-
.../standard}/average-balance.scm | 2 +-
.../standard}/balance-forecast.scm | 2 +-
.../standard}/balance-sheet.scm | 2 +-
.../standard}/balsheet-eg.scm | 2 +-
.../standard}/balsheet-pnl.scm | 2 +-
.../standard}/budget-balance-sheet.scm | 2 +-
.../standard}/budget-barchart.scm | 2 +-
.../standard}/budget-flow.scm | 2 +-
.../standard}/budget-income-statement.scm | 2 +-
.../standard}/budget.scm | 2 +-
.../standard}/cash-flow.scm | 2 +-
.../standard}/cashflow-barchart.scm | 4 +-
.../standard}/category-barchart.scm | 12 +-
.../standard}/customer-summary.scm | 5 +-
.../standard}/daily-reports.scm | 2 +-
.../standard/dashboard.scm} | 85 ++++--------
.../standard}/equity-statement.scm | 2 +-
.../standard}/general-journal.scm | 2 +-
.../standard}/general-ledger.scm | 2 +-
.../standard}/income-gst-statement.scm | 2 +-
.../standard}/income-statement.scm | 2 +-
.../standard}/invoice.scm | 5 +-
.../standard}/job-report.scm | 5 +-
.../standard}/net-charts.scm | 3 +-
.../standard}/owner-report.scm | 5 +-
.../standard}/payables.scm | 7 +-
.../standard}/portfolio.scm | 2 +-
.../standard}/price-scatter.scm | 2 +-
.../standard}/receipt.scm | 5 +-
.../standard}/receivables.scm | 7 +-
.../standard}/reconcile-report.scm | 2 +-
.../standard}/register.scm | 2 +-
.../standard}/sx-summary.scm | 2 +-
.../standard}/taxinvoice.scm | 5 +-
.../standard}/test/CMakeLists.txt | 32 +++--
.../standard}/test/test-average-balance.scm | 10 +-
.../standard}/test/test-balsheet-pnl.scm | 10 +-
.../standard}/test/test-budget.scm | 8 +-
.../standard}/test/test-cash-flow.scm | 4 +-
.../standard}/test/test-cashflow-barchart.scm | 8 +-
.../standard}/test/test-charts.scm | 17 +--
.../standard}/test/test-income-gst.scm | 8 +-
.../standard}/test/test-invoice.scm | 8 +-
.../standard}/test/test-register.scm | 8 +-
.../test/test-standard-category-report.scm | 11 +-
.../standard}/test/test-standard-net-barchart.scm | 8 +-
.../standard}/test/test-standard-net-linechart.scm | 8 +-
.../standard}/test/test-stress-options.scm | 13 +-
.../standard}/test/test-transaction.scm | 10 +-
.../standard}/transaction.scm | 2 +-
.../standard}/trial-balance.scm | 2 +-
.../standard}/view-column.scm | 4 +-
gnucash/report/reports/support/CMakeLists.txt | 17 +++
gnucash/report/reports/support/README | 5 +
.../support}/balsheet-eg.css | 0
.../support}/balsheet-eg.eguile.scm | 0
.../support}/receipt.css | 0
.../support}/receipt.eguile.scm | 0
.../support}/taxinvoice.css | 0
.../support}/taxinvoice.eguile.scm | 0
gnucash/report/standard-reports/CMakeLists.txt | 65 ---------
gnucash/report/stylesheets/test/CMakeLists.txt | 4 +-
.../test/test-load-report-stylesheets-module.scm | 2 +-
gnucash/report/utility-reports/CMakeLists.txt | 32 -----
gnucash/report/utility-reports/utility-reports.scm | 36 -----
libgnucash/app-utils/test/CMakeLists.txt | 15 ++-
libgnucash/app-utils/test/test-c-interface.scm | 2 +-
libgnucash/app-utils/test/test-date-utilities.scm | 4 +-
libgnucash/core-utils/core-utils.i | 10 ++
libgnucash/core-utils/core-utils.scm | 4 +
libgnucash/core-utils/gnc-filepath-utils.cpp | 48 ++++++-
libgnucash/core-utils/gnc-filepath-utils.h | 2 +
libgnucash/core-utils/gnc-path.c | 39 +++++-
libgnucash/core-utils/gnc-path.h | 14 +-
libgnucash/doc/user-prefs-howto.txt | 2 +-
libgnucash/engine/test/CMakeLists.txt | 18 +--
libgnucash/engine/test/srfi64-extras.scm | 2 +-
libgnucash/engine/test/test-account.scm | 2 +-
.../{test-extras.scm => test-engine-extras.scm} | 2 +-
libgnucash/engine/test/test-split.scm | 2 +-
libgnucash/gnc-module/test/CMakeLists.txt | 4 +-
libgnucash/gnc-module/test/mod-bar/CMakeLists.txt | 7 +
libgnucash/gnc-module/test/mod-baz/CMakeLists.txt | 6 +-
libgnucash/gnc-module/test/mod-foo/CMakeLists.txt | 6 +-
.../gnc-module/test/test-gnc-module-load-deps.scm | 2 +-
.../gnc-module/test/test-gnc-module-load-scm.scm | 2 +-
.../gnc-module/test/test-gnc-module-scm-init.scm | 2 +-
.../gnc-module/test/test-gnc-module-scm-module.scm | 2 +-
.../gnc-module/test/test-gnc-module-scm-multi.scm | 2 +-
.../gnc-module/test/test-gnc-module-swigged-c.scm | 2 +-
libgnucash/scm/test/CMakeLists.txt | 4 +-
.../scm/test/test-libgnucash-scm-utilities.scm | 2 +-
libgnucash/tax/us/test/CMakeLists.txt | 4 +-
po/POTFILES.in | 96 +++++++-------
133 files changed, 901 insertions(+), 798 deletions(-)
delete mode 100644 gnucash/report/business-reports/CMakeLists.txt
delete mode 100644 gnucash/report/business-reports/business-reports.scm
delete mode 100644 gnucash/report/business-reports/test/CMakeLists.txt
rename gnucash/report/{standard-reports/standard-reports.scm => report-system/report-register-hooks.scm} (53%)
rename gnucash/report/report-system/test/{test-extras.scm => test-report-system-extras.scm} (97%)
create mode 100644 gnucash/report/reports/CMakeLists.txt
rename gnucash/report/{business-reports => reports}/aging.scm (99%)
create mode 100644 gnucash/report/reports/reports.scm
rename gnucash/report/{utility-reports => reports/sample}/hello-world.scm (99%)
rename gnucash/report/{utility-reports => reports/sample}/test-graphing.scm (99%)
create mode 100644 gnucash/report/reports/sample/welcome-to-gnucash.scm
rename gnucash/report/{standard-reports => reports/standard}/account-piecharts.scm (99%)
rename gnucash/report/{standard-reports => reports/standard}/account-summary.scm (99%)
rename gnucash/report/{standard-reports => reports/standard}/advanced-portfolio.scm (99%)
rename gnucash/report/{standard-reports => reports/standard}/average-balance.scm (99%)
rename gnucash/report/{standard-reports => reports/standard}/balance-forecast.scm (99%)
rename gnucash/report/{standard-reports => reports/standard}/balance-sheet.scm (99%)
rename gnucash/report/{business-reports => reports/standard}/balsheet-eg.scm (99%)
rename gnucash/report/{standard-reports => reports/standard}/balsheet-pnl.scm (99%)
rename gnucash/report/{standard-reports => reports/standard}/budget-balance-sheet.scm (99%)
rename gnucash/report/{standard-reports => reports/standard}/budget-barchart.scm (99%)
rename gnucash/report/{standard-reports => reports/standard}/budget-flow.scm (99%)
rename gnucash/report/{standard-reports => reports/standard}/budget-income-statement.scm (99%)
rename gnucash/report/{standard-reports => reports/standard}/budget.scm (99%)
rename gnucash/report/{standard-reports => reports/standard}/cash-flow.scm (99%)
rename gnucash/report/{standard-reports => reports/standard}/cashflow-barchart.scm (99%)
rename gnucash/report/{standard-reports => reports/standard}/category-barchart.scm (98%)
rename gnucash/report/{business-reports => reports/standard}/customer-summary.scm (99%)
rename gnucash/report/{standard-reports => reports/standard}/daily-reports.scm (99%)
rename gnucash/report/{utility-reports/welcome-to-gnucash.scm => reports/standard/dashboard.scm} (53%)
rename gnucash/report/{standard-reports => reports/standard}/equity-statement.scm (99%)
rename gnucash/report/{standard-reports => reports/standard}/general-journal.scm (98%)
rename gnucash/report/{standard-reports => reports/standard}/general-ledger.scm (98%)
rename gnucash/report/{standard-reports => reports/standard}/income-gst-statement.scm (99%)
rename gnucash/report/{standard-reports => reports/standard}/income-statement.scm (99%)
rename gnucash/report/{business-reports => reports/standard}/invoice.scm (99%)
rename gnucash/report/{business-reports => reports/standard}/job-report.scm (99%)
rename gnucash/report/{standard-reports => reports/standard}/net-charts.scm (99%)
rename gnucash/report/{business-reports => reports/standard}/owner-report.scm (99%)
rename gnucash/report/{business-reports => reports/standard}/payables.scm (95%)
rename gnucash/report/{standard-reports => reports/standard}/portfolio.scm (99%)
rename gnucash/report/{standard-reports => reports/standard}/price-scatter.scm (99%)
rename gnucash/report/{business-reports => reports/standard}/receipt.scm (98%)
rename gnucash/report/{business-reports => reports/standard}/receivables.scm (96%)
rename gnucash/report/{standard-reports => reports/standard}/reconcile-report.scm (98%)
rename gnucash/report/{standard-reports => reports/standard}/register.scm (99%)
rename gnucash/report/{standard-reports => reports/standard}/sx-summary.scm (99%)
rename gnucash/report/{business-reports => reports/standard}/taxinvoice.scm (99%)
rename gnucash/report/{standard-reports => reports/standard}/test/CMakeLists.txt (54%)
rename gnucash/report/{standard-reports => reports/standard}/test/test-average-balance.scm (93%)
rename gnucash/report/{standard-reports => reports/standard}/test/test-balsheet-pnl.scm (98%)
rename gnucash/report/{standard-reports => reports/standard}/test/test-budget.scm (97%)
rename gnucash/report/{standard-reports => reports/standard}/test/test-cash-flow.scm (98%)
rename gnucash/report/{standard-reports => reports/standard}/test/test-cashflow-barchart.scm (97%)
rename gnucash/report/{standard-reports => reports/standard}/test/test-charts.scm (95%)
rename gnucash/report/{standard-reports => reports/standard}/test/test-income-gst.scm (97%)
rename gnucash/report/{business-reports => reports/standard}/test/test-invoice.scm (99%)
rename gnucash/report/{standard-reports => reports/standard}/test/test-register.scm (95%)
rename gnucash/report/{standard-reports => reports/standard}/test/test-standard-category-report.scm (98%)
rename gnucash/report/{standard-reports => reports/standard}/test/test-standard-net-barchart.scm (98%)
rename gnucash/report/{standard-reports => reports/standard}/test/test-standard-net-linechart.scm (97%)
rename gnucash/report/{standard-reports => reports/standard}/test/test-stress-options.scm (97%)
rename gnucash/report/{standard-reports => reports/standard}/test/test-transaction.scm (99%)
rename gnucash/report/{standard-reports => reports/standard}/transaction.scm (96%)
rename gnucash/report/{standard-reports => reports/standard}/trial-balance.scm (99%)
rename gnucash/report/{utility-reports => reports/standard}/view-column.scm (98%)
create mode 100644 gnucash/report/reports/support/CMakeLists.txt
create mode 100644 gnucash/report/reports/support/README
rename gnucash/report/{business-reports => reports/support}/balsheet-eg.css (100%)
rename gnucash/report/{business-reports => reports/support}/balsheet-eg.eguile.scm (100%)
rename gnucash/report/{business-reports => reports/support}/receipt.css (100%)
rename gnucash/report/{business-reports => reports/support}/receipt.eguile.scm (100%)
rename gnucash/report/{business-reports => reports/support}/taxinvoice.css (100%)
rename gnucash/report/{business-reports => reports/support}/taxinvoice.eguile.scm (100%)
delete mode 100644 gnucash/report/standard-reports/CMakeLists.txt
delete mode 100644 gnucash/report/utility-reports/CMakeLists.txt
delete mode 100644 gnucash/report/utility-reports/utility-reports.scm
rename libgnucash/engine/test/{test-extras.scm => test-engine-extras.scm} (99%)
More information about the gnucash-changes
mailing list