[gnome-music/AboutDialog: 4/5] Generate AboutDialog.ui in data/ui/
- From: Jean Felder <jfelder src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-music/AboutDialog: 4/5] Generate AboutDialog.ui in data/ui/
- Date: Wed, 12 Sep 2018 11:55:13 +0000 (UTC)
commit 6ec2e59dc63f717f2ee8f72780e8012aff85ecae
Author: Islam Bahnasy <ifbahnasy gmail com>
Date: Mon Sep 3 15:15:01 2018 +0200
Generate AboutDialog.ui in data/ui/
data/meson.build | 25 +------------------------
data/ui/meson.build | 25 +++++++++++++++++++++++++
meson.build | 1 +
3 files changed, 27 insertions(+), 24 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index cf87d12b..16030bbe 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,22 +1,3 @@
-# Compiling the resources
-VCS_TAG = ''
-if get_option('profile') != 'default'
- git = find_program('git', required : false)
- if git.found()
- VCS_TAG = run_command('git', 'rev-parse', '--short', 'HEAD').stdout().strip()
- endif
- if VCS_TAG == ''
- VCS_TAG = '-devel'
- else
- VCS_TAG = '-@0@'.format(VCS_TAG)
- endif
-endif
-about_dialog_conf = configuration_data()
-about_dialog_conf.set('PACKAGE_VERSION', '@0@@1@'.format(meson.project_version(), VCS_TAG))
-about_dialog_conf.set('PACKAGE_URL', PACKAGE_URL)
-about_dialog_conf.set('PROGRAM_NAME', 'Music' + NAME_SUFFIX)
-about_dialog_conf.set('APPID', APPLICATION_ID)
-
gnome.compile_resources(
PROJECT_RDNN_NAME,
PROJECT_RDNN_NAME + '.gresource.xml',
@@ -24,11 +5,7 @@ gnome.compile_resources(
source_dir: '.',
install_dir: PKGDATA_DIR,
install: true,
- dependencies: configure_file(
- input: 'ui/AboutDialog.ui.in',
- output: 'AboutDialog.ui',
- configuration: about_dialog_conf
- )
+ dependencies: about_dialog
)
# Installing the schema file
diff --git a/data/ui/meson.build b/data/ui/meson.build
new file mode 100644
index 00000000..80b099bb
--- /dev/null
+++ b/data/ui/meson.build
@@ -0,0 +1,25 @@
+# Compiling the resources
+VCS_TAG = ''
+if get_option('profile') != 'default'
+ git = find_program('git', required : false)
+ if git.found()
+ VCS_TAG = run_command('git', 'rev-parse', '--short', 'HEAD').stdout().strip()
+ endif
+ if VCS_TAG == ''
+ VCS_TAG = '-devel'
+ else
+ VCS_TAG = '-@0@'.format(VCS_TAG)
+ endif
+endif
+
+about_dialog_conf = configuration_data()
+about_dialog_conf.set('PACKAGE_VERSION', '@0@@1@'.format(meson.project_version(), VCS_TAG))
+about_dialog_conf.set('PACKAGE_URL', PACKAGE_URL)
+about_dialog_conf.set('PROGRAM_NAME', 'Music' + NAME_SUFFIX)
+about_dialog_conf.set('APPID', APPLICATION_ID)
+
+about_dialog = configure_file(
+ configuration: about_dialog_conf,
+ input: 'AboutDialog.ui.in',
+ output: 'AboutDialog.ui'
+)
\ No newline at end of file
diff --git a/meson.build b/meson.build
index a516358d..9f6f28af 100644
--- a/meson.build
+++ b/meson.build
@@ -54,6 +54,7 @@ subproject('libgd',
'pkglibdir=' + PKGLIB_DIR
])
+subdir('data/ui')
subdir('data')
subdir('help')
subdir('po')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]