gnucash maint: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Thu Oct 5 09:08:41 EDT 2017
Updated via https://github.com/Gnucash/gnucash/commit/7650d765 (commit)
via https://github.com/Gnucash/gnucash/commit/42ac55e0 (commit)
from https://github.com/Gnucash/gnucash/commit/a28f27a0 (commit)
commit 7650d76582e8e257fc8492d773f78cd27d811768
Author: Geert Janssens <geert at kobaltwit.be>
Date: Tue Oct 3 22:30:26 2017 +0200
Fix gnucash.pot generation from cmake build.
intltool-update should be run from the build directory, not the source directory.
If run from the source directory it will omit glade messages that have a context attribute
so all msgids with a msgctxt comment would be missing.
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index b3dfb98..22bf0f6 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -162,8 +162,8 @@ IF(BUILDING_FROM_VCS)
IF (${CMAKE_VERSION} VERSION_GREATER 3.1 AND NOT WIN32)
EXECUTE_PROCESS(
- COMMAND ${CMAKE_COMMAND_TMP} INTLTOOL_EXTRACT=${INTLTOOL_EXTRACT} XGETTEXT=${XGETTEXT} ${INTLTOOL_UPDATE} --gettext-package ${PACKAGE} --pot
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ COMMAND ${CMAKE_COMMAND_TMP} INTLTOOL_EXTRACT=${INTLTOOL_EXTRACT} XGETTEXT=${XGETTEXT} srcdir=${CMAKE_CURRENT_SOURCE_DIR} ${INTLTOOL_UPDATE} --gettext-package ${PACKAGE} --pot
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
RESULT_VARIABLE GNUCASH_POT_RESULT
)
IF(NOT ${GNUCASH_POT_RESULT} STREQUAL "0")
@@ -173,7 +173,7 @@ IF(BUILDING_FROM_VCS)
CONFIGURE_FILE(make-gnucash-pot.sh.in make-gnucash-pot.sh)
EXECUTE_PROCESS(
COMMAND ${SHELL} ${CMAKE_CURRENT_BINARY_DIR}/make-gnucash-pot.sh
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
RESULT_VARIABLE GNUCASH_POT_RESULT_SHELL
)
IF(NOT ${GNUCASH_POT_RESULT_SHELL} STREQUAL "0")
@@ -181,20 +181,10 @@ IF(BUILDING_FROM_VCS)
ENDIF()
ENDIF()
- IF (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/gnucash.pot)
+ IF (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/gnucash.pot)
MESSAGE(FATAL_ERROR "POT file '${CMAKE_CURRENT_SOURCE_DIR}/gnucash.pot' was not successfully created.")
ENDIF()
-
- EXECUTE_PROCESS(
- COMMAND ${CMAKE_COMMAND} -E copy gnucash.pot ${CMAKE_CURRENT_BINARY_DIR}
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- )
- EXECUTE_PROCESS(
- COMMAND ${CMAKE_COMMAND} -E remove gnucash.pot
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- )
-
ENDIF()
ADD_CUSTOM_TARGET(check-po
diff --git a/po/make-gnucash-pot.sh.in b/po/make-gnucash-pot.sh.in
index 00e134d..43198b0 100644
--- a/po/make-gnucash-pot.sh.in
+++ b/po/make-gnucash-pot.sh.in
@@ -4,4 +4,4 @@ XGETTEXT=@XGETTEXT@
INTLTOOL_UPDATE=@INTLTOOL_UPDATE@
SOURCE_DIR=@CMAKE_CURRENT_SOURCE_DIR@
PACKAGE=@PACKAGE@
-cd $SOURCE_DIR && $INTLTOOL_UPDATE --gettext-package $PACKAGE --pot
+srcdir=$SOURCE_DIR $INTLTOOL_UPDATE --gettext-package $PACKAGE --pot
commit 42ac55e03a1a84739f4a5b7a247c31d91c0adc4a
Author: Geert Janssens <geert at kobaltwit.be>
Date: Tue Oct 3 12:49:25 2017 +0200
Stop testing GObject's handling of invalid parameters
diff --git a/src/engine/test/utest-Transaction.c b/src/engine/test/utest-Transaction.c
index 50bb824..1498b5f 100644
--- a/src/engine/test/utest-Transaction.c
+++ b/src/engine/test/utest-Transaction.c
@@ -407,24 +407,18 @@ test_gnc_transaction_set_get_property (Fixture *fixture, gconstpointer pData)
{
QofBook *book = qof_book_new ();
Transaction *txn = g_object_new (GNC_TYPE_TRANSACTION, "book", book, NULL);
- gchar *num = "42", *desc = "The Answer", *t_num = NULL, *t_desc = NULL, *phony = NULL;
+ gchar *num = "42", *desc = "The Answer", *t_num = NULL, *t_desc = NULL;
gnc_commodity *curr = gnc_commodity_new (book, "Gnu Rand", "CURRENCY",
"GNR", "", 240), *t_curr = NULL;
Timespec now = timespec_now (), *t_entered = NULL, *t_posted = NULL;
time_t secs = (time_t)now.tv_sec;
- gchar *msg1 = "g_object_set_valist: object class " _Q "Transaction' has no property named " _Q "bogus'";
- gchar *msg2 = g_strdup_printf ("[xaccTransSetDateInternal] addr=%p set date to %" G_GUINT64_FORMAT ".%09ld %s",
+ gchar *msg = g_strdup_printf ("[xaccTransSetDateInternal] addr=%p set date to %" G_GUINT64_FORMAT ".%09ld %s",
txn, now.tv_sec, now.tv_nsec, ctime (&secs));
- GLogLevelFlags loglevel1 = G_LOG_LEVEL_WARNING | G_LOG_FLAG_FATAL;
- GLogLevelFlags loglevel2 = G_LOG_LEVEL_INFO;
- TestErrorStruct *check1 = test_error_struct_new ("GLib-GObject",
- loglevel1, msg1);
- TestErrorStruct *check2 = test_error_struct_new ("gnc.engine",
- loglevel2, msg2);
- g_free (msg2);
- fixture->hdlrs = test_log_set_fatal_handler (fixture->hdlrs, check1,
- (GLogFunc)test_checked_handler);
- fixture->hdlrs = test_log_set_handler (fixture->hdlrs, check2,
+ GLogLevelFlags loglevel = G_LOG_LEVEL_INFO;
+ TestErrorStruct *check = test_error_struct_new ("gnc.engine",
+ loglevel, msg);
+ g_free (msg);
+ fixture->hdlrs = test_log_set_handler (fixture->hdlrs, check,
(GLogFunc)test_checked_handler);
g_assert_cmpstr (txn->num, ==, "");
g_assert_cmpstr (txn->description, ==, "");
@@ -441,7 +435,6 @@ test_gnc_transaction_set_get_property (Fixture *fixture, gconstpointer pData)
"currency", curr,
"post-date", &now,
"enter-date", &now,
- "bogus", phony,
NULL);
g_assert_cmpstr (txn->num, ==, num);
@@ -449,18 +442,14 @@ test_gnc_transaction_set_get_property (Fixture *fixture, gconstpointer pData)
g_assert (txn->common_currency == curr);
g_assert (timespec_equal (&(txn->date_entered), &now));
g_assert (timespec_equal (&(txn->date_posted), &now));
- g_assert_cmpint (check1->hits, ==, 1);
- g_assert_cmpint (check2->hits, ==, 2);
+ g_assert_cmpint (check->hits, ==, 2);
- g_free (check1->msg);
- check1->msg = g_strdup ("g_object_get_valist: object class " _Q "Transaction' has no property named " _Q "bogus'");
g_object_get (G_OBJECT (txn),
"num", &t_num,
"description", &t_desc,
"currency", &t_curr,
"post-date", &t_posted,
"enter-date", &t_entered,
- "bogus", &phony,
NULL);
g_assert_cmpstr (t_num, ==, num);
@@ -468,8 +457,7 @@ test_gnc_transaction_set_get_property (Fixture *fixture, gconstpointer pData)
g_assert (t_curr == curr);
g_assert (timespec_equal (t_entered, &now));
g_assert (timespec_equal (t_posted, &now));
- g_assert_cmpint (check1->hits, ==, 2);
- g_assert_cmpint (check2->hits, ==, 2);
+ g_assert_cmpint (check->hits, ==, 2);
xaccTransRollbackEdit (txn);
test_destroy (txn);
test_destroy (curr);
Summary of changes:
po/CMakeLists.txt | 18 ++++--------------
po/make-gnucash-pot.sh.in | 2 +-
src/engine/test/utest-Transaction.c | 30 +++++++++---------------------
3 files changed, 14 insertions(+), 36 deletions(-)
More information about the gnucash-changes
mailing list