[gnome-shell-extensions/wip/fmuellner/fix-classic-session: 3/3] build: Include UUID suffix in classic mode description



commit eba3cfccfe60cae72a6f0011962a167a12b6ffe3
Author: Florian Müllner <fmuellner gnome org>
Date:   Wed Jan 17 17:57:39 2018 +0100

    build: Include UUID suffix in classic mode description
    
    The shortnames we use elsewhere don't match the actual UUID, so we
    effectively don't enable any extensions in classic mode at the moment.
    
    https://gitlab.gnome.org/GNOME/gnome-shell-extensions/issues/45

 data/meson.build       | 7 ++++++-
 extensions/meson.build | 2 +-
 meson.build            | 2 ++
 3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 1e45638..c1fbece 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -13,8 +13,13 @@ foreach s : sessions
   )
 endforeach
 
+classic_uuids = []
+foreach e : classic_extensions
+    classic_uuids += e + uuid_suffix
+endforeach
+
 mode_conf = configuration_data()
-mode_conf.set('CLASSIC_EXTENSIONS', '"' + '", "'.join(classic_extensions) + '"')
+mode_conf.set('CLASSIC_EXTENSIONS', '"' + '", "'.join(classic_uuids) + '"')
 
 mode_file = 'classic.json'
 configure_file(
diff --git a/extensions/meson.build b/extensions/meson.build
index eba5053..ed19675 100644
--- a/extensions/meson.build
+++ b/extensions/meson.build
@@ -4,7 +4,7 @@ js_sources = extensionlib
 metadata_name = 'metadata.json'
 
 foreach e : all_extensions
-  uuid = e + '@gnome-shell-extensions.gcampax.github.com'
+  uuid = e + uuid_suffix
 
   metadata_conf = configuration_data()
   metadata_conf.set('extension_id', e)
diff --git a/meson.build b/meson.build
index c7e0418..23a0cfc 100644
--- a/meson.build
+++ b/meson.build
@@ -32,6 +32,8 @@ else
   shell_version = '.'.join(ver_arr)
 endif
 
+uuid_suffix = '@gnome-shell-extensions.gcampax.github.com'
+
 classic_extensions = [
   'alternate-tab',
   'apps-menu',


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