gnucash unstable: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Mon Jan 29 13:47:04 EST 2018
Updated via https://github.com/Gnucash/gnucash/commit/6e5ac260 (commit)
via https://github.com/Gnucash/gnucash/commit/c7415102 (commit)
via https://github.com/Gnucash/gnucash/commit/4aa10620 (commit)
via https://github.com/Gnucash/gnucash/commit/f319a8e2 (commit)
via https://github.com/Gnucash/gnucash/commit/49a936c1 (commit)
via https://github.com/Gnucash/gnucash/commit/36cb167b (commit)
via https://github.com/Gnucash/gnucash/commit/ec213360 (commit)
via https://github.com/Gnucash/gnucash/commit/9d8def84 (commit)
via https://github.com/Gnucash/gnucash/commit/4317d8a8 (commit)
via https://github.com/Gnucash/gnucash/commit/3dff4e52 (commit)
via https://github.com/Gnucash/gnucash/commit/1258a2ad (commit)
via https://github.com/Gnucash/gnucash/commit/b12a6cf4 (commit)
from https://github.com/Gnucash/gnucash/commit/86226723 (commit)
commit 6e5ac2608b51a8e6fd53da6e7366dd7424db0cfa
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Jan 27 14:12:27 2018 +0100
More translation fixes detected by Mechtilde and reported on IRC
commit c7415102fd530ac72fe946c5accad5d7df957f88
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Jan 27 13:47:56 2018 +0100
Fix a few more translation issues discovered during code review
commit 4aa1062045fdb9c8eaedc69bccad6480a25f8217
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Jan 27 12:11:36 2018 +0100
Bug 792947 - Missing translatable strings
In addition
- the icon was restored on the new account button while importing
- an unused button was removed from the Tip of the day window
- a couple of whitespace issues were fixed
bug fixup
commit f319a8e2a4a735114860bed02a26fa504e7c5d62
Author: Geert Janssens <geert at kobaltwit.be>
Date: Mon Jan 29 19:15:02 2018 +0100
Re-enable building a dist tarball from within distcheck
commit 49a936c1fd11bc06aa0ec78e5627d800c1fa7116
Author: Geert Janssens <geert at kobaltwit.be>
Date: Mon Jan 29 18:54:13 2018 +0100
Rewrite gnc_add_swig_guile_command to work in dist tarball as well
When building from git it will add targets to generate the swig files.
When building from tarball it will just point at the generated source
files from the tarball.
commit 36cb167b682bfee82027ffd3f2ef7463a113e137
Author: Geert Janssens <geert at kobaltwit.be>
Date: Mon Jan 29 18:04:08 2018 +0100
Rewrite gnc_add_swig_python_command to work in dist tarball as well
When building from git it will add targets to generate the swig files.
When building from tarball it will just point at the generated source
files from the tarball.
commit ec213360f33a0d53e9ccd06630e78d780c6f28d2
Author: Geert Janssens <geert at kobaltwit.be>
Date: Mon Jan 29 17:29:40 2018 +0100
Review which built files are really needed in the dist tarball
Several were only there because they used to be generated via autogen.sh
and hence had to be included because autogen.sh was not supposed to be run
in a tarball based build.
A few others aren't clear so I have left them in for now:
- gnucash.1 (man page)
- gnucash-design.info (because it's unclear what we want to do with that one)
These files should clearly be in the tarball:
- gnucash.pot -> for our translators
- ChangeLog -> can't be generated outside of a git repo
- gnc-vcs-info.h -> can't be generated outside of a git repo
- guile/python bindings -> to avoid a swig dependency when building from tarball
commit 9d8def84f33b3b03ac70015e6cf83336bde2a61e
Author: Geert Janssens <geert at kobaltwit.be>
Date: Mon Jan 29 13:46:46 2018 +0100
Fix version number inclusion in gnucash.desktop file
commit 4317d8a8f6f808a1ca1ff0389854dcd000561354
Author: Geert Janssens <geert at kobaltwit.be>
Date: Mon Jan 29 12:19:47 2018 +0100
Improve handling of generated distributable files
- the two dist_add_... macros now both take a list of file names
as argument so more files can be added at once to the dist tarball.
- dist_add_generated now creates the right target by itself. There's
no need to pass one any more
- make the swig generated *.py module files explicit output files
- change a couple of custom_targets into custom_commands. The only
reason they were defined as targets was to ensure they got built
before the dist tarball. This is now properly handled by the
dist_add_... macros.
- correctly handle dependency on swig-runtime.h (using OBJECT_DEPENDS
was not the way to do it according to that property's help page)
commit 3dff4e521126f6600da2ca3090b8f3e9c15b950b
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sun Jan 28 17:45:49 2018 +0100
Fix make dist on a clean checkout
cmake with unix makefiles fails to resolve dist dependencies
added from COPY_FROM_BUILD if these dependencies aren't built yet.
This commit replaces the COPY_FROM_BUILD based logic with two new functions
'dist_add_configured' and 'dist_add_generated' to indicate which files should
be included in the dist tarball. The latter also adds a target level dependency
to the dist tarball custom command. Hence the former should
be used for files that get generated during a cmake run while the latter
should be used for files generated as the result of a 'make/ninja-build' run
(like files for which an add_custom_command rule exists).
Note: this commit also temporarily disables the dist target when building
from a tarball (and hence it won't be tested in distcheck either). This
will be handled in a future commit.
commit 1258a2adfd06773ab60db2d156fd906c9828316a
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Jan 27 19:00:30 2018 +0100
Make potfile generation a custom target, and make the dist target depend on it
commit b12a6cf4d2ad7d8a7f523f140bbcb66a62c46af7
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Jan 27 17:04:41 2018 +0100
Revert "Partially revert commit 85bfbd8e8258e"
This reverts commit b6aae753172eae1c4a8e01477512f944d8d4f9d1.
I was mistaken. We still need po/make-gnucash-pot.sh.in, not
make-gnucash-potfiles.in...
Summary of changes:
CMakeLists.txt | 42 +++----
bindings/python/CMakeLists.txt | 24 ++--
common/CMakeLists.txt | 19 ++-
common/cmake_modules/GncAddSwigCommand.cmake | 120 ++++++++++++++-----
common/cmake_modules/MakeDist.cmake | 12 +-
common/cmake_modules/MakeDistCheck.cmake | 1 -
common/cmake_modules/MakeDistFiles.cmake | 95 +++++++--------
common/test-core/CMakeLists.txt | 22 ++--
doc/CMakeLists.txt | 1 +
gnucash/CMakeLists.txt | 6 +-
gnucash/gnome-utils/CMakeLists.txt | 13 +-
gnucash/gnome-utils/gtkbuilder/dialog-totd.glade | 17 +--
gnucash/gnome/CMakeLists.txt | 20 ++--
gnucash/gnome/gnucash.desktop.in.in | 2 +-
gnucash/html/CMakeLists.txt | 11 +-
.../csv-imp/assistant-csv-account-import.glade | 5 +-
.../csv-imp/assistant-csv-price-import.cpp | 37 ++++--
.../csv-imp/assistant-csv-price-import.glade | 8 +-
.../csv-imp/assistant-csv-trans-import.cpp | 4 +-
.../csv-imp/assistant-csv-trans-import.glade | 5 +-
gnucash/import-export/dialog-import.glade | 133 +++++++++++----------
gnucash/import-export/import-account-matcher.c | 1 +
.../qif-imp/dialog-account-picker.glade | 2 +-
gnucash/report/report-gnome/CMakeLists.txt | 11 +-
gnucash/report/report-system/CMakeLists.txt | 14 +--
.../report/standard-reports/account-piecharts.scm | 6 +-
.../standard-reports/income-gst-statement.scm | 22 ++--
libgnucash/app-utils/CMakeLists.txt | 22 ++--
libgnucash/core-utils/CMakeLists.txt | 40 +++----
libgnucash/doc/design/CMakeLists.txt | 8 +-
libgnucash/engine/CMakeLists.txt | 18 ++-
libgnucash/gnc-module/CMakeLists.txt | 12 +-
libgnucash/gnc-module/test/mod-bar/CMakeLists.txt | 10 +-
libgnucash/gnc-module/test/mod-baz/CMakeLists.txt | 10 +-
libgnucash/gnc-module/test/mod-foo/CMakeLists.txt | 10 +-
libgnucash/scm/CMakeLists.txt | 3 +-
make-gnucash-potfiles.in | 83 -------------
po/CMakeLists.txt | 40 +++----
po/gnucash-pot.cmake | 20 ++++
39 files changed, 458 insertions(+), 471 deletions(-)
delete mode 100644 make-gnucash-potfiles.in
create mode 100644 po/gnucash-pot.cmake
More information about the gnucash-patches
mailing list