project: Split GResource files in subdirs

2020-10-30 14:17:40 -03:00
parent 87ce5e6d49
commit 92863f578f
12 changed files with 84 additions and 42 deletions
@@ -1,41 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/org/gnome/calendar/ui">
-    <file compressed="true">gui/gcal-alarm-row.ui</file>
-    <file compressed="true">gui/gcal-calendar-popover.ui</file>
-    <file compressed="true">gui/gcal-date-chooser.ui</file>
-    <file compressed="true">gui/gcal-date-selector.ui</file>
-    <file compressed="true">gui/gcal-edit-dialog.ui</file>
-    <file compressed="true">gui/gcal-event-widget.ui</file>
-    <file compressed="true">gui/gcal-quick-add-popover.ui</file>
-    <file compressed="true">gui/gcal-multi-choice.ui</file>
-    <file compressed="true">gui/gcal-time-selector.ui</file>
-    <file compressed="true">gui/gcal-window.ui</file>
-
-    <!-- Calendar Management dialog -->
-    <file compressed="true">gui/calendar-management/calendar-row.ui</file>
-    <file compressed="true">gui/calendar-management/gcal-calendar-management-dialog.ui</file>
-    <file compressed="true">gui/calendar-management/gcal-calendars-page.ui</file>
-    <file compressed="true">gui/calendar-management/gcal-edit-calendar-page.ui</file>
-    <file compressed="true">gui/calendar-management/gcal-new-calendar-page.ui</file>
-
-    <!-- Views -->
-    <file compressed="true">views/gcal-month-cell.ui</file>
-    <file compressed="true">views/gcal-month-popover.ui</file>
-    <file compressed="true">views/gcal-month-view.ui</file>
-    <file compressed="true">views/gcal-week-header.ui</file>
-    <file compressed="true">views/gcal-week-view.ui</file>
-    <file compressed="true">views/gcal-year-view.ui</file>
-
-    <!-- Weather -->
-    <file compressed="true">weather/gcal-weather-settings.ui</file>
-  </gresource>
-
-  <!-- Theme -->
-  <gresource prefix="/org/gnome/calendar">
-    <file>theme/Adwaita.css</file>
-  </gresource>
-
  <!-- GTK -->
  <gresource prefix="/org/gnome/calendar/gtk">
    <file compressed="true">help-overlay.ui</file>
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/calendar/ui/gui/calendar-management">
+    <file compressed="true">calendar-row.ui</file>
+    <file compressed="true">gcal-calendar-management-dialog.ui</file>
+    <file compressed="true">gcal-calendars-page.ui</file>
+    <file compressed="true">gcal-edit-calendar-page.ui</file>
+    <file compressed="true">gcal-new-calendar-page.ui</file>
+  </gresource>
+</gresources>
@@ -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',
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/calendar/ui/gui">
+    <file compressed="true">gcal-alarm-row.ui</file>
+    <file compressed="true">gcal-calendar-popover.ui</file>
+    <file compressed="true">gcal-date-chooser.ui</file>
+    <file compressed="true">gcal-date-selector.ui</file>
+    <file compressed="true">gcal-edit-dialog.ui</file>
+    <file compressed="true">gcal-event-widget.ui</file>
+    <file compressed="true">gcal-quick-add-popover.ui</file>
+    <file compressed="true">gcal-multi-choice.ui</file>
+    <file compressed="true">gcal-time-selector.ui</file>
+    <file compressed="true">gcal-window.ui</file>
+  </gresource>
+</gresources>
@@ -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',
@@ -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,
@@ -0,0 +1,5 @@
+built_sources += gnome.compile_resources(
+  'theme-resources',
+  'theme.gresource.xml',
+  c_name: 'theme',
+)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/calendar/theme">
+    <file>Adwaita.css</file>
+  </gresource>
+</gresources>
@@ -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',
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/calendar/ui/views">
+    <file compressed="true">gcal-month-cell.ui</file>
+    <file compressed="true">gcal-month-popover.ui</file>
+    <file compressed="true">gcal-month-view.ui</file>
+    <file compressed="true">gcal-week-header.ui</file>
+    <file compressed="true">gcal-week-view.ui</file>
+    <file compressed="true">gcal-year-view.ui</file>
+  </gresource>
+</gresources>
@@ -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',
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/calendar/ui/weather">
+    <file compressed="true">gcal-weather-settings.ui</file>
+  </gresource>
+</gresources>