[baobab] Reorganize source files



commit 2bdc80b75489d463d0c1e57e2a578afeeb0875d1
Author: Stefano Facchini <stefano facchini gmail com>
Date:   Fri Jun 12 16:11:21 2020 +0200

    Reorganize source files

 {src => data}/baobab.css                                |  0
 data/baobab.gresource.xml                               | 13 +++++++++++++
 {src => data/gtk}/help-overlay.ui                       |  0
 {src => data/gtk}/menus.ui                              |  0
 .../actions => data/icons}/view-ringschart-symbolic.svg |  0
 .../actions => data/icons}/view-treemap-symbolic.svg    |  0
 data/meson.build                                        |  3 +++
 {src => data/ui}/baobab-location-list.ui                |  0
 {src => data/ui}/baobab-location-row.ui                 |  0
 {src => data/ui}/baobab-main-window.ui                  |  0
 meson.build                                             |  2 --
 src/baobab.gresource.xml                                | 17 -----------------
 src/meson.build                                         |  3 ---
 13 files changed, 16 insertions(+), 22 deletions(-)
---
diff --git a/src/baobab.css b/data/baobab.css
similarity index 100%
rename from src/baobab.css
rename to data/baobab.css
diff --git a/data/baobab.gresource.xml b/data/baobab.gresource.xml
new file mode 100644
index 0000000..cfdfd63
--- /dev/null
+++ b/data/baobab.gresource.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/baobab">
+    <file compressed="true">baobab.css</file>
+    <file compressed="true">ui/baobab-location-list.ui</file>
+    <file compressed="true">ui/baobab-location-row.ui</file>
+    <file compressed="true">ui/baobab-main-window.ui</file>
+    <file compressed="true">gtk/help-overlay.ui</file>
+    <file compressed="true">gtk/menus.ui</file>
+    <file compressed="true">icons/view-ringschart-symbolic.svg</file>
+    <file compressed="true">icons/view-treemap-symbolic.svg</file>
+  </gresource>
+</gresources>
diff --git a/src/help-overlay.ui b/data/gtk/help-overlay.ui
similarity index 100%
rename from src/help-overlay.ui
rename to data/gtk/help-overlay.ui
diff --git a/src/menus.ui b/data/gtk/menus.ui
similarity index 100%
rename from src/menus.ui
rename to data/gtk/menus.ui
diff --git a/src/icons/scalable/actions/view-ringschart-symbolic.svg b/data/icons/view-ringschart-symbolic.svg
similarity index 100%
rename from src/icons/scalable/actions/view-ringschart-symbolic.svg
rename to data/icons/view-ringschart-symbolic.svg
diff --git a/src/icons/scalable/actions/view-treemap-symbolic.svg b/data/icons/view-treemap-symbolic.svg
similarity index 100%
rename from src/icons/scalable/actions/view-treemap-symbolic.svg
rename to data/icons/view-treemap-symbolic.svg
diff --git a/data/meson.build b/data/meson.build
index 43bcda1..8642acf 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -3,6 +3,9 @@ foreach size: ['scalable', 'symbolic']
   install_subdir('icons/hicolor/' + size, install_dir: icondir)
 endforeach
 
+resource_files = files('baobab.gresource.xml')
+resources = gnome.compile_resources('org.gnome.baobab', resource_files, c_name: 'resources')
+
 install_man ('baobab.1')
 
 desktop_file = i18n.merge_file(
diff --git a/src/baobab-location-list.ui b/data/ui/baobab-location-list.ui
similarity index 100%
rename from src/baobab-location-list.ui
rename to data/ui/baobab-location-list.ui
diff --git a/src/baobab-location-row.ui b/data/ui/baobab-location-row.ui
similarity index 100%
rename from src/baobab-location-row.ui
rename to data/ui/baobab-location-row.ui
diff --git a/src/baobab-main-window.ui b/data/ui/baobab-main-window.ui
similarity index 100%
rename from src/baobab-main-window.ui
rename to data/ui/baobab-main-window.ui
diff --git a/meson.build b/meson.build
index b8e955e..3a58180 100644
--- a/meson.build
+++ b/meson.build
@@ -19,8 +19,6 @@ cc = meson.get_compiler('c')
 math = cc.find_library('m', required: false)
 
 conf = configuration_data()
-conf.set_quoted('PACKAGE_NAME', meson.project_name())
-conf.set_quoted('PACKAGE_VERSION', meson.project_version())
 conf.set_quoted('VERSION', meson.project_version())
 conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
 conf.set_quoted('GNOMELOCALEDIR', join_paths(get_option('prefix'), get_option('localedir')))
diff --git a/src/meson.build b/src/meson.build
index bd7977d..6cc9bc1 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,6 +1,3 @@
-resource_files = files('baobab.gresource.xml')
-resources = gnome.compile_resources('org.gnome.baobab', resource_files, c_name: 'resources')
-
 vapi_sources = [
   'config.vapi',
 ]


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]