Skip to content

Commit 12d3d0d

Browse files
committed
Fully integrate rust-argparse into refivar
Upstream repositories are in "maintenance-only" mode and are not accepting pull requests that contain new features. Therefore, any additional features added to assist in refivar development will not be accepted.
1 parent 76b7252 commit 12d3d0d

36 files changed

+11
-11
lines changed

meson.build

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,16 @@ project('refivar', 'rust',
33
default_options : ['warning_level=3'])
44

55

6-
# Third-party libraries
7-
tp_r_lib_argparse = subproject('rust-argparse-v0.2.2_p20230209').get_variable('tp_r_lib_rust_argparse')
6+
r_lib_argparse = static_library('argparse', 'src/lib/rust-argparse/src/lib.rs',
7+
rust_crate_type: 'lib', install: false)
88

9-
r_lib_efivar = static_library('efivar', 'src/lib/efivar/mod.rs', rust_crate_type: 'lib', install: false)
10-
#a_lib_efivar = static_library('efivar', 'efivar.rs', rust_crate_type: 'staticlib', install : true)
11-
#so_lib_efivar = shared_library('efivar', 'efivar.rs', rust_crate_type: 'cdylib', install : true)
9+
r_lib_efivar = static_library('efivar', 'src/lib/efivar/mod.rs',
10+
rust_crate_type: 'lib', install: false)
1211

13-
executable('efivar', 'src/bin/efivar.rs', link_with: [r_lib_efivar, tp_r_lib_argparse], install: true)
12+
# static_library('efivar', 'efivar.rs', rust_crate_type: 'staticlib',
13+
# install : true)
14+
# shared_library('efivar', 'efivar.rs', rust_crate_type: 'cdylib',
15+
# install : true)
16+
17+
executable('efivar', 'src/bin/efivar.rs',
18+
link_with: [r_lib_efivar, r_lib_argparse], install: true)

subprojects/rust-argparse-v0.2.2_p20230209/.gitignore renamed to src/lib/rust-argparse/.gitignore

File renamed without changes.

subprojects/rust-argparse-v0.2.2_p20230209/.travis.yml renamed to src/lib/rust-argparse/.travis.yml

File renamed without changes.

subprojects/rust-argparse-v0.2.2_p20230209/Cargo.toml renamed to src/lib/rust-argparse/Cargo.toml

File renamed without changes.

subprojects/rust-argparse-v0.2.2_p20230209/LICENSE renamed to src/lib/rust-argparse/LICENSE

File renamed without changes.

subprojects/rust-argparse-v0.2.2_p20230209/README.rst renamed to src/lib/rust-argparse/README.rst

File renamed without changes.

subprojects/rust-argparse-v0.2.2_p20230209/bulk.yaml renamed to src/lib/rust-argparse/bulk.yaml

File renamed without changes.
File renamed without changes.

subprojects/rust-argparse-v0.2.2_p20230209/examples/structure.rs renamed to src/lib/rust-argparse/examples/structure.rs

File renamed without changes.

subprojects/rust-argparse-v0.2.2_p20230209/examples/subcommands.rs renamed to src/lib/rust-argparse/examples/subcommands.rs

File renamed without changes.

0 commit comments

Comments
 (0)