gnucash unstable: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Sun Nov 19 20:33:53 EST 2017
Updated via https://github.com/Gnucash/gnucash/commit/d44f6bc9 (commit)
via https://github.com/Gnucash/gnucash/commit/961cb5a8 (commit)
via https://github.com/Gnucash/gnucash/commit/d648b29d (commit)
via https://github.com/Gnucash/gnucash/commit/9444c1e3 (commit)
from https://github.com/Gnucash/gnucash/commit/060e16b6 (commit)
commit d44f6bc9d533c1159886b52affcbd43a34b1ded4
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Nov 19 17:28:53 2017 -0800
Fix missing/misspelled files for distribution.
Mostly errors from 6c01e54.
diff --git a/gnucash/gnome-utils/test/CMakeLists.txt b/gnucash/gnome-utils/test/CMakeLists.txt
index eab5563..f2b85bd 100644
--- a/gnucash/gnome-utils/test/CMakeLists.txt
+++ b/gnucash/gnome-utils/test/CMakeLists.txt
@@ -45,4 +45,4 @@ GNC_ADD_SCHEME_TARGETS(scm-test-load-gnome-utils-module
GNC_ADD_SCHEME_TESTS(test-load-gnome-utils-module.scm)
-SET_DIST_LIST(test_gnome_utils_DIST CMakeLists.txt Makefile.am test-gnc-recurrence.c test-link-module.c test-load-report-gnome-module.scm)
+SET_DIST_LIST(test_gnome_utils_DIST CMakeLists.txt Makefile.am test-gnc-recurrence.c test-link-module.c test-load-gnome-utils-module.scm)
diff --git a/gnucash/report/report-system/test/CMakeLists.txt b/gnucash/report/report-system/test/CMakeLists.txt
index e76d828..5d35d15 100644
--- a/gnucash/report/report-system/test/CMakeLists.txt
+++ b/gnucash/report/report-system/test/CMakeLists.txt
@@ -37,9 +37,8 @@ GNC_ADD_SCHEME_TARGETS(scm-test-report-system-2
SET_DIST_LIST(test_report_system_DIST
CMakeLists.txt
Makefile.am
- test-collectors.scm
+ ${scm_test_report_system_SOURCES}
test-extras.scm
test-link-module.c
- test-report-utilities.scm
- test-list-extras.scm
+ test-test-extras.scm
)
diff --git a/gnucash/report/standard-reports/test/CMakeLists.txt b/gnucash/report/standard-reports/test/CMakeLists.txt
index 0692020..00d20cb 100644
--- a/gnucash/report/standard-reports/test/CMakeLists.txt
+++ b/gnucash/report/standard-reports/test/CMakeLists.txt
@@ -28,6 +28,5 @@ GNC_ADD_SCHEME_TARGETS(scm-test-standard-reports
FALSE
)
-SET_DIST_LIST(test_standard_reports_DIST CMakeLists.txt Makefile.am ${scm_test_standard_reports_SOURCES}
- test-cash-flow.scm test-cashflow-barchart.scm test-standard-category-report.scm test-standard-net-barchart.scm
- test-standard-net-linechart.scm)
+SET_DIST_LIST(test_standard_reports_DIST CMakeLists.txt Makefile.am
+ ${scm_test_standard_reports_SOURCES} ${scm_test_report_SUPPORT})
diff --git a/libgnucash/app-utils/test/CMakeLists.txt b/libgnucash/app-utils/test/CMakeLists.txt
index b99b936..faa1e68 100644
--- a/libgnucash/app-utils/test/CMakeLists.txt
+++ b/libgnucash/app-utils/test/CMakeLists.txt
@@ -56,5 +56,6 @@ SET_DIST_LIST(test_app_utils_DIST
test-print-queries.cpp
test-scm-query-string.cpp
test-sx.cpp
+ test-load-app-utils-module.scm
${test_app_utils_SOURCES}
)
commit 961cb5a829bb325525652429886aeed71e6d4483
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Nov 19 17:28:41 2017 -0800
Bug 790550 - FTBFS: missing __init__.py
diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt
index a5988ae..5c8f129 100644
--- a/bindings/python/CMakeLists.txt
+++ b/bindings/python/CMakeLists.txt
@@ -1,6 +1,8 @@
ADD_SUBDIRECTORY(example_scripts)
ADD_SUBDIRECTORY(tests)
+SET(PYEXEC_FILES __init__.py function_class.py gnucash_business.py gnucash_core.py)
+
IF (BUILDING_FROM_VCS)
SET(SWIG_FILES ${CMAKE_CURRENT_SOURCE_DIR}/gnucash_core.i ${CMAKE_CURRENT_SOURCE_DIR}/timespec.i)
SET(GNUCASH_CORE_C_INCLUDES
@@ -64,8 +66,6 @@ IF(WITH_PYTHON)
${PYTHON_INCLUDE_DIRS}
)
- SET(PYEXEC_FILES __init__.py function_class.py gnucash_business.py gnucash_core.py)
-
ADD_LIBRARY(gnucash_core_c MODULE ${SWIG_GNUCASH_CORE_C})
TARGET_INCLUDE_DIRECTORIES(gnucash_core_c PRIVATE ${gnucash_core_c_INCLUDE_DIRS})
@@ -102,10 +102,12 @@ IF(WITH_PYTHON)
ENDIF()
SET(python_bindings_DATA ${PYEXEC_FILES}
- gnucash_core.i
- sqlite3test.c
- timespec.i)
+ gnucash_core.i
+ sqlite3test.c
+ timespec.i)
-SET_LOCAL_DIST(python_bindings_DIST_local CMakeLists.txt Makefile.am ${python_bindings_DATA})
+SET_LOCAL_DIST(python_bindings_DIST_local CMakeLists.txt Makefile.am
+ ${python_bindings_DATA})
-SET(python_bindings_DIST ${python_bindings_DIST_local} ${test_python_bindings_DIST} ${example_scripts_DIST} PARENT_SCOPE)
+SET(python_bindings_DIST ${python_bindings_DIST_local}
+ ${test_python_bindings_DIST} ${example_scripts_DIST} PARENT_SCOPE)
commit d648b29d0d99f59fb833ec1ff9187a889bfe4c1d
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Nov 19 17:20:26 2017 -0800
Fix distribution paths for resource files.
glib-compile-resources lists the resource files as absolute paths,
but SET_LOCAL_DIST expects relative paths; the result was that the
tarball code was looking for ${CMAKE_SOURCE_DIR}/${CMAKE_CURRENT_SOURCE_DIR}/foo.
This change strips off ${CMAKE_CURRENT_SOURCE_DIR} from the filenames
before passing them to SET_LOCAL_DIST.
diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt
index 205bbfd..69fc47e 100644
--- a/gnucash/CMakeLists.txt
+++ b/gnucash/CMakeLists.txt
@@ -237,9 +237,16 @@ IF (WIN32)
INSTALL(PROGRAMS ${CMD_FILE} DESTINATION bin)
ENDIF(WIN32)
+# The GResource Files are absolute paths but SET_LOCAL_DIST requires
+# relative paths.
+FOREACH(gres_file ${gresource_files})
+ FILE(RELATIVE_PATH rel_file ${CMAKE_CURRENT_SOURCE_DIR} ${gres_file})
+ LIST(REMOVE_ITEM gresource_files ${gres_file})
+ LIST(APPEND gresource_files ${rel_file})
+ENDFOREACH()
SET_LOCAL_DIST(gnucash_DIST_local CMakeLists.txt environment.in generate-gnc-script
- gnucash-bin.c gnucash.rc.in gnucash-valgrind.in gnucash-gresourses.xml ${gresource_files}
+ gnucash-bin.c gnucash.rc.in gnucash-valgrind.in gnucash-gresources.xml ${gresource_files}
Makefile.am ${gnucash_EXTRA_DIST})
SET(gnucash_DIST ${gnucash_DIST_local} ${gnome_DIST} ${gnome_search_DIST}
commit 9444c1e300e869aeea763a2db4f164560d067232
Author: John Ralls <jralls at ceridwen.us>
Date: Sun Nov 19 14:05:09 2017 -0800
Fix bad string construction in adjust_sql_options.
diff --git a/libgnucash/backend/dbi/gnc-backend-dbi.cpp b/libgnucash/backend/dbi/gnc-backend-dbi.cpp
index 4e6077e..bd50be6 100644
--- a/libgnucash/backend/dbi/gnc-backend-dbi.cpp
+++ b/libgnucash/backend/dbi/gnc-backend-dbi.cpp
@@ -582,7 +582,7 @@ adjust_sql_options (dbi_conn connection)
std::string adjusted_str{adjust_sql_options_string(str)};
PINFO("Setting sql_mode to %s", adjusted_str.c_str());
- std::string set_str{"SET sql_mode=" + std::move(adjusted_str)};
+ std::string set_str{"SET sql_mode='" + std::move(adjusted_str) + "'"};
dbi_result set_result = dbi_conn_query(connection,
set_str.c_str());
if (set_result)
Summary of changes:
bindings/python/CMakeLists.txt | 16 +++++++++-------
gnucash/CMakeLists.txt | 9 ++++++++-
gnucash/gnome-utils/test/CMakeLists.txt | 2 +-
gnucash/report/report-system/test/CMakeLists.txt | 5 ++---
gnucash/report/standard-reports/test/CMakeLists.txt | 5 ++---
libgnucash/app-utils/test/CMakeLists.txt | 1 +
libgnucash/backend/dbi/gnc-backend-dbi.cpp | 2 +-
7 files changed, 24 insertions(+), 16 deletions(-)
More information about the gnucash-changes
mailing list