mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2025-01-11 13:10:07 +00:00
build: Remove sassc option
Instead, ensure that sassc is made madatory on git builds (because it is, we don't ship CSS files anymore) and not even looked for in release builds (because do ship CSS files there).
This commit is contained in:
parent
4d5dc18a57
commit
af0c95c11a
@ -839,23 +839,25 @@ gtk_gresources_xml = configure_file(output: 'gtk.gresources.xml',
|
||||
],
|
||||
)
|
||||
|
||||
# Build the theme files
|
||||
sassc = find_program('sassc', required: false)
|
||||
if not sassc.found() and not get_option('sassc').disabled()
|
||||
subproject('sassc')
|
||||
sassc = find_program('sassc', required: get_option('sassc').enabled())
|
||||
endif
|
||||
theme_deps = []
|
||||
# For git checkouts, but not for tarballs...
|
||||
if not fs.exists('theme/Adwaita/Adwaita.css')
|
||||
# ... build the theme files
|
||||
sassc = find_program('sassc', required: false)
|
||||
if not sassc.found()
|
||||
subproject('sassc')
|
||||
sassc = find_program('sassc', required: true)
|
||||
endif
|
||||
|
||||
if sassc.found()
|
||||
sassc_opts = [ '-a', '-M', '-t', 'compact' ]
|
||||
if sassc.found()
|
||||
sassc_opts = [ '-a', '-M', '-t', 'compact' ]
|
||||
|
||||
subdir('theme/Default')
|
||||
subdir('theme/Default')
|
||||
|
||||
theme_deps = [
|
||||
default_theme_deps,
|
||||
]
|
||||
else
|
||||
theme_deps = []
|
||||
theme_deps += [
|
||||
default_theme_deps,
|
||||
]
|
||||
endif
|
||||
endif
|
||||
|
||||
gtkresources = gnome.compile_resources('gtkresources',
|
||||
|
@ -24,6 +24,7 @@ cloudproviders_req = '>= 0.3.1'
|
||||
xkbcommon_req = '>= 0.2.0'
|
||||
sysprof_req = '>= 3.38.0'
|
||||
|
||||
fs = import('fs')
|
||||
gnome = import('gnome')
|
||||
pkg_config = import('pkgconfig')
|
||||
|
||||
|
@ -78,11 +78,6 @@ option('colord',
|
||||
value: 'disabled',
|
||||
description : 'Build colord support for the CUPS printing backend')
|
||||
|
||||
option('sassc',
|
||||
type: 'feature',
|
||||
value: 'auto',
|
||||
description: 'Rebuild themes using sassc')
|
||||
|
||||
option('f16c',
|
||||
type: 'feature',
|
||||
value: 'enabled',
|
||||
|
Loading…
Reference in New Issue
Block a user