@ -85,6 +85,61 @@ def _language_validator(l: T.List[str]) -> T.Optional[str]:
return None return None
def _install_mode_validator ( mode : T . List [ T . Union [ str , bool , int ] ] ) - > T . Optional [ str ] :
""" Validate the `install_mode` keyword argument.
This is a rather odd thing , it ' s a scalar, or an array of 3 values in the form:
[ ( str | False ) , ( str | int | False ) = False , ( str | int | False ) = False ]
Where the second and third arguments are not required , and are considered to
default to False .
"""
if not mode :
return None
if True in mode :
return ' can only be a string or false, not true '
if len ( mode ) > 3 :
return ' may have at most 3 elements '
perms = mode [ 0 ]
if not isinstance ( perms , ( str , bool ) ) :
return ' permissions part must be a string or false '
if isinstance ( perms , str ) :
if not len ( perms ) == 9 :
return ( f ' permissions string must be exactly 9 characters, got " { len ( perms ) } " '
' in the form rwxr-xr-x ' )
for i in [ 0 , 3 , 6 ] :
if perms [ i ] not in { ' - ' , ' r ' } :
return f ' bit { i } must be " - " or " r " , not { perms [ i ] } '
for i in [ 1 , 4 , 7 ] :
if perms [ i ] not in { ' - ' , ' w ' } :
return f ' bit { i } must be " - " or " w " , not { perms [ i ] } '
for i in [ 2 , 5 ] :
if perms [ i ] not in { ' - ' , ' x ' , ' s ' , ' S ' } :
return f ' bit { i } must be " - " , " s " , " S " , or " x " , not { perms [ i ] } '
if perms [ 8 ] not in { ' - ' , ' x ' , ' t ' , ' T ' } :
return f ' bit 8 must be " - " , " t " , " T " , or " x " , not { perms [ 8 ] } '
if len ( mode ) > = 2 and not isinstance ( mode [ 1 ] , ( int , str , bool ) ) :
return ' second componenent must be a string, number, or False if provided '
if len ( mode ) > = 3 and not isinstance ( mode [ 2 ] , ( int , str , bool ) ) :
return ' third componenent must be a string, number, or False if provided '
return None
def _install_mode_convertor ( mode : T . Optional [ T . List [ T . Union [ str , bool , int ] ] ] ) - > FileMode :
""" Convert the DSL form of the `install_mode` keyword arugment to `FileMode`
This is not required , and if not required returns None
TODO : It ' s not clear to me why this needs to be None and not just return an
emtpy FileMode .
"""
# this has already been validated by the validator
return FileMode ( * [ m if isinstance ( m , str ) else None for m in mode ] )
_NATIVE_KW = KwargInfo ( _NATIVE_KW = KwargInfo (
' native ' , bool , ' native ' , bool ,
default = False , default = False ,
@ -97,6 +152,15 @@ _LANGUAGE_KW = KwargInfo(
validator = _language_validator , validator = _language_validator ,
convertor = lambda x : [ i . lower ( ) for i in x ] ) convertor = lambda x : [ i . lower ( ) for i in x ] )
_INSTALL_MODE_KW = KwargInfo (
' install_mode ' ,
ContainerTypeInfo ( list , ( str , bool , int ) ) ,
listify = True ,
default = [ ] ,
validator = _install_mode_validator ,
convertor = _install_mode_convertor ,
)
def stringifyUserArguments ( args , quote = False ) : def stringifyUserArguments ( args , quote = False ) :
if isinstance ( args , list ) : if isinstance ( args , list ) :
@ -1817,46 +1881,50 @@ This will become a hard error in the future.''' % kwargs['input'], location=self
self . build . benchmarks . append ( t ) self . build . benchmarks . append ( t )
mlog . debug ( ' Adding benchmark ' , mlog . bold ( t . name , True ) ) mlog . debug ( ' Adding benchmark ' , mlog . bold ( t . name , True ) )
@FeatureNewKwargs ( ' install_headers ' , ' 0.47.0 ' , [ ' install_mode ' ] ) @typed_pos_args ( ' install_headers ' , varargs = ( str , mesonlib . File ) , min_varargs = 1 )
@permittedKwargs ( { ' install_dir ' , ' install_mode ' , ' subdir ' } ) @typed_kwargs (
def func_install_headers ( self , node , args , kwargs ) : ' install_headers ' ,
source_files = self . source_strings_to_files ( args ) KwargInfo ( ' install_dir ' , ( str , None ) ) ,
install_mode = self . _get_kwarg_install_mode ( kwargs ) KwargInfo ( ' subdir ' , ( str , None ) ) ,
_INSTALL_MODE_KW . evolve ( since = ' 0.47.0 ' ) ,
install_subdir = kwargs . get ( ' subdir ' , ' ' ) )
if not isinstance ( install_subdir , str ) : def func_install_headers ( self , node : mparser . BaseNode ,
raise InterpreterException ( ' subdir keyword argument must be a string ' ) args : T . Tuple [ T . List [ ' mesonlib.FileOrString ' ] ] ,
elif os . path . isabs ( install_subdir ) : kwargs : ' kwargs.FuncInstallHeaders ' ) - > build . Headers :
source_files = self . source_strings_to_files ( args [ 0 ] )
install_subdir = kwargs [ ' subdir ' ]
if install_subdir is not None and os . path . isabs ( install_subdir ) :
mlog . deprecation ( ' Subdir keyword must not be an absolute path. This will be a hard error in the next release. ' ) mlog . deprecation ( ' Subdir keyword must not be an absolute path. This will be a hard error in the next release. ' )
install_dir = kwargs . get ( ' install_dir ' , None ) h = build . Headers ( source_files , install_subdir , kwargs [ ' install_dir ' ] ,
if install_dir is not None and not isinstance ( install_dir , str ) : kwargs [ ' install_mode ' ] , self . subproject )
raise InterpreterException ( ' install_dir keyword argument must be a string if provided ' )
h = build . Headers ( source_files , install_subdir , install_dir , install_mode , self . subproject )
self . build . headers . append ( h ) self . build . headers . append ( h )
return h return h
@FeatureNewKwargs ( ' install_man ' , ' 0.47.0 ' , [ ' install_mode ' ] ) @typed_pos_args ( ' install_man ' , varargs = ( str , mesonlib . File ) , min_varargs = 1 )
@FeatureNewKwargs ( ' install_man ' , ' 0.58.0 ' , [ ' locale ' ] ) @typed_kwargs (
@permittedKwargs ( { ' install_dir ' , ' install_mode ' , ' locale ' } ) ' install_man ' ,
def func_install_man ( self , node , args , kwargs ) : KwargInfo ( ' install_dir ' , ( str , None ) ) ,
sources = self . source_strings_to_files ( args ) KwargInfo ( ' locale ' , ( str , None ) , since = ' 0.58.0 ' ) ,
_INSTALL_MODE_KW . evolve ( since = ' 0.47.0 ' )
)
def func_install_man ( self , node : mparser . BaseNode ,
args : T . Tuple [ T . List [ ' mesonlib.FileOrString ' ] ] ,
kwargs : ' kwargs.FuncInstallMan ' ) - > build . Man :
# We just need to narrow this, because the input is limited to files and
# Strings as inputs, so only Files will be returned
sources = self . source_strings_to_files ( args [ 0 ] )
for s in sources : for s in sources :
try : try :
num = int ( s . split ( ' . ' ) [ - 1 ] ) num = int ( s . r split( ' . ' , 1 ) [ - 1 ] )
except ( IndexError , ValueError ) : except ( IndexError , ValueError ) :
num = 0 num = 0
if num < 1 or num > 8 : if not 1 < = num < = 9 :
raise InvalidArguments ( ' Man file must have a file extension of a number between 1 and 8 ' ) raise InvalidArguments ( ' Man file must have a file extension of a number between 1 and 9 ' )
custom_install_mode = self . _get_kwarg_install_mode ( kwargs )
custom_install_dir = kwargs . get ( ' install_dir ' , None ) m = build . Man ( sources , kwargs [ ' install_dir ' ] , kwargs [ ' install_mode ' ] ,
locale = kwargs . get ( ' locale ' ) self . subproject , kwargs [ ' locale ' ] )
if custom_install_dir is not None and not isinstance ( custom_install_dir , str ) :
raise InterpreterException ( ' install_dir must be a string. ' )
m = build . Man ( sources , custom_install_dir , custom_install_mode , self . subproject , locale )
self . build . man . append ( m ) self . build . man . append ( m )
return m return m
@ -1929,82 +1997,55 @@ This will become a hard error in the future.''' % kwargs['input'], location=self
' permissions arg to be a string or false ' ) ' permissions arg to be a string or false ' )
return FileMode ( * install_mode ) return FileMode ( * install_mode )
@FeatureNewKwargs ( ' install_data ' , ' 0.46.0 ' , [ ' rename ' ] ) @typed_pos_args ( ' install_data ' , varargs = ( str , mesonlib . File ) )
@FeatureNewKwargs ( ' install_data ' , ' 0.38.0 ' , [ ' install_mode ' ] ) @typed_kwargs (
@permittedKwargs ( { ' install_dir ' , ' install_mode ' , ' rename ' , ' sources ' } ) ' install_data ' ,
def func_install_data ( self , node , args : T . List , kwargs : T . Dict [ str , T . Any ] ) : KwargInfo ( ' install_dir ' , str ) ,
kwsource = mesonlib . stringlistify ( kwargs . get ( ' sources ' , [ ] ) ) KwargInfo ( ' sources ' , ContainerTypeInfo ( list , ( str , mesonlib . File ) ) , listify = True , default = [ ] ) ,
raw_sources = args + kwsource KwargInfo ( ' rename ' , ContainerTypeInfo ( list , str ) , default = [ ] , listify = True , since = ' 0.46.0 ' ) ,
sources : T . List [ mesonlib . File ] = [ ] _INSTALL_MODE_KW . evolve ( since = ' 0.38.0 ' ) ,
source_strings : T . List [ str ] = [ ] )
for s in raw_sources : def func_install_data ( self , node : mparser . BaseNode ,
if isinstance ( s , mesonlib . File ) : args : T . Tuple [ T . List [ ' mesonlib.FileOrString ' ] ] ,
sources . append ( s ) kwargs : ' kwargs.FuncInstallData ' ) - > build . Data :
elif isinstance ( s , str ) : sources = self . source_strings_to_files ( args [ 0 ] + kwargs [ ' sources ' ] )
source_strings . append ( s ) rename = kwargs [ ' rename ' ] or None
else : if rename :
raise InvalidArguments ( ' Argument must be string or file. ' )
sources + = self . source_strings_to_files ( source_strings )
install_dir : T . Optional [ str ] = kwargs . get ( ' install_dir ' , None )
if install_dir is not None and not isinstance ( install_dir , str ) :
raise InvalidArguments ( ' Keyword argument install_dir not a string. ' )
install_mode = self . _get_kwarg_install_mode ( kwargs )
rename : T . Optional [ T . List [ str ] ] = kwargs . get ( ' rename ' , None )
if rename is not None :
rename = mesonlib . stringlistify ( rename )
if len ( rename ) != len ( sources ) : if len ( rename ) != len ( sources ) :
raise InvalidArguments ( raise InvalidArguments (
' " rename " and " sources " argument lists must be the same length if " rename " is given. ' ' " rename " and " sources " argument lists must be the same length if " rename " is given. '
f ' Rename has { len ( rename ) } elements and sources has { len ( sources ) } . ' ) f ' Rename has { len ( rename ) } elements and sources has { len ( sources ) } . ' )
data = build . Data ( sources , install_dir , install_mode , self . subproject , rename ) data = build . Data (
sources , kwargs [ ' install_dir ' ] , kwargs [ ' install_mode ' ] ,
self . subproject , rename )
self . build . data . append ( data ) self . build . data . append ( data )
return data return data
@FeatureNewKwargs ( ' install_subdir ' , ' 0.42.0 ' , [ ' exclude_files ' , ' exclude_directories ' ] ) @typed_pos_args ( ' install_subdir ' , str )
@FeatureNewKwargs ( ' install_subdir ' , ' 0.38.0 ' , [ ' install_mode ' ] ) @typed_kwargs (
@permittedKwargs ( { ' exclude_files ' , ' exclude_directories ' , ' install_dir ' , ' install_mode ' , ' strip_directory ' } ) ' install_subdir ' ,
@stringArgs KwargInfo ( ' install_dir ' , str , required = True ) ,
def func_install_subdir ( self , node , args , kwargs ) : KwargInfo ( ' strip_directory ' , bool , default = False ) ,
if len ( args ) != 1 : KwargInfo ( ' exclude_files ' , ContainerTypeInfo ( list , str ) ,
raise InvalidArguments ( ' Install_subdir requires exactly one argument. ' ) default = [ ] , listify = True , since = ' 0.42.0 ' ,
subdir : str = args [ 0 ] validator = lambda x : ' cannot be absolute ' if any ( os . path . isabs ( d ) for d in x ) else None ) ,
if not isinstance ( subdir , str ) : KwargInfo ( ' exclude_directories ' , ContainerTypeInfo ( list , str ) ,
raise InvalidArguments ( ' install_subdir positional argument 1 must be a string. ' ) default = [ ] , listify = True , since = ' 0.42.0 ' ,
if ' install_dir ' not in kwargs : validator = lambda x : ' cannot be absolute ' if any ( os . path . isabs ( d ) for d in x ) else None ) ,
raise InvalidArguments ( ' Missing keyword argument install_dir ' ) _INSTALL_MODE_KW . evolve ( since = ' 0.38.0 ' ) ,
install_dir : str = kwargs [ ' install_dir ' ] )
if not isinstance ( install_dir , str ) : def func_install_subdir ( self , node : mparser . BaseNode , args : T . Tuple [ str ] ,
raise InvalidArguments ( ' Keyword argument install_dir not a string. ' ) kwargs : ' kwargs.FuncInstallSubdir ' ) - > build . InstallDir :
if ' strip_directory ' in kwargs : exclude = ( set ( kwargs [ ' exclude_files ' ] ) , set ( kwargs [ ' exclude_directories ' ] ) )
strip_directory : bool = kwargs [ ' strip_directory ' ] idir = build . InstallDir (
if not isinstance ( strip_directory , bool ) : self . subdir ,
raise InterpreterException ( ' " strip_directory " keyword must be a boolean. ' ) args [ 0 ] ,
else : kwargs [ ' install_dir ' ] ,
strip_directory = False kwargs [ ' install_mode ' ] ,
if ' exclude_files ' in kwargs : exclude ,
exclude : T . List [ str ] = extract_as_list ( kwargs , ' exclude_files ' ) kwargs [ ' strip_directory ' ] ,
for f in exclude : self . subproject )
if not isinstance ( f , str ) :
raise InvalidArguments ( ' Exclude argument not a string. ' )
elif os . path . isabs ( f ) :
raise InvalidArguments ( ' Exclude argument cannot be absolute. ' )
exclude_files : T . Set [ str ] = set ( exclude )
else :
exclude_files = set ( )
if ' exclude_directories ' in kwargs :
exclude : T . List [ str ] = extract_as_list ( kwargs , ' exclude_directories ' )
for d in exclude :
if not isinstance ( d , str ) :
raise InvalidArguments ( ' Exclude argument not a string. ' )
elif os . path . isabs ( d ) :
raise InvalidArguments ( ' Exclude argument cannot be absolute. ' )
exclude_directories : T . Set [ str ] = set ( exclude )
else :
exclude_directories = set ( )
exclude = ( exclude_files , exclude_directories )
install_mode = self . _get_kwarg_install_mode ( kwargs )
idir = build . InstallDir ( self . subdir , subdir , install_dir , install_mode , exclude , strip_directory , self . subproject )
self . build . install_dirs . append ( idir ) self . build . install_dirs . append ( idir )
return idir return idir
@ -2479,6 +2520,10 @@ Try setting b_lundef to false instead.'''.format(self.coredata.options[OptionKey
if project_root / self . subproject_dir in norm . parents : if project_root / self . subproject_dir in norm . parents :
raise InterpreterException ( f ' Sandbox violation: Tried to grab { inputtype } { norm . name } from a nested subproject. ' ) raise InterpreterException ( f ' Sandbox violation: Tried to grab { inputtype } { norm . name } from a nested subproject. ' )
@T . overload
def source_strings_to_files ( self , sources : T . List [ ' mesonlib.FileOrString ' ] ) - > T . List [ ' mesonlib.File ' ] : . . .
def source_strings_to_files ( self , sources : T . List [ ' SourceInputs ' ] ) - > T . List [ ' SourceOutputs ' ] : def source_strings_to_files ( self , sources : T . List [ ' SourceInputs ' ] ) - > T . List [ ' SourceOutputs ' ] :
""" Lower inputs to a list of Targets and Files, replacing any strings. """ Lower inputs to a list of Targets and Files, replacing any strings.
Jussi Pakkanen
3 years ago
committed by
GitHub