diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.com> | 2020-01-07 09:10:12 +0300 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.com> | 2020-01-07 11:36:14 +0300 |
commit | accd10dfea086104ae1119ba85c43d2b5ad4bd81 (patch) | |
tree | 8f19ca7b89dcd5693932ee0313e387a121df21a6 /cargo_wrapper.py | |
parent | aa40eae58176f7e263dc9cd0bb45f8ab5da1e625 (diff) |
meson: add 'command' argument to cargo wrapper
Will be used to add test support.
Diffstat (limited to 'cargo_wrapper.py')
-rw-r--r-- | cargo_wrapper.py | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/cargo_wrapper.py b/cargo_wrapper.py index 85fd874d..1ffce188 100644 --- a/cargo_wrapper.py +++ b/cargo_wrapper.py @@ -7,7 +7,8 @@ import shutil import subprocess import sys -meson_build_dir, meson_current_source_dir, meson_build_root, target, ext, exclude = sys.argv[1:] +command, meson_build_dir, meson_current_source_dir, meson_build_root, target, ext, exclude = sys.argv[ + 1:] cargo_target_dir = os.path.join(meson_build_dir, 'target') @@ -25,12 +26,16 @@ pkg_config_path.append(os.path.join( meson_build_root, 'subprojects', 'gst-plugins-base', 'pkgconfig')) env['PKG_CONFIG_PATH'] = ':'.join(pkg_config_path) -# cargo build -cargo_cmd = ['cargo', 'build', '--manifest-path', - os.path.join(meson_current_source_dir, 'Cargo.toml'), - '--workspace'] -if target == 'release': - cargo_cmd.append('--release') +if command == 'build': + # cargo build + cargo_cmd = ['cargo', 'build', '--manifest-path', + os.path.join(meson_current_source_dir, 'Cargo.toml'), + '--workspace'] + if target == 'release': + cargo_cmd.append('--release') +else: + print("Unknown command:", command) + sys.exit(1) if len(exclude) > 0: for e in exclude.split(','): @@ -42,6 +47,7 @@ try: except subprocess.SubprocessError: sys.exit(1) -# Copy so files to build dir -for f in glob.glob(os.path.join(cargo_target_dir, target, '*.' + ext)): - shutil.copy(f, meson_build_dir) +if command == 'build': + # Copy so files to build dir + for f in glob.glob(os.path.join(cargo_target_dir, target, '*.' + ext)): + shutil.copy(f, meson_build_dir) |