Merge pull request #4966 from reneme/feature/module_wildcards

Author: reneme

configure.py

@@ -2442,6 +2442,8 @@ def __init__(self, modules, module_policy, archinfo, osinfo, ccinfo, cc_min_vers
         self._not_using_because = collections.defaultdict(set)
 
         ModulesChooser._validate_dependencies_exist(self._modules)
+        self._options.enabled_modules = ModulesChooser._expand_wildcards_in_user_selection(self._modules, self._options.enabled_modules)
+        self._options.disabled_modules = ModulesChooser._expand_wildcards_in_user_selection(self._modules, self._options.disabled_modules)
         ModulesChooser._validate_user_selection(
             self._modules, self._options.enabled_modules, self._options.disabled_modules)
 
@@ -2519,6 +2521,21 @@ def _validate_dependencies_exist(modules):
         for module in modules.values():
             module.dependencies_exist(modules)
 
+    @staticmethod
+    def _expand_wildcards_in_user_selection(modules, user_selected_modules):
+        valid_module_name_with_wildcard = re.compile(r'^[a-z0-9_*]+$')
+        public_modules = [modname for modname, modinfo in modules.items() if modinfo.is_public()]
+        def expand(user_selected_module):
+            if not valid_module_name_with_wildcard.match(user_selected_module):
+                logging.error("Invalid module name with wildcard: %s", user_selected_module)
+                return []
+            regex_from_wildcards = re.compile("^%s$" % user_selected_module.replace('*', '[a-z0-9_]+'))
+            matching_modules = [mod for mod in public_modules if regex_from_wildcards.match(mod)]
+            if not matching_modules:
+                logging.warning("Wildcard '%s' did not match any modules", user_selected_module)
+            return matching_modules
+        return flatten([expand(mod) if '*' in mod else [mod] for mod in user_selected_modules])
+
     @staticmethod
     def _validate_user_selection(modules, enabled_modules, disabled_modules):
         for modname in enabled_modules:

doc/building.rst

@@ -608,8 +608,11 @@ Minimized Builds
 Many developers wish to configure a minimized build which contains only the
 specific features their application will use. In general this is straighforward:
 use ``--minimized-build`` plus ``--enable-modules=`` to enable the specific modules
-you wish to use. Any such configurations should build and pass the tests; if you
-encounter a case where it doesn't please file an issue.
+you wish to use. It is possible to use an asterisk (``*``) as a wildcard for
+related modules. For instance to enable all available AES implementations, use
+``--enable-modules='aes*'`` which will enable ``aes_ni``, ``aes_power8``, etc.
+Any such configurations should build and pass the tests; if you encounter a case
+where it doesn't please file an issue.
 
 The only trick is knowing which features you want to enable. The most common
 difficulty comes with entropy sources. By default, none are enabled, which means

src/scripts/ci_build.py

@@ -231,7 +231,7 @@ def sanitize_kv(some_string):
         flags += ['--extra-cxxflags=/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR']
 
     if target in ['minimized']:
-        flags += ['--minimized-build', '--enable-modules=system_rng,sha2_32,sha2_64,aes']
+        flags += ['--minimized-build', '--enable-modules=system_rng,sha2*,aes']
 
     if target in ['no_pcurves']:
         flags += ['--disable-modules=pcurves_impl']