gnucash maint: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Fri Nov 9 21:36:08 EST 2018


Updated	 via  https://github.com/Gnucash/gnucash/commit/4c1c485d (commit)
	 via  https://github.com/Gnucash/gnucash/commit/2667ee7d (commit)
	from  https://github.com/Gnucash/gnucash/commit/52380d11 (commit)



commit 4c1c485db6c707acc91ca9eb4a4bcc1a8a717bd6
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Nov 10 08:13:11 2018 +0900

    Use split SCU when borking random split pairs.
    
    Reduces likelihood of a zero value in the transaction currency.

diff --git a/libgnucash/engine/test-core/test-engine-stuff.cpp b/libgnucash/engine/test-core/test-engine-stuff.cpp
index ca657d2..13ec7af 100644
--- a/libgnucash/engine/test-core/test-engine-stuff.cpp
+++ b/libgnucash/engine/test-core/test-engine-stuff.cpp
@@ -913,7 +913,7 @@ add_random_splits(QofBook *book, Transaction *trn, GList *account_list)
     /* Other split should have equal and opposite value */
     if (do_bork())
     {
-        val = get_random_gnc_numeric(GNC_DENOM_AUTO);
+        val = get_random_gnc_numeric(s2_scu);
         g_log ("test.engine.suff", G_LOG_LEVEL_DEBUG, "Borking second %" PRIu64
 	       " / %" PRIu64 ", scu %d\n", val.num, val.denom, s2_scu);
     }

commit 2667ee7d98741f2de870ded4efb2e8797352e915
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Oct 2 08:56:36 2018 -0700

    Don't rely on glib-compile-resources being on the path.

diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt
index 4fdd1d0..179a3a6 100644
--- a/gnucash/CMakeLists.txt
+++ b/gnucash/CMakeLists.txt
@@ -75,15 +75,18 @@ execute_process(
    COMMAND
        ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_resources
    OUTPUT_VARIABLE
-       GLIB_COMPILE_RESOURCES_EXECUTABLE
+       GLIB_COMPILE_RESOURCES_NAME
    OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
+find_program(GLIB_COMPILE_RESOURCES_EXECUTABLE ${GLIB_COMPILE_RESOURCES_NAME})
+
 # Get the dependencies of the gresource
+
 execute_process(
   OUTPUT_VARIABLE
       gr_files
-  COMMAND ${GLIB_COMPILE_RESOURCES_EXECUTABLE}
+  COMMAND "${GLIB_COMPILE_RESOURCES_EXECUTABLE}"
      --sourcedir=${CMAKE_CURRENT_SOURCE_DIR}
      --generate-dependencies
      ${CMAKE_CURRENT_SOURCE_DIR}/gnucash-gresources.xml
@@ -94,7 +97,7 @@ string (REPLACE "\n" ";" gresource_files ${gr_files})
 add_custom_command(
    OUTPUT gnucash-gresources.c
    COMMAND
-    ${GLIB_COMPILE_RESOURCES_EXECUTABLE}
+    "${GLIB_COMPILE_RESOURCES_EXECUTABLE}"
     --target=gnucash-gresources.c
     --sourcedir=${CMAKE_CURRENT_SOURCE_DIR}
     --generate-source



Summary of changes:
 gnucash/CMakeLists.txt                            | 9 ++++++---
 libgnucash/engine/test-core/test-engine-stuff.cpp | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)



More information about the gnucash-changes mailing list