common: Generalize the yaru variants computation

Avoid repeating the same logic in multiple places, but instead
refer to the default configuration, and in case adapt in each
sub-project

Author: 3v1n0

cinnamon-shell/src/meson.build

@@ -3,21 +3,9 @@ cinnamonshell_theme_dir = join_paths(cinnamonshell_default_theme_dir,
 
 message()
 
-variants = [
-  'light',
-  'dark',
-]
-
 DEFAULT_VARIANT = 'light'
 message(meson.project_build_root())
 
-foreach accent: enabled_accent_colors
-  if enabled_accent_colors.contains(accent)
-    variants += (get_option('default') ? [accent] : [])
-    variants += (get_option('dark') ? [ accent + '-dark' ] : [])
-  endif
-endforeach
-
 theme_css = []
 theme_sources = files(
   run_command(
@@ -81,7 +69,11 @@ endforeach
 # theme_gresource_xml = files('data/cinnamon-shell-theme.gresource.xml')[0]
 # icons_gresource_xml = files('data/cinnamon-shell-icons.gresource.xml')[0]
 
-foreach variant: variants
+foreach variant: yaru_flavours
+  if variant == 'default'
+    variant = DEFAULT_VARIANT
+  endif
+
   is_dark = variant == 'dark' or variant.endswith('-dark')
   is_variant = variant != DEFAULT_VARIANT
   variant_base_name = is_dark ? variant.split('-dark')[0] : variant

common/meson.build

@@ -12,3 +12,29 @@ test('sass-utils',
         files('test-sass-utils.scss'),
         '/dev/null',
     ])
+
+yaru_sass_global_paths = ['-I', meson.current_source_dir()]
+
+yaru_flavours = []
+
+available_flavours = [
+  'default',
+  'dark',
+  'mate',
+  'mate-dark',
+]
+
+foreach flavour: available_flavours
+  if not get_option(flavour)
+    message('skip flavour ' + flavour)
+    continue
+  endif
+  yaru_flavours += flavour
+endforeach
+
+foreach accent: enabled_accent_colors
+  if enabled_accent_colors.contains(accent)
+    yaru_flavours += (get_option('default') ? [accent] : [])
+    yaru_flavours += (get_option('dark') ? [ accent + '-dark' ] : [])
+  endif
+endforeach

gnome-shell/src/meson.build

@@ -6,21 +6,23 @@ styles = [
   'gnome-shell-high-contrast',
 ]
 
-variants = [
-  'light',
-  'dark',
-]
-
 DEFAULT_VARIANT = get_option('gnome-shell-default-variant')
 DEFAULT_GDM_VARIANT = get_option('gdm-default-variant')
 DEFAULT_HIGH_CONTRAST_VARIANT = get_option('gnome-shell-default-high-contrast-variant')
 INCLUDE_HIGH_CONTRAST_VARIANTS = false
 
-foreach accent: enabled_accent_colors
-  if enabled_accent_colors.contains(accent)
-    variants += (get_option('default') ? [accent] : [])
-    variants += (get_option('dark') ? [ accent + '-dark' ] : [])
+variants = []
+foreach variant : yaru_flavours
+  if variant == 'default'
+    variants += DEFAULT_VARIANT
+    continue
   endif
+
+  if variant.startswith('mate')
+    continue
+  endif
+
+  variants += variant
 endforeach
 
 if not variants.contains(DEFAULT_VARIANT)

gtk/meson.build

@@ -1,26 +1 @@
-flavours = []
-
-available_flavours = [
-  'default',
-  'dark',
-  'mate',
-  'mate-dark',
-]
-
-foreach flavour: available_flavours
-  if not get_option(flavour)
-    message('skip flavour ' + flavour)
-    continue
-  endif
-  flavours += flavour
-endforeach
-
-foreach accent: enabled_accent_colors
-  if enabled_accent_colors.contains(accent)
-    flavours += (get_option('default') ? [accent] : [])
-    flavours += (get_option('dark') ? [ accent + '-dark' ] : [])
-  endif
-endforeach
-
-
 subdir('src')

gtk/src/meson.build

@@ -9,9 +9,8 @@ gtk_versions = [
 ]
 
 gtk_yaru_colors_defs = {}
-sass_global_paths = ['-I', meson.project_source_root() / 'common']
 
-foreach flavour: flavours
+foreach flavour: yaru_flavours
   message('Configuring flavour ' + flavour)
   suffix = flavour == 'default' ? '' : '-@0@'.format(flavour)
   theme_name = meson.project_name() + suffix
@@ -36,7 +35,7 @@ foreach flavour: flavours
     )
 
     accent_color_code = run_command(sassc,
-      sass_global_paths,
+      yaru_sass_global_paths,
       accent_info_css).stderr().split(' Accent color is ')[1].strip()
     assert(accent_color_code.startswith('#'), 'No accent color code found')
   endif
@@ -117,7 +116,7 @@ foreach flavour: flavours
 
       # Look for scss files in the variant dir first, otherwise fallback to
       # base, default or upstream paths, so using reversed order
-      scss_paths = sass_global_paths
+      scss_paths = yaru_sass_global_paths
       gtk_scss_dependencies = []
       foreach src: sources_priority
         scss_paths += ['-I', meson.current_source_dir() / src ]
@@ -236,4 +235,4 @@ foreach flavour: flavours
   endforeach
 endforeach
 
-meson.add_install_script('post_install.py', get_option('datadir'), meson.project_name(), flavours)
+meson.add_install_script('post_install.py', get_option('datadir'), meson.project_name(), yaru_flavours)

icons/meson.build

@@ -3,17 +3,7 @@ PANEL_ONLY_ICONS_CATEGORIES = [
   'panel',
 ]
 
-icon_flavors = [
-  'default',
-  'dark',
-  'mate',
-  'mate-dark',
-]
-
-foreach accent: enabled_accent_colors
-  icon_flavors += (get_option('default') ? [accent] : [])
-  icon_flavors += (get_option('dark') ? [ accent + '-dark' ] : [])
-endforeach
+icon_flavors = yaru_flavours
 
 fullcolor_path = 'src' / 'fullcolor'
 xvfb_run = find_program('xvfb-run', required: false)

meson.build

@@ -10,6 +10,7 @@ gnome = import('gnome')
 python = find_program('python3')
 sassc = find_program('sassc')
 
+enabled_accent_colors = get_option('accent-colors')
 subdir('common')
 
 components = [
@@ -25,8 +26,6 @@ components = [
   'cinnamon-shell',
 ]
 
-enabled_accent_colors = get_option('accent-colors')
-
 foreach component: components
   if not get_option(component)
     message('skip component ' + component)