Remove a few lingering StreamV3 vestiges

Signed-off-by: Merlin Mathesius <[email protected]>

Author: mmathesius

meson.build

@@ -198,7 +198,6 @@ if meson.version().version_compare('>=0.53')
 
     summary({'Developer Build': get_option('developer_build'),
              'libmagic Support': magic_status,
-             'Default Stream MD Version': default_stream_mdversion,
              'Custom Python': get_option('python_name'),
              'RPMIO Support': rpmio_status,
              'Generate Manpages': manpages_status,

meson_options.txt

@@ -17,9 +17,6 @@ option('developer_build', type : 'boolean', value : true,
 option('verbose_tests', type : 'boolean', value : true,
        description : 'Tests that are run under the "debug" configuration will print all debug messages. Disable this option for valgrind checks, as it speeds it up substantially.')
 
-option('default_stream_mdversion', type : 'integer', min : 2, max : 3, value : 2,
-       description : 'The default module stream metadata version to use.')
-
 option('libmagic', type : 'feature', value : 'enabled',
        description : 'Enables the use of libmagic to detect compression of YAML files.')
 

modulemd/include/modulemd-2.0/modulemd-module-stream.h

@@ -51,8 +51,6 @@ typedef struct _ModulemdModule ModulemdModule;
  * metadata format.
  * @MD_MODULESTREAM_VERSION_TWO: Represents v2 of the #ModulemdModuleStream
  * metadata format.
- * @MD_MODULESTREAM_VERSION_THREE: Represents v3 of the #ModulemdModuleStream
- * metadata format. Since: 2.10
  * @MD_MODULESTREAM_VERSION_LATEST: Represents the highest-supported version of
  * the #ModulemdModuleStream metadata format.
  *

modulemd/include/private/modulemd-module-stream-private.h

@@ -383,59 +383,6 @@ modulemd_module_stream_includes_nevra (ModulemdModuleStream *self,
                                        const gchar *nevra_pattern);
 
 
-/**
- * modulemd_module_stream_expand_v2_to_v3_deps:
- * @v2_stream: (in): A pointer to a #ModulemdModuleStreamV2 object that is to
- * have its dependencies expanded.
- * @error: (out): A #GError that will return the reason for an expansion error.
- *
- * Stream V2 dependencies can be a list of #ModulemdDependencies, each of which
- * consists of a list of buildtime and runtime modules, each of which can have
- * multiple streams specified. Stream V3 dependencies are much simpler compared
- * to Stream V2, and have just a single list of buildtime modules and single
- * list of runtime modules. Additionally, each dependent module in Stream V3 can
- * specify only a single stream. Furthermore, Stream V2 dependencies treated
- * "platform" the same as any other module dependency, while Stream V3
- * dependencies have "platform" as a seperate property.
- *
- * This function takes the Stream V2 dependencies and expands them into a
- * #GPtrArray of #ModulemdBuildConfig objects representing the flattened
- * combinations of module:stream dependencies, explicitly extracting
- * "platform" from the list of dependent modules and using it to set the
- * seperate "platform" property.
- *
- * Returns: (transfer full): A #GPtrArray of #ModulemdBuildConfig objects
- * containing the fully stream expanded version of @v2_stream, else NULL
- * if an error occurred and @error will be set accordingly.
- *
- * Since: 2.10
- */
-GPtrArray *
-modulemd_module_stream_expand_v2_to_v3_deps (ModulemdModuleStreamV2 *v2_stream,
-                                             GError **error);
-
-/**
- * modulemd_module_stream_upgrade_v2_to_v3_ext:
- * @from: (in): A pointer to a #ModulemdModuleStream object (must be
- * #ModulemdModuleStreamV2) that is to be upgraded to #ModulemdModuleStreamV3.
- * @error: (out): A #GError that will return the reason for an expansion error.
- *
- * This function takes @v2_stream and maps it into one or more
- * #ModulemdModuleStreamV3 objects representing the flattened combinations of
- * module:stream dependencies found in the #ModulemdModuleStreamV2 object,
- * along with explicitly setting the "platform" property. These
- * #ModulemdModuleStreamV3 objects are bundled together in a #ModulemdModule
- * object that is returned to the caller.
- *
- * Returns: (transfer full): A #ModulemdModule containing one or more #StreamV3
- * objects, else NULL if an error occured and @error will be set accordingly.
- *
- * Since: 2.10
- */
-ModulemdModule *
-modulemd_module_stream_upgrade_v2_to_v3_ext (ModulemdModuleStreamV2 *from,
-                                             GError **error);
-
 /**
  * modulemd_module_stream_set_autogen_module_name:
  * @self: (in): A pointer to a #ModulemdModuleStream object

modulemd/meson.build

@@ -17,7 +17,6 @@ skip_formatters = get_option('skip_formatters')
 skip_introspection = get_option('skip_introspection')
 developer_build = get_option('developer_build')
 verbose_tests = get_option('verbose_tests')
-default_stream_mdversion = get_option('default_stream_mdversion')
 
 if not developer_build
     skip_formatters = true
@@ -169,7 +168,6 @@ enums = gnome.mkenums_simple ('modulemd-enums', sources : modulemd_hdrs)
 
 cdata = configuration_data()
 cdata.set_quoted('LIBMODULEMD_VERSION', libmodulemd_version)
-cdata.set('DEFAULT_STREAM_MDVERSION', default_stream_mdversion)
 cdata.set('HAVE_RPMIO', rpm.found())
 cdata.set('HAVE_LIBMAGIC', magic.found())
 cdata.set('HAVE_GDATE_AUTOPTR', has_gdate_autoptr)