From 92863f578f8941afad717b146b8241cdb460c440 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Fri, 30 Oct 2020 14:17:40 -0300 Subject: [PATCH] project: Split GResource files in subdirs --- src/calendar.gresource.xml | 36 ------------------- .../calendar-management.gresource.xml | 10 ++++++ src/gui/calendar-management/meson.build | 6 ++++ src/gui/gui.gresource.xml | 15 ++++++++ src/gui/meson.build | 6 ++++ src/meson.build | 13 +++---- src/theme/meson.build | 5 +++ src/theme/theme.gresource.xml | 6 ++++ src/views/meson.build | 6 ++++ src/views/views.gresource.xml | 11 ++++++ src/weather/meson.build | 6 ++++ src/weather/weather.gresource.xml | 6 ++++ 12 files changed, 84 insertions(+), 42 deletions(-) create mode 100644 src/gui/calendar-management/calendar-management.gresource.xml create mode 100644 src/gui/gui.gresource.xml create mode 100644 src/theme/meson.build create mode 100644 src/theme/theme.gresource.xml create mode 100644 src/views/views.gresource.xml create mode 100644 src/weather/weather.gresource.xml diff --git a/src/calendar.gresource.xml b/src/calendar.gresource.xml index df7cc7e5..e59ea3b2 100644 --- a/src/calendar.gresource.xml +++ b/src/calendar.gresource.xml @@ -1,41 +1,5 @@ - - gui/gcal-alarm-row.ui - gui/gcal-calendar-popover.ui - gui/gcal-date-chooser.ui - gui/gcal-date-selector.ui - gui/gcal-edit-dialog.ui - gui/gcal-event-widget.ui - gui/gcal-quick-add-popover.ui - gui/gcal-multi-choice.ui - gui/gcal-time-selector.ui - gui/gcal-window.ui - - - gui/calendar-management/calendar-row.ui - gui/calendar-management/gcal-calendar-management-dialog.ui - gui/calendar-management/gcal-calendars-page.ui - gui/calendar-management/gcal-edit-calendar-page.ui - gui/calendar-management/gcal-new-calendar-page.ui - - - views/gcal-month-cell.ui - views/gcal-month-popover.ui - views/gcal-month-view.ui - views/gcal-week-header.ui - views/gcal-week-view.ui - views/gcal-year-view.ui - - - weather/gcal-weather-settings.ui - - - - - theme/Adwaita.css - - help-overlay.ui diff --git a/src/gui/calendar-management/calendar-management.gresource.xml b/src/gui/calendar-management/calendar-management.gresource.xml new file mode 100644 index 00000000..d1cb4726 --- /dev/null +++ b/src/gui/calendar-management/calendar-management.gresource.xml @@ -0,0 +1,10 @@ + + + + calendar-row.ui + gcal-calendar-management-dialog.ui + gcal-calendars-page.ui + gcal-edit-calendar-page.ui + gcal-new-calendar-page.ui + + diff --git a/src/gui/calendar-management/meson.build b/src/gui/calendar-management/meson.build index 2b0e057f..d8c51c40 100644 --- a/src/gui/calendar-management/meson.build +++ b/src/gui/calendar-management/meson.build @@ -1,5 +1,11 @@ calendar_incs += include_directories('.') +built_sources += gnome.compile_resources( + 'calendar-management-resources', + 'calendar-management.gresource.xml', + c_name: 'calendar_management', +) + sources += files( 'gcal-calendar-management-dialog.c', 'gcal-calendar-management-page.c', diff --git a/src/gui/gui.gresource.xml b/src/gui/gui.gresource.xml new file mode 100644 index 00000000..0bf4d1c1 --- /dev/null +++ b/src/gui/gui.gresource.xml @@ -0,0 +1,15 @@ + + + + gcal-alarm-row.ui + gcal-calendar-popover.ui + gcal-date-chooser.ui + gcal-date-selector.ui + gcal-edit-dialog.ui + gcal-event-widget.ui + gcal-quick-add-popover.ui + gcal-multi-choice.ui + gcal-time-selector.ui + gcal-window.ui + + diff --git a/src/gui/meson.build b/src/gui/meson.build index 531bf7a4..66157850 100644 --- a/src/gui/meson.build +++ b/src/gui/meson.build @@ -2,6 +2,12 @@ subdir('calendar-management') calendar_incs += include_directories('.') +built_sources += gnome.compile_resources( + 'gui-resources', + 'gui.gresource.xml', + c_name: 'gui', +) + sources += files( 'gcal-alarm-row.c', 'gcal-application.c', diff --git a/src/meson.build b/src/meson.build index 8a23ce2a..1acf2493 100644 --- a/src/meson.build +++ b/src/meson.build @@ -60,12 +60,6 @@ built_sources += configure_file( configuration: debug_conf ) -libgcal_generated_sources_dep = declare_dependency( - sources: built_sources, -) - -gcal_deps += libgcal_generated_sources_dep - ####################### # Include directories # @@ -84,10 +78,17 @@ sources = files() subdir('core') subdir('gui') subdir('search') +subdir('theme') subdir('utils') subdir('views') subdir('weather') +libgcal_generated_sources_dep = declare_dependency( + sources: built_sources, +) + +gcal_deps += libgcal_generated_sources_dep + libgcal = static_library( 'gcal-private', sources: sources, diff --git a/src/theme/meson.build b/src/theme/meson.build new file mode 100644 index 00000000..0b25db40 --- /dev/null +++ b/src/theme/meson.build @@ -0,0 +1,5 @@ +built_sources += gnome.compile_resources( + 'theme-resources', + 'theme.gresource.xml', + c_name: 'theme', +) diff --git a/src/theme/theme.gresource.xml b/src/theme/theme.gresource.xml new file mode 100644 index 00000000..2cbd4881 --- /dev/null +++ b/src/theme/theme.gresource.xml @@ -0,0 +1,6 @@ + + + + Adwaita.css + + diff --git a/src/views/meson.build b/src/views/meson.build index d838de3c..96c5a037 100644 --- a/src/views/meson.build +++ b/src/views/meson.build @@ -1,5 +1,11 @@ calendar_incs += include_directories('.') +built_sources += gnome.compile_resources( + 'views-resources', + 'views.gresource.xml', + c_name: 'views', +) + sources += files( 'gcal-month-cell.c', 'gcal-month-popover.c', diff --git a/src/views/views.gresource.xml b/src/views/views.gresource.xml new file mode 100644 index 00000000..4e6eddba --- /dev/null +++ b/src/views/views.gresource.xml @@ -0,0 +1,11 @@ + + + + gcal-month-cell.ui + gcal-month-popover.ui + gcal-month-view.ui + gcal-week-header.ui + gcal-week-view.ui + gcal-year-view.ui + + diff --git a/src/weather/meson.build b/src/weather/meson.build index 44557dfd..9ce1985b 100644 --- a/src/weather/meson.build +++ b/src/weather/meson.build @@ -1,5 +1,11 @@ calendar_incs += include_directories('.') +built_sources += gnome.compile_resources( + 'weather-resources', + 'weather.gresource.xml', + c_name: 'weather', +) + sources += files( 'gcal-weather-info.c', 'gcal-weather-service.c', diff --git a/src/weather/weather.gresource.xml b/src/weather/weather.gresource.xml new file mode 100644 index 00000000..7c5ec595 --- /dev/null +++ b/src/weather/weather.gresource.xml @@ -0,0 +1,6 @@ + + + + gcal-weather-settings.ui + +