Merge 1725e62 into 27bd499

Author: dcbaker

docs/markdown/snippets/build_target_deprecate_jar.md

@@ -0,0 +1,6 @@
+## passing `target_type : 'jar'` to `build_target()` is deprecated
+
+This never really made sense, as you can't mix java sources with non-java
+sources, but this is even more difficult to ensure that we validate the
+arguments correctly given that many `jar()` arguments allow differen types
+than other targets do.

docs/markdown/snippets/d_absolute_path_includes.md

@@ -0,0 +1,4 @@
+## Deprecated use of absolute paths to D impdirs
+
+This functionality was deprecated in Meson 0.45 (released in early 2018), and
+has been removed.

docs/yaml/functions/build_target.yaml

@@ -12,7 +12,7 @@ description: |
   - `static_library` (see [[static_library]])
   - `both_libraries` (see [[both_libraries]])
   - `library` (see [[library]])
-  - `jar` (see [[jar]])
+  - `jar` (see [[jar]]) *(deprecated since 1.1.0)*
 
   This declaration:
 

mesonbuild/ast/introspection.py

@@ -29,6 +29,7 @@
 from ..mesonlib import MachineChoice, OptionKey
 from ..mparser import BaseNode, ArithmeticNode, ArrayNode, ElementaryNode, IdNode, FunctionNode, StringNode
 from .interpreter import AstInterpreter
+from ..interpreter.type_checking import EXECUTABLE_KWS, STATIC_LIB_KWS, SHARED_LIB_KWS, SHARED_MOD_KWS, JAR_KWS
 
 if T.TYPE_CHECKING:
     from ..build import BuildTarget
@@ -261,7 +262,18 @@ def traverse_nodes(inqueue: T.List[BaseNode]) -> T.List[BaseNode]:
         extraf_nodes = traverse_nodes(extra_queue)
 
         # Make sure nothing can crash when creating the build class
-        kwargs_reduced = {k: v for k, v in kwargs.items() if k in targetclass.known_kwargs and k in {'install', 'build_by_default', 'build_always'}}
+        if targetclass is Executable:
+            checks = EXECUTABLE_KWS
+        elif targetclass is StaticLibrary:
+            checks = STATIC_LIB_KWS
+        elif targetclass is SharedLibrary:
+            checks = SHARED_LIB_KWS
+        elif targetclass is SharedModule:
+            checks = SHARED_MOD_KWS
+        else:
+            checks = JAR_KWS
+        keys = {k.name for k in checks}.intersection({'install', 'build_by_default', 'build_always'})
+        kwargs_reduced = {k: v for k, v in kwargs.items() if k in keys}
         kwargs_reduced = {k: v.value if isinstance(v, ElementaryNode) else v for k, v in kwargs_reduced.items()}
         kwargs_reduced = {k: v for k, v in kwargs_reduced.items() if not isinstance(v, BaseNode)}
         for_machine = MachineChoice.HOST

mesonbuild/build.py

@@ -61,61 +61,6 @@
     LibTypes = T.Union['SharedLibrary', 'StaticLibrary', 'CustomTarget', 'CustomTargetIndex']
     BuildTargetTypes = T.Union['BuildTarget', 'CustomTarget', 'CustomTargetIndex']
 
-pch_kwargs = {'c_pch', 'cpp_pch'}
-
-lang_arg_kwargs = {f'{lang}_args' for lang in all_languages}
-lang_arg_kwargs |= {
-    'd_import_dirs',
-    'd_unittest',
-    'd_module_versions',
-    'd_debug',
-}
-
-vala_kwargs = {'vala_header', 'vala_gir', 'vala_vapi'}
-rust_kwargs = {'rust_crate_type'}
-cs_kwargs = {'resources', 'cs_args'}
-
-buildtarget_kwargs = {
-    'build_by_default',
-    'build_rpath',
-    'dependencies',
-    'extra_files',
-    'gui_app',
-    'link_with',
-    'link_whole',
-    'link_args',
-    'link_depends',
-    'implicit_include_directories',
-    'include_directories',
-    'install',
-    'install_rpath',
-    'install_dir',
-    'install_mode',
-    'install_tag',
-    'name_prefix',
-    'name_suffix',
-    'native',
-    'objects',
-    'override_options',
-    'sources',
-    'gnu_symbol_visibility',
-    'link_language',
-    'win_subsystem',
-}
-
-known_build_target_kwargs = (
-    buildtarget_kwargs |
-    lang_arg_kwargs |
-    pch_kwargs |
-    vala_kwargs |
-    rust_kwargs |
-    cs_kwargs)
-
-known_exe_kwargs = known_build_target_kwargs | {'implib', 'export_dynamic', 'pie'}
-known_shlib_kwargs = known_build_target_kwargs | {'version', 'soversion', 'vs_module_defs', 'darwin_versions'}
-known_shmod_kwargs = known_build_target_kwargs | {'vs_module_defs'}
-known_stlib_kwargs = known_build_target_kwargs | {'pic', 'prelink'}
-known_jar_kwargs = known_exe_kwargs | {'main_class', 'java_resources'}
 
 def _process_install_tag(install_tag: T.Optional[T.List[T.Optional[str]]],
                          num_outputs: int) -> T.List[T.Optional[str]]:
