Move sass compilation to its own custom target so it shows up in the …

…build log. Support both pysassc and sassc. (#12588)
linuxmint · Jan 16, 2025 · 5ea1203 · 5ea1203
1 parent 52d6af3
commit 5ea1203
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/data/meson.build b/data/meson.build
@@ -11,8 +11,7 @@ install_subdir(
     'theme',
     exclude_files: [
         'theme-changelog.txt',
-        'meson.build',
-        'parse-sass.sh'
+        'meson.build'
     ],
     exclude_directories: ['cinnamon-sass'],
     install_dir: pkgdatadir,

diff --git a/data/theme/cinnamon-sass/meson.build b/data/theme/cinnamon-sass/meson.build
@@ -0,0 +1,11 @@
+sassc = find_program('pysassc', 'sassc')
+
+custom_target(
+  'cinnamon_css',
+  input: 'cinnamon.scss',
+  output: 'cinnamon.css',
+  command: [sassc, '@INPUT@', '@OUTPUT@'],
+  build_always_stale: true,
+  install: true,
+  install_dir: join_paths(pkgdatadir, 'theme')
+)
diff --git a/data/theme/meson.build b/data/theme/meson.build
@@ -1,3 +1 @@
-sassc = find_program('pysassc')
-
-run_command('parse-sass.sh', check: true)
+subdir('cinnamon-sass')
diff --git a/data/theme/parse-sass.sh b/data/theme/parse-sass.sh