gnucash maint: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Sun Apr 12 18:53:09 EDT 2020
Updated via https://github.com/Gnucash/gnucash/commit/1365a19e (commit)
via https://github.com/Gnucash/gnucash/commit/e1b01403 (commit)
via https://github.com/Gnucash/gnucash/commit/06033c19 (commit)
from https://github.com/Gnucash/gnucash/commit/7d39ccc9 (commit)
commit 1365a19e2ea8095c9a18e424daa3502ada1329a5
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 12 15:51:05 2020 -0700
Force WITH_PYTHON=YES for distcheck.
To ensure that it works from the tarball.
diff --git a/common/cmake_modules/MakeDistCheck.cmake b/common/cmake_modules/MakeDistCheck.cmake
index f7458c07c..9302caa99 100644
--- a/common/cmake_modules/MakeDistCheck.cmake
+++ b/common/cmake_modules/MakeDistCheck.cmake
@@ -47,6 +47,7 @@ function(run_dist_check PACKAGE_PREFIX EXT)
-D CMAKE_INSTALL_PREFIX=../${INSTALL_DIR}
-D GTEST_ROOT=${GTEST_ROOT}
-D GMOCK_ROOT=${GMOCK_ROOT}
+ -D WITH_PYTHON=YES
../${PACKAGE_PREFIX}
WORKING_DIRECTORY ${BUILD_DIR}
ERROR_MSG "CMake configure command failed."
commit e1b014035753beb111388c8468460b0c61d816bc
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 12 13:43:00 2020 -0700
Fix failed build of python tests and failed test in 3.10 tarball.
diff --git a/bindings/python/tests/CMakeLists.txt b/bindings/python/tests/CMakeLists.txt
index 4e68d6d21..dca317de4 100644
--- a/bindings/python/tests/CMakeLists.txt
+++ b/bindings/python/tests/CMakeLists.txt
@@ -5,7 +5,7 @@ if (WITH_PYTHON)
# Because it hasn't been built yet
set(test_core_dir ${CMAKE_BINARY_DIR}/common/test-core)
endif()
- add_custom_target(test-python-bindings ALL DEPENDS unittest_support gnucash-core-c-build gnucash-core-c-py swig-app-utils-python)
+ add_custom_target(test-python-bindings ALL DEPENDS unittest_support gnucash-core-c-build gnucash-core-c-py sw_app_utils)
add_dependencies(check test-python-bindings)
add_test(python-bindings ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/runTests.py.in)
set_property(TEST python-bindings PROPERTY ENVIRONMENT
@@ -21,6 +21,7 @@ set(test_python_bindings_DATA
test_business.py
test_commodity.py
test_numeric.py
+ test_session.py
test_split.py
test_transaction.py
test_query.py)
commit 06033c19cdff0abf4849ecc96e3ce0b0690fcd13
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Apr 12 13:40:49 2020 -0700
Fix typo. Really fixes 797674.
diff --git a/libgnucash/core-utils/binreloc.c b/libgnucash/core-utils/binreloc.c
index 6eab8907c..2e2067e38 100644
--- a/libgnucash/core-utils/binreloc.c
+++ b/libgnucash/core-utils/binreloc.c
@@ -475,7 +475,7 @@ find_component_directory (const gchar *default_dir, const gchar* compiled_dir)
prefix = gnc_gbr_find_prefix (NULL);
if (prefix == NULL)
return g_strdup (default_dir ? default_dir : compiled_dir);
- if (!g_getenv("GNC_UNINSTALLE"))
+ if (!g_getenv("GNC_UNINSTALLED"))
{
if (!g_strcmp0 (prefix, PREFIX))
return g_strdup (compiled_dir);
Summary of changes:
bindings/python/tests/CMakeLists.txt | 3 ++-
common/cmake_modules/MakeDistCheck.cmake | 1 +
libgnucash/core-utils/binreloc.c | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
More information about the gnucash-changes
mailing list