[vlc-commits] [Git][videolan/vlc][master] meson: rust: remove vlcrs-core and macro cargo dependency

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
89b9586a by Vikram Kangotra at 2024-09-05T13:50:32+00:00
meson: rust: remove vlcrs-core and macro cargo dependency

Since `vlcrs-core` and the macro have been moved to `src/rust`,
we no longer need these dependencies in the `meson.build` file.

- - - - -


1 changed file:

- modules/meson.build


Changes:

=====================================
modules/meson.build
=====================================
@@ -427,63 +427,6 @@ if get_option('rust').enabled()
             '--config', f'source.vendored-sources.directory="@vendored_rust_deps_sources@"']
     endif
 
-    vlcrs_core = custom_target('vlcrs_core-cargo',
-        capture: false,
-        console: true,
-        build_by_default: true,
-        input: files(
-            'vlcrs-core/Cargo.toml',
-            'vlcrs-core/src/error.rs',
-            'vlcrs-core/src/input_item.rs',
-            'vlcrs-core/src/lib.rs',
-            'vlcrs-core/src/messages.rs',
-            'vlcrs-core/src/module/args.rs',
-            'vlcrs-core/src/module/capi.rs',
-            'vlcrs-core/src/module.rs',
-            'vlcrs-core/src/object.rs',
-            'vlcrs-core/src/tick.rs',
-            'vlcrs-core/src/url.rs',
-            'vlcrs-core/sys/build.rs',
-            'vlcrs-core/sys/Cargo.toml',
-            'vlcrs-core/sys/src/lib.rs',
-            'vlcrs-core/sys/wrapper.h',
-        ),
-        output: 'libvlcrs_core.rlib',
-        depfile: 'libvlcrs_core.d',
-        depends: module_cargo_depends,
-        env: {
-          'RUSTFLAGS': rust_flags,
-          'CARGO_TARGET_DIR': cargo_target_dir
-        },
-        command: [cargo_output, '--output', '@OUTDIR@', '--depfile',
-            cargo_bin, 'build', '--locked', extra_cargo_args,
-            '--manifest-path', files('Cargo.toml'),
-            '-p', 'vlcrs-core']
-    )
-    vlcrs_core_macros = custom_target('vlcrs_core_macros-cargo',
-        capture: false,
-        console: true,
-        build_by_default: true,
-        input: files(
-            'vlcrs-core/macros/Cargo.toml',
-            'vlcrs-core/macros/src/lib.rs',
-            'vlcrs-core/macros/src/module.rs',
-        ),
-        depfile: 'libvlcrs_core_macros.d',
-        output: 'libvlcrs_core_macros.so',
-        depends: module_cargo_depends,
-        env: {
-          'RUSTFLAGS': rust_flags,
-          'CARGO_TARGET_DIR': cargo_target_dir
-        },
-        command: [cargo_output, '--output', '@OUTDIR@', '--depfile',
-            cargo_bin, 'build', '--locked', extra_cargo_args,
-            '--manifest-path', files('Cargo.toml'),
-            '-p', 'vlcrs-core-macros']
-    )
-
-    module_cargo_depends += [vlcrs_core, vlcrs_core_macros]
-
     foreach module : vlc_rust_modules
         if not module.has_key('name')
             error('Got invalid vlc_rust_modules entry without \'name\' key')



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/89b9586ab0dc650a43a20c004c0bb1fb4d002f01

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/89b9586ab0dc650a43a20c004c0bb1fb4d002f01
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance