From 512f5ce14d9c1888fab72bc8dc2515733ffa39fe Mon Sep 17 00:00:00 2001 From: Oleg Sheynin Date: Thu, 31 Oct 2024 23:35:41 -0400 Subject: [PATCH] build for cvtt-rust uses cargo install --- build/build_release.sh | 27 +++++++++++---------------- release_version.txt | 2 +- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/build/build_release.sh b/build/build_release.sh index 794918e..ef2a131 100755 --- a/build/build_release.sh +++ b/build/build_release.sh @@ -169,24 +169,19 @@ cmd_arr+=("${Cmd}") SourceLoc=../${project} if [ "${project}" == "cvtt-rust" ]; then - Cmd="cd ${dist_root}/${project}/" - cmd_arr+=("${Cmd}") - # cmd_arr+=("cargo build") - cmd_arr+=("cargo build --release") - cmd_arr+=("mkdir -p ./dist/release") - pushd ${dist_root}/${project}/ - rust_bins=$(rust_binaries) - rust_libs=$(rust_libraries) - popd - for bin in ${rust_bins[@]}; do - cmd_arr+=("cp target/release/${bin} ./dist/release") - done - for lb in ${rust_libs[@]}; do - cmd_arr+=("cp target/release/${lb} ./dist/release") - done + cmd_arr+=("cd ${prj_dir}") + + cmd_arr+=("mkdir -p ${prj_dir}/dist/release") cmd_arr+=("cp release_version.txt ./dist/release") - SourceLoc=../${project}/dist/release + jq_cmd="jq '.packages[] | select(.targets[].kind[] == \"bin\") | .name'" + apps=$(cargo metadata --no-deps --format-version 1 --manifest-path=${prj_dir}/Cargo.toml | eval $jq_cmd | uniq) + for app in ${apps[@]}; do + app=${app//\"/} # remove quotes + cmd_arr+=("cargo install --root ${prj_dir}/dist/release --path ${prj_dir}/apps/${app}") + done + + SourceLoc=${prj_dir}/dist/release fi dist_path="${dist_root}/${project}/${release_version}" diff --git a/release_version.txt b/release_version.txt index e69550c..2db813a 100644 --- a/release_version.txt +++ b/release_version.txt @@ -1 +1 @@ -1.7.9,build for cvtt-rust +1.8.1,build for cvtt-rust uses cargo install