[gnome-music/wip/mschraal/meson: 14/17] meson: Don't use RDNN for project name



commit cedd128af8fe2aff43ece617cdc4b0534d6e1936
Author: Marinus Schraal <mschraal gnome org>
Date:   Thu Feb 22 10:07:10 2018 +0100

    meson: Don't use RDNN for project name
    
    I don't think infra and packagers might be ready or if it even is
    wanted.

 data/meson.build | 22 +++++++++++-----------
 help/meson.build |  2 +-
 meson.build      |  5 +++--
 po/meson.build   |  2 +-
 4 files changed, 16 insertions(+), 15 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index bb96d45..a74290a 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -4,8 +4,8 @@ about_dialog_conf.set('PACKAGE_VERSION', meson.project_version())
 about_dialog_conf.set('PACKAGE_URL', PACKAGE_URL)
 
 gnome.compile_resources(
-  meson.project_name(),
-  meson.project_name() + '.gresource.xml',
+  PROJECT_RDNN_NAME,
+  PROJECT_RDNN_NAME + '.gresource.xml',
   gresource_bundle: true,
   source_dir: '.',
   install_dir: PKGDATA_DIR,
@@ -19,14 +19,14 @@ gnome.compile_resources(
 
 # Installing the schema file 
 install_data(
-  meson.project_name() + '.gschema.xml',
+  PROJECT_RDNN_NAME + '.gschema.xml',
   install_dir: 'share/glib-2.0/schemas'
 )
 
 # Merging the translations with the desktop file
 i18n.merge_file(
-  output: meson.project_name() + '.desktop',
-  input: meson.project_name() + '.desktop.in',
+  output: PROJECT_RDNN_NAME + '.desktop',
+  input: PROJECT_RDNN_NAME + '.desktop.in',
   po_dir: join_paths(meson.source_root(), 'po'),
   type: 'desktop',
   install: true,
@@ -39,14 +39,14 @@ if desktop_file_validate.found()
   test (
     'Validate desktop file',
     desktop_file_validate,
-    args: join_paths(meson.current_build_dir (), meson.project_name() + '.desktop')
+    args: join_paths(meson.current_build_dir (), PROJECT_RDNN_NAME + '.desktop')
   )
 endif
 
 # Merging the translations with the appdata file
 i18n.merge_file(
-  output: meson.project_name() + '.appdata.xml',
-  input: meson.project_name() + '.appdata.xml.in',
+  output: PROJECT_RDNN_NAME + '.appdata.xml',
+  input: PROJECT_RDNN_NAME + '.appdata.xml.in',
   po_dir: join_paths(meson.source_root(), 'po'),
   install: true,
   install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'metainfo')
@@ -58,7 +58,7 @@ if appstreamcli.found()
   test (
     'Validate appdata file',
     appstreamcli,
-    args: ['validate', join_paths(meson.current_build_dir (), meson.project_name() + '.appdata.xml')]
+    args: ['validate', join_paths(meson.current_build_dir (), PROJECT_RDNN_NAME + '.appdata.xml')]
   )
 endif
 
@@ -67,13 +67,13 @@ icon_sizes = ['16', '22', '32', '48', '256']
 
 foreach i : icon_sizes
   install_data(
-    join_paths('icons/hicolor', i + 'x' + i, 'apps', meson.project_name() + '.png'),
+    join_paths('icons/hicolor', i + 'x' + i, 'apps', PROJECT_RDNN_NAME + '.png'),
     install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'icons', 'hicolor', i + 'x' + i, 
'apps')
   )
 endforeach
 
 # Installing the symbolic icon
 install_data(
-    join_paths('icons/hicolor/symbolic/apps', meson.project_name() + '-symbolic.svg'),
+    join_paths('icons/hicolor/symbolic/apps', PROJECT_RDNN_NAME + '-symbolic.svg'),
     install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'icons/hicolor/symbolic/apps')
 )
\ No newline at end of file
diff --git a/help/meson.build b/help/meson.build
index 4fc6ace..24c25b6 100644
--- a/help/meson.build
+++ b/help/meson.build
@@ -1,4 +1,4 @@
-gnome.yelp(meson.project_name(),
+gnome.yelp(PROJECT_RDNN_NAME,
   sources: [
     'introduction.page',
     'index.page',
diff --git a/meson.build b/meson.build
index b955670..dd707d9 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('org.gnome.Music',
+project('gnome-music',
     version: '3.27.90'
 )
 
@@ -15,9 +15,10 @@ endif
 # Constants
 PACKAGE_URL = 'https://wiki.gnome.org/Apps/Music'
 PACKAGE_URL_BUG = 'https://gitlab.gnome.org/GNOME/gnome-music'
+PROJECT_RDNN_NAME='org.gnome.Music'
 
 PYTHON_DIR = join_paths(get_option('prefix'), python.sysconfig_path('purelib'))
-PKGDATA_DIR = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name())
+PKGDATA_DIR = join_paths(get_option('prefix'), get_option('datadir'), PROJECT_RDNN_NAME)
 PKGLIB_DIR = join_paths(PKGDATA_DIR, 'libs')
 # Dependencies 
 dependency('gobject-introspection-1.0', version: '>= 1.35.0')
diff --git a/po/meson.build b/po/meson.build
index 9116ed7..0fe4c17 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -1 +1 @@
-i18n.gettext(meson.project_name(), preset:'glib')
\ No newline at end of file
+i18n.gettext(PROJECT_RDNN_NAME, preset:'glib')
\ No newline at end of file


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