@@ -679,7 +624,6 @@ def should_install(self) -> bool:
         return False
 
 class BuildTarget(Target):
-    known_kwargs = known_build_target_kwargs
 
     install_dir: T.List[T.Union[str, Literal[False]]]
 
@@ -720,7 +664,6 @@ def __init__(self, name: str, subdir: str, subproject: SubProject, for_machine:
         # 2. Compiled objects created by and extracted from another target
         self.process_objectlist(objects)
         self.process_kwargs(kwargs)
-        self.check_unknown_kwargs(kwargs)
         if not any([self.sources, self.generated, self.objects, self.link_whole_targets, self.structured_sources]):
             mlog.warning(f'Build target {name} has no sources. '
                          'This was never supposed to be allowed but did because of a bug, '
@@ -756,19 +699,6 @@ def validate_install(self):
             else:
                 mlog.warning('Installing target build for the build machine. This will fail in a cross build.')
 
-    def check_unknown_kwargs(self, kwargs):
-        # Override this method in derived classes that have more
-        # keywords.
-        self.check_unknown_kwargs_int(kwargs, self.known_kwargs)
-
-    def check_unknown_kwargs_int(self, kwargs, known_kwargs):
-        unknowns = []
-        for k in kwargs:
-            if k not in known_kwargs:
-                unknowns.append(k)
-        if len(unknowns) > 0:
-            mlog.warning('Unknown keyword argument(s) in target {}: {}.'.format(self.name, ', '.join(unknowns)))
-
     def process_objectlist(self, objects):
         assert isinstance(objects, list)
         for s in objects:
@@ -1074,8 +1004,8 @@ def process_kwargs(self, kwargs):
         self.add_pch('cpp', extract_as_list(kwargs, 'cpp_pch'))
 
         if not isinstance(self, Executable) or 'export_dynamic' in kwargs:
-            self.vala_header = kwargs.get('vala_header', self.name + '.h')
-            self.vala_vapi = kwargs.get('vala_vapi', self.name + '.vapi')
+            self.vala_header = kwargs.get('vala_header') or self.name + '.h'
+            self.vala_vapi = kwargs.get('vala_vapi') or self.name + '.vapi'
             self.vala_gir = kwargs.get('vala_gir', None)
 
         dfeatures = defaultdict(list)
@@ -1118,10 +1048,10 @@ def process_kwargs(self, kwargs):
         self.add_deps(deplist)
         # If an item in this list is False, the output corresponding to
         # the list index of that item will not be installed
-        self.install_dir = typeslistify(kwargs.get('install_dir', []),
+        self.install_dir = typeslistify(kwargs.get('install_dir') or [],
                                         (str, bool))
         self.install_mode = kwargs.get('install_mode', None)
-        self.install_tag = stringlistify(kwargs.get('install_tag', [None]))
+        self.install_tag = [kwargs['install_tag']] if kwargs.get('install_tag') else [None]
         main_class = kwargs.get('main_class', '')
         if not isinstance(main_class, str):
             raise InvalidArguments('Main class must be a string')
@@ -1130,17 +1060,13 @@ def process_kwargs(self, kwargs):
             # This kwarg is deprecated. The value of "none" means that the kwarg
             # was not specified and win_subsystem should be used instead.
             self.gui_app = None
-            if 'gui_app' in kwargs:
-                if 'win_subsystem' in kwargs:
+            if kwargs.get('gui_app') is not None:
+                if kwargs.get('win_subsystem') is not None:
                     raise InvalidArguments('Can specify only gui_app or win_subsystem for a target, not both.')
                 self.gui_app = kwargs['gui_app']
                 if not isinstance(self.gui_app, bool):
                     raise InvalidArguments('Argument gui_app must be boolean.')
-            self.win_subsystem = self.validate_win_subsystem(kwargs.get('win_subsystem', 'console'))
-        elif 'gui_app' in kwargs:
-            raise InvalidArguments('Argument gui_app can only be used on executables.')
-        elif 'win_subsystem' in kwargs:
-            raise InvalidArguments('Argument win_subsystem can only be used on executables.')
+            self.win_subsystem = self.validate_win_subsystem(kwargs.get('win_subsystem') or 'console')
         extra_files = extract_as_list(kwargs, 'extra_files')
         for i in extra_files:
             assert isinstance(i, File)
@@ -1162,30 +1088,12 @@ def process_kwargs(self, kwargs):
             if not os.path.isfile(trial):
                 raise InvalidArguments(f'Tried to add non-existing resource {r}.')
         self.resources = resources
-        if 'name_prefix' in kwargs:
-            name_prefix = kwargs['name_prefix']
-            if isinstance(name_prefix, list):
-                if name_prefix:
-                    raise InvalidArguments('name_prefix array must be empty to signify default.')
-            else:
-                if not isinstance(name_prefix, str):
-                    raise InvalidArguments('name_prefix must be a string.')
-                self.prefix = name_prefix
-                self.name_prefix_set = True
-        if 'name_suffix' in kwargs:
-            name_suffix = kwargs['name_suffix']
-            if isinstance(name_suffix, list):
-                if name_suffix:
-                    raise InvalidArguments('name_suffix array must be empty to signify default.')
-            else:
-                if not isinstance(name_suffix, str):
-                    raise InvalidArguments('name_suffix must be a string.')
-                if name_suffix == '':
-                    raise InvalidArguments('name_suffix should not be an empty string. '
-                                           'If you want meson to use the default behaviour '
-                                           'for each platform pass `[]` (empty array)')
-                self.suffix = name_suffix
-                self.name_suffix_set = True
+        if kwargs.get('name_prefix') is not None:
+            self.prefix = kwargs['name_prefix']
+            self.name_prefix_set = True
+        if kwargs.get('name_suffix') is not None:
+            self.suffix = kwargs['name_suffix']
+            self.name_suffix_set = True
         if isinstance(self, StaticLibrary):
             # You can't disable PIC on OS X. The compiler ignores -fno-PIC.
             # PIC is always on for Windows (all code is position-independent
@@ -1226,7 +1134,7 @@ def _extract_pic_pie(self, kwargs, arg: str, option: str):
             return True
 
         k = OptionKey(option)
-        if arg in kwargs:
+        if kwargs.get(arg) is not None:
             val = kwargs[arg]
         elif k in self.environment.coredata.options:
             val = self.environment.coredata.options[k].value
@@ -1778,7 +1686,6 @@ def get_subdir(self) -> str:
 
 
 class Executable(BuildTarget):
-    known_kwargs = known_exe_kwargs
 
     typename = 'executable'
 
@@ -1907,7 +1814,6 @@ def get_command(self) -> 'ImmutableListProtocol[str]':
         return self.outputs
 
 class StaticLibrary(BuildTarget):
-    known_kwargs = known_stlib_kwargs
 
     typename = 'static library'
 
@@ -1979,7 +1885,6 @@ def is_internal(self) -> bool:
         return not self.need_install
 
 class SharedLibrary(BuildTarget):
-    known_kwargs = known_shlib_kwargs
 
     typename = 'shared library'
 
@@ -2151,57 +2056,19 @@ def determine_filenames(self):
         if create_debug_file:
             self.debug_filename = os.path.splitext(self.filename)[0] + '.pdb'
 
-    @staticmethod
-    def _validate_darwin_versions(darwin_versions):
-        try:
-            if isinstance(darwin_versions, int):
-                darwin_versions = str(darwin_versions)
-            if isinstance(darwin_versions, str):
-                darwin_versions = 2 * [darwin_versions]
-            if not isinstance(darwin_versions, list):
-                raise InvalidArguments('Shared library darwin_versions: must be a string, integer,'
-                                       f'or a list, not {darwin_versions!r}')
-            if len(darwin_versions) > 2:
-                raise InvalidArguments('Shared library darwin_versions: list must contain 2 or fewer elements')
-            if len(darwin_versions) == 1:
-                darwin_versions = 2 * darwin_versions
-            for i, v in enumerate(darwin_versions[:]):
-                if isinstance(v, int):
-                    v = str(v)
-                if not isinstance(v, str):
-                    raise InvalidArguments('Shared library darwin_versions: list elements '
-                                           f'must be strings or integers, not {v!r}')
-                if not re.fullmatch(r'[0-9]+(\.[0-9]+){0,2}', v):
-                    raise InvalidArguments('Shared library darwin_versions: must be X.Y.Z where '
-                                           'X, Y, Z are numbers, and Y and Z are optional')
-                parts = v.split('.')
-                if len(parts) in {1, 2, 3} and int(parts[0]) > 65535:
-                    raise InvalidArguments('Shared library darwin_versions: must be X.Y.Z '
-                                           'where X is [0, 65535] and Y, Z are optional')
-                if len(parts) in {2, 3} and int(parts[1]) > 255:
-                    raise InvalidArguments('Shared library darwin_versions: must be X.Y.Z '
-                                           'where Y is [0, 255] and Y, Z are optional')
-                if len(parts) == 3 and int(parts[2]) > 255:
-                    raise InvalidArguments('Shared library darwin_versions: must be X.Y.Z '
-                                           'where Z is [0, 255] and Y, Z are optional')
-                darwin_versions[i] = v
-        except ValueError:
-            raise InvalidArguments('Shared library darwin_versions: value is invalid')
-        return darwin_versions
-
     def process_kwargs(self, kwargs):
         super().process_kwargs(kwargs)
 
         if not self.environment.machines[self.for_machine].is_android():
             # Shared library version
-            if 'version' in kwargs:
+            if 'version' in kwargs and kwargs['version'] is not None:
                 self.ltversion = kwargs['version']
                 if not isinstance(self.ltversion, str):
                     raise InvalidArguments('Shared library version needs to be a string, not ' + type(self.ltversion).__name__)
                 if not re.fullmatch(r'[0-9]+(\.[0-9]+){0,2}', self.ltversion):
                     raise InvalidArguments(f'Invalid Shared library version "{self.ltversion}". Must be of the form X.Y.Z where all three are numbers. Y and Z are optional.')
             # Try to extract/deduce the soversion
-            if 'soversion' in kwargs:
+            if 'soversion' in kwargs and kwargs['soversion'] is not None:
                 self.soversion = kwargs['soversion']
                 if isinstance(self.soversion, int):
                     self.soversion = str(self.soversion)
@@ -2213,14 +2080,14 @@ def process_kwargs(self, kwargs):
                 # number of the version by default.
                 self.soversion = self.ltversion.split('.')[0]
             # macOS, iOS and tvOS dylib compatibility_version and current_version
-            if 'darwin_versions' in kwargs:
-                self.darwin_versions = self._validate_darwin_versions(kwargs['darwin_versions'])
+            if 'darwin_versions' in kwargs and kwargs['darwin_versions'] is not None:
+                self.darwin_versions = kwargs['darwin_versions']
             elif self.soversion:
                 # If unspecified, pick the soversion
                 self.darwin_versions = 2 * [self.soversion]
 
         # Visual Studio module-definitions file
-        if 'vs_module_defs' in kwargs:
+        if kwargs.get('vs_module_defs') is not None:
             path = kwargs['vs_module_defs']
             if isinstance(path, str):
                 if os.path.isabs(path):
@@ -2239,7 +2106,7 @@ def process_kwargs(self, kwargs):
                     'a file object or a Custom Target')
             self.process_link_depends(path)
 
-        if 'rust_crate_type' in kwargs:
+        if 'rust_crate_type' in kwargs and kwargs['rust_crate_type'] is not None:
             rust_crate_type = kwargs['rust_crate_type']
             if isinstance(rust_crate_type, str):
                 self.rust_crate_type = rust_crate_type
@@ -2313,7 +2180,6 @@ def is_linkable_target(self):
 # A shared library that is meant to be used with dlopen rather than linking
 # into something else.
 class SharedModule(SharedLibrary):
-    known_kwargs = known_shmod_kwargs
 
     typename = 'shared module'
 
@@ -2683,7 +2549,6 @@ def __repr__(self):
         return repr_str.format(self.__class__.__name__, self.get_id())
 
 class Jar(BuildTarget):
-    known_kwargs = known_jar_kwargs
 
     typename = 'jar'
 

mesonbuild/coredata.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import copy
+
 from . import mlog, mparser
 import pickle, os, uuid
 import sys
@@ -896,7 +898,7 @@ def process_new_compiler(self, lang: str, comp: 'Compiler', env: 'Environment')
         for key in comp.base_options:
             if key in self.options:
                 continue
-            oobj = compilers.base_options[key]
+            oobj = copy.deepcopy(compilers.base_options[key])
             if key in env.options:
                 oobj.set_value(env.options[key])
                 enabled_opts.append(key)