@ -385,16 +385,12 @@ class CoreData:
self . meson_command = meson_command self . meson_command = meson_command
self . target_guids = { } self . target_guids = { }
self . version = version self . version = version
self . builtins : ' KeyedOptionDictType ' = { } self . options : ' KeyedOptionDictType ' = { }
self . backend_options : ' KeyedOptionDictType ' = { }
self . user_options : ' KeyedOptionDictType ' = { }
self . compiler_options : ' KeyedOptionDictType ' = { }
self . base_options : ' KeyedOptionDictType ' = { }
self . cross_files = self . __load_config_files ( options , scratch_dir , ' cross ' ) self . cross_files = self . __load_config_files ( options , scratch_dir , ' cross ' )
self . compilers = PerMachine ( OrderedDict ( ) , OrderedDict ( ) ) # type: PerMachine[T.Dict[str, Compiler]] self . compilers = PerMachine ( OrderedDict ( ) , OrderedDict ( ) ) # type: PerMachine[T.Dict[str, Compiler]]
build_cache = DependencyCache ( self . builti ns, MachineChoice . BUILD ) build_cache = DependencyCache ( self . options , MachineChoice . BUILD )
host_cache = DependencyCache ( self . builti ns, MachineChoice . BUILD ) host_cache = DependencyCache ( self . optio ns, MachineChoice . BUILD )
self . deps = PerMachine ( build_cache , host_cache ) # type: PerMachine[DependencyCache] self . deps = PerMachine ( build_cache , host_cache ) # type: PerMachine[DependencyCache]
self . compiler_check_cache = OrderedDict ( ) # type: T.Dict[CompilerCheckCacheKey, compiler.CompileResult] self . compiler_check_cache = OrderedDict ( ) # type: T.Dict[CompilerCheckCacheKey, compiler.CompileResult]
@ -523,10 +519,10 @@ class CoreData:
def init_builtins ( self , subproject : str ) - > None : def init_builtins ( self , subproject : str ) - > None :
# Create builtin options with default values # Create builtin options with default values
for key , opt in BUILTIN_OPTIONS . items ( ) : for key , opt in BUILTIN_OPTIONS . items ( ) :
self . add_builtin_option ( self . builti ns, key . evolve ( subproject = subproject ) , opt ) self . add_builtin_option ( self . optio ns, key . evolve ( subproject = subproject ) , opt )
for for_machine in iter ( MachineChoice ) : for for_machine in iter ( MachineChoice ) :
for key , opt in BUILTIN_OPTIONS_PER_MACHINE . items ( ) : for key , opt in BUILTIN_OPTIONS_PER_MACHINE . items ( ) :
self . add_builtin_option ( self . builti ns, key . evolve ( subproject = subproject , machine = for_machine ) , opt ) self . add_builtin_option ( self . optio ns, key . evolve ( subproject = subproject , machine = for_machine ) , opt )
@staticmethod @staticmethod
def add_builtin_option ( opts_map : ' KeyedOptionDictType ' , key : OptionKey , def add_builtin_option ( opts_map : ' KeyedOptionDictType ' , key : OptionKey ,
@ -542,55 +538,54 @@ class CoreData:
def init_backend_options ( self , backend_name : str ) - > None : def init_backend_options ( self , backend_name : str ) - > None :
if backend_name == ' ninja ' : if backend_name == ' ninja ' :
self . backend_ options[ OptionKey ( ' backend_max_links ' ) ] = UserIntegerOption ( self . options [ OptionKey ( ' backend_max_links ' ) ] = UserIntegerOption (
' Maximum number of linker processes to run or 0 for no ' ' Maximum number of linker processes to run or 0 for no '
' limit ' , ' limit ' ,
( 0 , None , 0 ) ) ( 0 , None , 0 ) )
elif backend_name . startswith ( ' vs ' ) : elif backend_name . startswith ( ' vs ' ) :
self . backend_ options[ OptionKey ( ' backend_startup_project ' ) ] = UserStringOption ( self . options [ OptionKey ( ' backend_startup_project ' ) ] = UserStringOption (
' Default project to execute in Visual Studio ' , ' Default project to execute in Visual Studio ' ,
' ' ) ' ' )
def get_builtin_option ( self , optname : str , subproject : str = ' ' ) - > T . Union [ str , int , bool ] : def get_option ( self , key : OptionKey ) - > T . Union [ str , int , bool , WrapMode ] :
key = OptionKey . from_string ( optname ) . evolve ( subproject = subproject ) try :
for opts in self . _get_all_builtin_options ( ) : v = self . options [ key ] . value
v = opts . get ( str ( key ) )
if v is None or v . yielding :
v = opts . get ( str ( key . as_root ( ) ) )
if v is None :
continue
if key . name == ' wrap_mode ' : if key . name == ' wrap_mode ' :
return WrapMode . from_string ( v . value ) return WrapMode [ v ]
return v . value return v
raise RuntimeError ( f ' Tried to get unknown builtin option { key . name } . ' ) except KeyError :
pass
def _try_set_builtin_option ( self , key : OptionKey , value ) - > bool :
for opts in self . _get_all_builtin_options ( ) : try :
opt = opts . get ( str ( key ) ) v = self . options [ key . as_root ( ) ]
if opt is None : if v . yielding :
continue if key . name == ' wrap_mode ' :
return WrapMode [ v . value ]
return v . value
except KeyError :
pass
raise MesonException ( f ' Tried to get unknown builtin option { str ( key ) } ' )
def set_option ( self , key : OptionKey , value ) - > None :
if key . is_builtin ( ) :
if key . name == ' prefix ' : if key . name == ' prefix ' :
value = self . sanitize_prefix ( value ) value = self . sanitize_prefix ( value )
else : else :
prefix = self . builtins [ OptionKey ( ' prefix ' ) ] . value prefix = self . optio ns[ OptionKey ( ' prefix ' ) ] . value
value = self . sanitize_dir_option_value ( prefix , key , value ) value = self . sanitize_dir_option_value ( prefix , key , value )
break
else :
return False
opt . set_value ( value )
# Make sure that buildtype matches other settings.
if key . name == ' buildtype ' :
self . set_others_from_buildtype ( value )
else :
self . set_buildtype_from_others ( )
return True
def set_builtin_option ( self , optname : OptionKey , value ) - > None : try :
res = self . _try_set_builtin_option ( optname , value ) self . options [ key ] . set_value ( value )
if not res : except KeyError :
raise RuntimeError ( f ' Tried to set unknown builtin option { str ( optname ) } ' ) raise MesonException ( f ' Tried to set unknown builtin option { str ( key ) } ' )
def set_others_from_buildtype ( self , value ) : if key . name == ' buildtype ' :
self . _set_others_from_buildtype ( value )
elif key . name in { ' debug ' , ' optimization ' } :
self . _set_buildtype_from_others ( )
def _set_others_from_buildtype ( self , value : str ) - > None :
if value == ' plain ' : if value == ' plain ' :
opt = ' 0 ' opt = ' 0 '
debug = False debug = False
@ -609,12 +604,12 @@ class CoreData:
else : else :
assert ( value == ' custom ' ) assert ( value == ' custom ' )
return return
self . builti ns[ OptionKey ( ' optimization ' ) ] . set_value ( opt ) self . optio ns[ OptionKey ( ' optimization ' ) ] . set_value ( opt )
self . builti ns[ OptionKey ( ' debug ' ) ] . set_value ( debug ) self . optio ns[ OptionKey ( ' debug ' ) ] . set_value ( debug )
def set_buildtype_from_others ( self ) : def _ set_buildtype_from_others( self ) - > None :
opt = self . builti ns[ OptionKey ( ' optimization ' ) ] . value opt = self . optio ns[ OptionKey ( ' optimization ' ) ] . value
debug = self . builti ns[ OptionKey ( ' debug ' ) ] . value debug = self . optio ns[ OptionKey ( ' debug ' ) ] . value
if opt == ' 0 ' and not debug : if opt == ' 0 ' and not debug :
mode = ' plain ' mode = ' plain '
elif opt == ' 0 ' and debug : elif opt == ' 0 ' and debug :
@ -627,84 +622,47 @@ class CoreData:
mode = ' minsize ' mode = ' minsize '
else : else :
mode = ' custom ' mode = ' custom '
self . builtins [ OptionKey ( ' buildtype ' ) ] . set_value ( mode ) self . options [ OptionKey ( ' buildtype ' ) ] . set_value ( mode )
@classmethod
def get_prefixed_options_per_machine (
cls ,
options_per_machine # : PerMachine[T.Dict[str, _V]]]
) - > T . Iterable [ T . Tuple [ str , _V ] ] :
return cls . _flatten_pair_iterator (
( for_machine . get_prefix ( ) , options_per_machine [ for_machine ] )
for for_machine in iter ( MachineChoice )
)
@classmethod
def flatten_lang_iterator (
cls ,
outer # : T.Iterable[T.Tuple[str, T.Dict[str, _V]]]
) - > T . Iterable [ T . Tuple [ str , _V ] ] :
return cls . _flatten_pair_iterator ( ( lang + ' _ ' , opts ) for lang , opts in outer )
@staticmethod @staticmethod
def _flatten_pair_iterator ( def is_per_machine_option ( optname : OptionKey ) - > bool :
outer # : T.Iterable[T.Tuple[str, T.Dict[str, _V]]]
) - > T . Iterable [ T . Tuple [ str , _V ] ] :
for k0 , v0 in outer :
for k1 , v1 in v0 . items ( ) :
yield ( k0 + k1 , v1 )
@classmethod
def is_per_machine_option ( cls , optname : OptionKey ) - > bool :
if optname . name in BUILTIN_OPTIONS_PER_MACHINE : if optname . name in BUILTIN_OPTIONS_PER_MACHINE :
return True return True
return optname . lang is not None return optname . lang is not None
def _get_all_nonbuiltin_options ( self ) - > T . Iterable [ T . Dict [ str , UserOption ] ] :
yield { str ( k ) : v for k , v in self . backend_options . items ( ) }
yield { str ( k ) : v for k , v in self . user_options . items ( ) }
yield { str ( k ) : v for k , v in self . compiler_options . items ( ) }
yield { str ( k ) : v for k , v in self . base_options . items ( ) }
def _get_all_builtin_options ( self ) - > T . Iterable [ T . Dict [ str , UserOption ] ] :
yield { str ( k ) : v for k , v in self . builtins . items ( ) }
def get_all_options ( self ) - > T . Iterable [ T . Dict [ str , UserOption ] ] :
yield from self . _get_all_nonbuiltin_options ( )
yield from self . _get_all_builtin_options ( )
def validate_option_value ( self , option_name : OptionKey , override_value ) : def validate_option_value ( self , option_name : OptionKey , override_value ) :
for opts in self . get_all_options ( ) : try :
opt = opts . get ( str ( option_name ) ) opt = self . options [ option_name ]
if opt is not None : except KeyError :
try : raise MesonException ( f ' Tried to validate unknown option { str ( option_name ) } ' )
return opt . validate_value ( override_value ) try :
except MesonException as e : return opt . validate_value ( override_value )
raise type ( e ) ( ( ' Validation failed for option %s : ' % option_name ) + str ( e ) ) \ except MesonException as e :
. with_traceback ( sys . exc_info ( ) [ 2 ] ) raise type ( e ) ( ( ' Validation failed for option %s : ' % option_name ) + str ( e ) ) \
raise MesonException ( ' Tried to validate unknown option %s . ' % option_name ) . with_traceback ( sys . exc_info ( ) [ 2 ] )
def get_external_args ( self , for_machine : MachineChoice , lang : str ) - > T . Union [ str , T . List [ str ] ] : def get_external_args ( self , for_machine : MachineChoice , lang : str ) - > T . Union [ str , T . List [ str ] ] :
return self . compiler_ options[ OptionKey ( ' args ' , machine = for_machine , lang = lang ) ] . value return self . options [ OptionKey ( ' args ' , machine = for_machine , lang = lang ) ] . value
def get_external_link_args ( self , for_machine : MachineChoice , lang : str ) - > T . Union [ str , T . List [ str ] ] : def get_external_link_args ( self , for_machine : MachineChoice , lang : str ) - > T . Union [ str , T . List [ str ] ] :
return self . compiler_ options[ OptionKey ( ' link_args ' , machine = for_machine , lang = lang ) ] . value return self . options [ OptionKey ( ' link_args ' , machine = for_machine , lang = lang ) ] . value
def merge_user_options ( self , options : T . Dict [ str , UserOption [ T . Any ] ] ) - > None : def update_project_options ( self , options : ' KeyedOptionDictType ' ) - > None :
for name , value in options . items ( ) : for key , value in options . items ( ) :
key = OptionKey . from_string ( name ) if not key . is_project ( ) :
if key not in self . user_options : continue
self . user_options [ key ] = value if key not in self . options :
self . options [ key ] = value
continue continue
oldval = self . user_ options[ key ] oldval = self . options [ key ]
if type ( oldval ) != type ( value ) : if type ( oldval ) != type ( value ) :
self . user_ options[ key ] = value self . options [ key ] = value
elif oldval . choices != value . choices : elif oldval . choices != value . choices :
# If the choices have changed, use the new value, but attempt # If the choices have changed, use the new value, but attempt
# to keep the old options. If they are not valid keep the new # to keep the old options. If they are not valid keep the new
# defaults but warn. # defaults but warn.
self . user_ options[ key ] = value self . options [ key ] = value
try : try :
value . set_value ( oldval . value ) value . set_value ( oldval . value )
except MesonException as e : except MesonException as e :
@ -718,13 +676,13 @@ class CoreData:
def copy_build_options_from_regular_ones ( self ) - > None : def copy_build_options_from_regular_ones ( self ) - > None :
assert not self . is_cross_build ( ) assert not self . is_cross_build ( )
for k in BUILTIN_OPTIONS_PER_MACHINE : for k in BUILTIN_OPTIONS_PER_MACHINE :
o = self . builti ns[ k ] o = self . optio ns[ k ]
self . builti ns[ k . as_build ( ) ] . set_value ( o . value ) self . optio ns[ k . as_build ( ) ] . set_value ( o . value )
for bk , bv in self . compiler_ options. items ( ) : for bk , bv in self . options . items ( ) :
if bk . machine is MachineChoice . BUILD : if bk . machine is MachineChoice . BUILD :
hk = bk . as_host ( ) hk = bk . as_host ( )
try : try :
hv = self . compiler_ options[ hk ] hv = self . options [ hk ]
bv . set_value ( hv . value ) bv . set_value ( hv . value )
except KeyError : except KeyError :
continue continue
@ -736,25 +694,19 @@ class CoreData:
pfk = OptionKey ( ' prefix ' ) pfk = OptionKey ( ' prefix ' )
if pfk in options : if pfk in options :
prefix = self . sanitize_prefix ( options [ pfk ] ) prefix = self . sanitize_prefix ( options [ pfk ] )
self . builti ns[ OptionKey ( ' prefix ' ) ] . set_value ( prefix ) self . optio ns[ OptionKey ( ' prefix ' ) ] . set_value ( prefix )
for key in BULITIN_DIR_NOPREFIX_OPTIONS : for key in BULITIN_DIR_NOPREFIX_OPTIONS :
if key not in options : if key not in options :
self . builti ns[ key ] . set_value ( BUILTIN_OPTIONS [ key ] . prefixed_default ( key , prefix ) ) self . optio ns[ key ] . set_value ( BUILTIN_OPTIONS [ key ] . prefixed_default ( key , prefix ) )
unknown_options : T . List [ OptionKey ] = [ ] unknown_options : T . List [ OptionKey ] = [ ]
for k , v in options . items ( ) : for k , v in options . items ( ) :
if k == pfk : if k == pfk :
continue continue
if self . _try_set_builtin_option ( k , v ) : elif k not in self . options :
continue
for opts in self . _get_all_nonbuiltin_options ( ) :
tgt = opts . get ( str ( k ) )
if tgt is None :
continue
tgt . set_value ( v )
break
else :
unknown_options . append ( k ) unknown_options . append ( k )
else :
self . set_option ( k , v )
if unknown_options and warn_unknown : if unknown_options and warn_unknown :
unknown_options_str = ' , ' . join ( sorted ( str ( s ) for s in unknown_options ) ) unknown_options_str = ' , ' . join ( sorted ( str ( s ) for s in unknown_options ) )
sub = ' In subproject {} : ' . format ( subproject ) if subproject else ' ' sub = ' In subproject {} : ' . format ( subproject ) if subproject else ' '
@ -767,10 +719,9 @@ class CoreData:
def set_default_options ( self , default_options : T . MutableMapping [ OptionKey , str ] , subproject : str , env : ' Environment ' ) - > None : def set_default_options ( self , default_options : T . MutableMapping [ OptionKey , str ] , subproject : str , env : ' Environment ' ) - > None :
# Preserve order: if env.options has 'buildtype' it must come after # Preserve order: if env.options has 'buildtype' it must come after
# 'optimization' if it is in default_options. # 'optimization' if it is in default_options.
options : T . MutableMapping [ OptionKey , T . Any ]
if not subproject : if not subproject :
options : T . MutableMapping [ OptionKey , T . Any ] = OrderedDict ( ) options = OrderedDict ( default_options )
for k , v in default_options . items ( ) :
options [ k ] = v
options . update ( env . options ) options . update ( env . options )
env . options = options env . options = options
@ -779,12 +730,15 @@ class CoreData:
# Language and backend specific options will be set later when adding # Language and backend specific options will be set later when adding
# languages and setting the backend (builtin options must be set first # languages and setting the backend (builtin options must be set first
# to know which backend we'll use). # to know which backend we'll use).
options : T . MutableMapping [ OptionKey , T . Any ] = OrderedDict ( ) options = OrderedDict ( )
for k , v in chain ( default_options . items ( ) , env . options . items ( ) ) : for k , v in chain ( default_options . items ( ) , env . options . items ( ) ) :
# Subproject: skip options for other subproject s # If this is a subproject, don't use other subproject option s
if k . subproject and k . subproject != subproject : if k . subproject and k . subproject != subproject :
continue continue
# If the option is a builtin and is yielding then it's not allowed per subproject.
if subproject and k . is_builtin ( ) and self . options [ k . as_root ( ) ] . yielding :
continue
# Skip base, compiler, and backend options, they are handled when # Skip base, compiler, and backend options, they are handled when
# adding languages and setting backend. # adding languages and setting backend.
if k . type in { OptionType . COMPILER , OptionType . BACKEND , OptionType . BASE } : if k . type in { OptionType . COMPILER , OptionType . BACKEND , OptionType . BASE } :
@ -799,7 +753,7 @@ class CoreData:
value = env . options . get ( k ) value = env . options . get ( k )
if value is not None : if value is not None :
o . set_value ( value ) o . set_value ( value )
self . compiler_ options. setdefault ( k , o ) self . options . setdefault ( k , o )
def add_lang_args ( self , lang : str , comp : T . Type [ ' Compiler ' ] , def add_lang_args ( self , lang : str , comp : T . Type [ ' Compiler ' ] ,
for_machine : MachineChoice , env : ' Environment ' ) - > None : for_machine : MachineChoice , env : ' Environment ' ) - > None :
@ -816,13 +770,13 @@ class CoreData:
enabled_opts : T . List [ OptionKey ] = [ ] enabled_opts : T . List [ OptionKey ] = [ ]
for key in comp . base_options : for key in comp . base_options :
if key in self . base_ options: if key in self . options :
continue continue
oobj = compilers . base_options [ key ] oobj = compilers . base_options [ key ]
if key in env . options : if key in env . options :
oobj . set_value ( env . options [ key ] ) oobj . set_value ( env . options [ key ] )
enabled_opts . append ( key ) enabled_opts . append ( key )
self . base_ options[ key ] = oobj self . options [ key ] = oobj
self . emit_base_options_warnings ( enabled_opts ) self . emit_base_options_warnings ( enabled_opts )
def emit_base_options_warnings ( self , enabled_opts : T . List [ OptionKey ] ) - > None : def emit_base_options_warnings ( self , enabled_opts : T . List [ OptionKey ] ) - > None :
Dylan Baker
4 years ago