gnucash master: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Sat Mar 4 19:00:45 EST 2023
Updated via https://github.com/Gnucash/gnucash/commit/c0681aba (commit)
via https://github.com/Gnucash/gnucash/commit/c114ff79 (commit)
via https://github.com/Gnucash/gnucash/commit/565bce80 (commit)
from https://github.com/Gnucash/gnucash/commit/5b85404b (commit)
commit c0681ababa319c51fa619931ab230daf1bddd25b
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Mar 4 15:51:13 2023 -0800
Fix dist for gnome tests.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0598560cf..f997cea58 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.14.0)
endif()
project (gnucash
- VERSION 4.901
+ VERSION 4.902
)
enable_testing()
diff --git a/gnucash/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt
index 968ee8390..32e9a151a 100644
--- a/gnucash/gnome/CMakeLists.txt
+++ b/gnucash/gnome/CMakeLists.txt
@@ -249,8 +249,11 @@ gnc_add_scheme_targets(scm-gnome
OUTPUT_DIR gnucash
DEPENDS "${GUILE_DEPENDS}")
-set_dist_list(gnome_DIST
+set_local_dist(gnome_DIST_local
CMakeLists.txt gnome.i gnucash.appdata.xml.in.in gnucash.desktop.in.in
- gnucash.releases.xml ${gnc_gnome_noinst_HEADERS} ${gnc_gnome_SOURCES} ${gnome_SCHEME} ${test_app_utils_DIST})
+ gnucash.releases.xml ${gnc_gnome_noinst_HEADERS} ${gnc_gnome_SOURCES} ${gnome_SCHEME})
+
dist_add_generated(${BUILDING_FROM_VCS} gnucash.appdata.xml.in)
add_dependencies(gnucash-appdata dist-gnucash-gnome-gnucash-appdata-xml-in)
+
+set(gnome_DIST ${gnome_DIST_local} ${test_gnome_DIST} PARENT_SCOPE)
diff --git a/gnucash/gnome/test/CMakeLists.txt b/gnucash/gnome/test/CMakeLists.txt
index bda612c8e..538ba5c2e 100644
--- a/gnucash/gnome/test/CMakeLists.txt
+++ b/gnucash/gnome/test/CMakeLists.txt
@@ -18,7 +18,7 @@ macro(add_gnome_test _TARGET _SOURCE_FILES)
gnc_add_test(${_TARGET} "${_SOURCE_FILES}" GNOME_TEST_INCLUDE_DIRS GNOME_TEST_LIBS)
endmacro()
-gnc_add_test_with_guile(test-invoice-report-buitin-default test-invoice-report-buitin-default.cpp
+gnc_add_test_with_guile(test-invoice-report-builtin-default test-invoice-report-builtin-default.cpp
GNOME_TEST_INCLUDE_DIRS GNOME_TEST_LIBS
)
@@ -26,9 +26,7 @@ set(GUILE_DEPENDS
scm-core-utils
)
-set_dist_list(test_app_utils_DIST
+set_dist_list(test_gnome_DIST
CMakeLists.txt
- test-invoice-buitin-default.cpp
- ${test_gnome_scheme_SOURCES}
- ${test_gnome_SOURCES}
+ test-invoice-report-builtin-default.cpp
)
diff --git a/gnucash/gnome/test/test-invoice-report-buitin-default.cpp b/gnucash/gnome/test/test-invoice-report-builtin-default.cpp
similarity index 100%
rename from gnucash/gnome/test/test-invoice-report-buitin-default.cpp
rename to gnucash/gnome/test/test-invoice-report-builtin-default.cpp
commit c114ff7957aec24484afb87b7f4823bbb1f57c5d
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Mar 4 14:51:58 2023 -0800
Remove unused function and variable.
diff --git a/gnucash/import-export/aqb/gnc-ab-transfer.c b/gnucash/import-export/aqb/gnc-ab-transfer.c
index 3cfc1e43b..5bab04d7c 100644
--- a/gnucash/import-export/aqb/gnc-ab-transfer.c
+++ b/gnucash/import-export/aqb/gnc-ab-transfer.c
@@ -47,25 +47,8 @@
/* This static indicates the debugging module that this .o belongs to. */
G_GNUC_UNUSED static QofLogModule log_module = G_LOG_DOMAIN;
-static void save_templates(GtkWidget *parent, Account *gnc_acc, GList *templates,
- gboolean dont_ask);
static void txn_created_cb(Transaction *trans, gpointer user_data);
-static void
-save_templates(GtkWidget *parent, Account *gnc_acc, GList *templates,
- gboolean dont_ask)
-{
- g_return_if_fail(gnc_acc);
- if (dont_ask || gnc_verify_dialog (
- GTK_WINDOW (parent), FALSE, "%s",
- _("You have changed the list of online transfer templates, "
- "but you cancelled the transfer dialog. "
- "Do you nevertheless want to store the changes?")))
- {
- gnc_ab_set_book_template_list(gnc_account_get_book(gnc_acc), templates);
- }
-}
-
static void
txn_created_cb(Transaction *trans, gpointer user_data)
{
@@ -136,7 +119,6 @@ gnc_ab_maketrans(GtkWidget *parent, Account *gnc_acc,
{
GncGWENGui *gui = NULL;
gint result;
- gboolean changed;
const AB_TRANSACTION *ab_trans;
GNC_AB_JOB *job = NULL;
GNC_AB_JOB_LIST2 *job_list = NULL;
commit 565bce80c02d9d253d87939bfa7222fb590539be
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Mar 4 14:50:58 2023 -0800
Include gnucash/gnome/test in the dist.
diff --git a/gnucash/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt
index 867743ea5..968ee8390 100644
--- a/gnucash/gnome/CMakeLists.txt
+++ b/gnucash/gnome/CMakeLists.txt
@@ -251,6 +251,6 @@ gnc_add_scheme_targets(scm-gnome
set_dist_list(gnome_DIST
CMakeLists.txt gnome.i gnucash.appdata.xml.in.in gnucash.desktop.in.in
- gnucash.releases.xml ${gnc_gnome_noinst_HEADERS} ${gnc_gnome_SOURCES} ${gnome_SCHEME})
+ gnucash.releases.xml ${gnc_gnome_noinst_HEADERS} ${gnc_gnome_SOURCES} ${gnome_SCHEME} ${test_app_utils_DIST})
dist_add_generated(${BUILDING_FROM_VCS} gnucash.appdata.xml.in)
add_dependencies(gnucash-appdata dist-gnucash-gnome-gnucash-appdata-xml-in)
Summary of changes:
CMakeLists.txt | 2 +-
gnucash/gnome/CMakeLists.txt | 5 ++++-
gnucash/gnome/test/CMakeLists.txt | 8 +++-----
...ult.cpp => test-invoice-report-builtin-default.cpp} | 0
gnucash/import-export/aqb/gnc-ab-transfer.c | 18 ------------------
5 files changed, 8 insertions(+), 25 deletions(-)
rename gnucash/gnome/test/{test-invoice-report-buitin-default.cpp => test-invoice-report-builtin-default.cpp} (100%)
More information about the gnucash-changes
mailing list