gnucash master: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Sun Jan 1 09:28:54 EST 2023
Updated via https://github.com/Gnucash/gnucash/commit/a5431436 (commit)
via https://github.com/Gnucash/gnucash/commit/bdde1711 (commit)
via https://github.com/Gnucash/gnucash/commit/510b5784 (commit)
via https://github.com/Gnucash/gnucash/commit/57294d7e (commit)
from https://github.com/Gnucash/gnucash/commit/31d79e30 (commit)
commit a543143689992fe0aec37933eef9b419f83755b3
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Dec 31 16:31:05 2022 +0100
Generate the gresource xml file based on a list of resources
This inverts the logic from
- having an xml file and extracting dependencies
from it to
- having a list of dependencies and generating
an xml file from it
In the original configuration adding or removing a
resource to/from the gresources.xml file would not
be detected by cmake as a change in dependencies.
The user would have to remember to rerun cmake manually.
By explicitly listing the dependencies, cmake will
properly recongifure and regenerate if that list is
updated. The remainder of the dependency configuration
also ensures proper rebuilds of gnucash, libaqbanking
and libofx if any of the resource files change, a new
one is added or an existing one is removed.
For reusability the code to generate the gresource related
files as been extracted into a separate function.
commit bdde17115dcc35418ec417b3b463d0adb619f14d
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Dec 31 14:49:19 2022 +0100
Use relative paths to ui files
commit 510b57843b77439fa90666d527f5b94ded3436eb
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Dec 31 13:17:22 2022 +0100
Some whitespace fixes
Kept separate to not clutter the actual changes
commit 57294d7e1681ef67676d9eff6dfda7d1d2311a27
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Dec 31 13:13:36 2022 +0100
Keep ui files for optional modules within the module
This goes for ofx and aqbanking. If either
module is not part of the build, the ui files
should not be part of the resource of gnucash.
It turns out each compilation unit can have
its proper resource though, so the build system
was changed to include the ui files in a local resource
for the aqbanking and ofx modules instead of to
the gnucash global resource.
Summary of changes:
CMakeLists.txt | 1 +
common/cmake_modules/CMakeLists.txt | 17 ++--
common/cmake_modules/GncGenerateGResources.cmake | 62 ++++++++++++++
gnucash/CMakeLists.txt | 96 +++++++++++-----------
gnucash/gnucash-gresources.xml | 37 ---------
gnucash/import-export/aqb/CMakeLists.txt | 14 +++-
.../aqb}/ui/gnc-plugin-aqbanking.ui | 0
gnucash/import-export/ofx/CMakeLists.txt | 19 +++--
.../{ => import-export/ofx}/ui/gnc-plugin-ofx.ui | 0
po/POTFILES.in | 4 +-
10 files changed, 147 insertions(+), 103 deletions(-)
create mode 100644 common/cmake_modules/GncGenerateGResources.cmake
delete mode 100644 gnucash/gnucash-gresources.xml
rename gnucash/{ => import-export/aqb}/ui/gnc-plugin-aqbanking.ui (100%)
rename gnucash/{ => import-export/ofx}/ui/gnc-plugin-ofx.ui (100%)
More information about the gnucash-patches
mailing list