codegen: Clean up rust crate handling

taiki-e · Aug 4, 2023 · 94d8a59 · 94d8a59
1 parent 8e67e37
commit 94d8a59
Show file tree

Hide file tree

Showing 55 changed files with 97 additions and 64 deletions.
diff --git a/main.sh b/main.sh
@@ -152,6 +152,7 @@ read_manifest() {
     local tool="$1"
     local version="$2"
     local manifest
+    rust_crate=$(jq -r ".rust_crate" "${manifest_dir}/${tool}.json")
     manifest=$(jq -r ".\"${version}\"" "${manifest_dir}/${tool}.json")
     if [[ "${manifest}" == "null" ]]; then
         download_info="null"
@@ -220,15 +221,14 @@ read_download_info() {
         template=$(jq -r ".template.${host_platform}" "${manifest_dir}/${tool}.json")
         url=$(jq <<<"${template}" -r '.url')
         url="${url//\$\{version\}/${exact_version}}"
-        bin_dir=$(jq <<<"${template}" -r '.bin_dir')
-        bin_dir="${bin_dir//\$\{version\}/${exact_version}}"
         bin_in_archive=$(jq <<<"${template}" -r '.bin')
         bin_in_archive="${bin_in_archive//\$\{version\}/${exact_version}}"
     else
-        bin_dir=$(jq <<<"${download_info}" -r '.bin_dir')
         bin_in_archive=$(jq <<<"${download_info}" -r '.bin')
     fi
-    if [[ "${bin_dir}" == "null" ]]; then
+    if [[ "${rust_crate}" == "null" ]]; then
+        bin_dir="/usr/local/bin"
+    else
         bin_dir="${cargo_bin}"
     fi
     if [[ "${bin_in_archive}" == "null" ]]; then
@@ -563,10 +563,13 @@ for tool in "${tools[@]}"; do
             # Use cargo-binstall fallback if tool is available but the specified version not available.
             read_manifest "${tool}" "${version}"
             if [[ "${download_info}" == "null" ]]; then
+                if [[ "${rust_crate}" == "null" ]]; then
+                    bail "${tool}@${version} for '${host_os}' is not supported"
+                fi
                 warn "${tool}@${version} for '${host_os}' is not supported; fallback to cargo-binstall"
                 case "${version}" in
-                    latest) unsupported_tools+=("${tool}") ;;
-                    *) unsupported_tools+=("${tool}@${version}") ;;
+                    latest) unsupported_tools+=("${rust_crate}") ;;
+                    *) unsupported_tools+=("${rust_crate}@${version}") ;;
                 esac
                 continue
             fi

diff --git a/manifests/cargo-binstall.json b/manifests/cargo-binstall.json
diff --git a/manifests/cargo-careful.json b/manifests/cargo-careful.json
diff --git a/manifests/cargo-deny.json b/manifests/cargo-deny.json
diff --git a/manifests/cargo-dinghy.json b/manifests/cargo-dinghy.json
diff --git a/manifests/cargo-hack.json b/manifests/cargo-hack.json
diff --git a/manifests/cargo-llvm-cov.json b/manifests/cargo-llvm-cov.json
diff --git a/manifests/cargo-make.json b/manifests/cargo-make.json
diff --git a/manifests/cargo-minimal-versions.json b/manifests/cargo-minimal-versions.json
diff --git a/manifests/cargo-nextest.json b/manifests/cargo-nextest.json
diff --git a/manifests/cargo-no-dev-deps.json b/manifests/cargo-no-dev-deps.json
diff --git a/manifests/cargo-tarpaulin.json b/manifests/cargo-tarpaulin.json
diff --git a/manifests/cargo-udeps.json b/manifests/cargo-udeps.json
diff --git a/manifests/cargo-valgrind.json b/manifests/cargo-valgrind.json
diff --git a/manifests/cross.json b/manifests/cross.json
diff --git a/manifests/dprint.json b/manifests/dprint.json
diff --git a/manifests/grcov.json b/manifests/grcov.json
diff --git a/manifests/just.json b/manifests/just.json
diff --git a/manifests/mdbook-linkcheck.json b/manifests/mdbook-linkcheck.json
diff --git a/manifests/mdbook.json b/manifests/mdbook.json
diff --git a/manifests/parse-changelog.json b/manifests/parse-changelog.json
diff --git a/manifests/protoc.json b/manifests/protoc.json
diff --git a/manifests/shellcheck.json b/manifests/shellcheck.json
diff --git a/manifests/shfmt.json b/manifests/shfmt.json
diff --git a/manifests/syft.json b/manifests/syft.json
diff --git a/manifests/wasm-pack.json b/manifests/wasm-pack.json
diff --git a/manifests/wasmtime.json b/manifests/wasmtime.json
diff --git a/manifests/zola.json b/manifests/zola.json
diff --git a/tools/codegen/base/cargo-binstall.json b/tools/codegen/base/cargo-binstall.json
@@ -1,6 +1,7 @@
 {
   "repository": "https://github.com/cargo-bins/cargo-binstall",
   "tag_prefix": "v",
+  "rust_crate": "${package}",
   "asset_name": "${package}-${rust_target}.tgz",
   "version_range": "latest",
   "platform": {

diff --git a/tools/codegen/base/cargo-careful.json b/tools/codegen/base/cargo-careful.json
@@ -1,6 +1,7 @@
 {
   "repository": "https://github.com/RalfJung/cargo-careful",
   "tag_prefix": "v",
+  "rust_crate": "${package}",
   "asset_name": "${package}.${rust_target}",
   "platform": {
     "x86_64_linux_musl": {},

diff --git a/tools/codegen/base/cargo-deny.json b/tools/codegen/base/cargo-deny.json
@@ -1,6 +1,7 @@
 {
   "repository": "https://github.com/EmbarkStudios/cargo-deny",
   "tag_prefix": "",
+  "rust_crate": "${package}",
   "asset_name": "${package}-${version}-${rust_target}.tar.gz",
   "bin": "${package}-${version}-${rust_target}/${package}${exe}",
   "platform": {

diff --git a/tools/codegen/base/cargo-dinghy.json b/tools/codegen/base/cargo-dinghy.json
@@ -1,6 +1,7 @@
 {
   "repository": "https://github.com/sonos/dinghy",
   "tag_prefix": "",
+  "rust_crate": "${package}",
   "asset_name": "${package}-${os_name}-${version}.tgz",
   "bin": "${package}-${version}/${package}${exe}",
   "platform": {

diff --git a/tools/codegen/base/cargo-hack.json b/tools/codegen/base/cargo-hack.json
@@ -1,6 +1,7 @@
 {
   "repository": "https://github.com/taiki-e/cargo-hack",
   "tag_prefix": "v",
+  "rust_crate": "${package}",
   "asset_name": [
     "${package}-${rust_target}.tar.gz",
     "${package}-v${version}-${rust_target}.tar.gz"

diff --git a/tools/codegen/base/cargo-llvm-cov.json b/tools/codegen/base/cargo-llvm-cov.json
@@ -1,6 +1,7 @@
 {
   "repository": "https://github.com/taiki-e/cargo-llvm-cov",
   "tag_prefix": "v",
+  "rust_crate": "${package}",
   "asset_name": "${package}-${rust_target}.tar.gz",
   "platform": {
     "x86_64_linux_musl": {},

diff --git a/tools/codegen/base/cargo-make.json b/tools/codegen/base/cargo-make.json
@@ -1,6 +1,7 @@
 {
   "repository": "https://github.com/sagiegurari/cargo-make",
   "tag_prefix": "",
+  "rust_crate": "${package}",
   "asset_name": "${package}-v${version}-${rust_target}.zip",
   "bin": "${package}-v${version}-${rust_target}/${package}${exe}",
   "platform": {

diff --git a/tools/codegen/base/cargo-minimal-versions.json b/tools/codegen/base/cargo-minimal-versions.json
@@ -1,6 +1,7 @@
 {
   "repository": "https://github.com/taiki-e/cargo-minimal-versions",
   "tag_prefix": "v",
+  "rust_crate": "${package}",
   "asset_name": "${package}-${rust_target}.tar.gz",
   "platform": {
     "x86_64_linux_musl": {},

diff --git a/tools/codegen/base/cargo-nextest.json b/tools/codegen/base/cargo-nextest.json
@@ -1,6 +1,7 @@
 {
   "repository": "https://github.com/nextest-rs/nextest",
   "tag_prefix": "cargo-nextest-",
+  "rust_crate": "${package}",
   "asset_name": "${package}-${version}-${rust_target}.tar.gz",
   "platform": {
     "x86_64_linux_gnu": {},

diff --git a/tools/codegen/base/cargo-no-dev-deps.json b/tools/codegen/base/cargo-no-dev-deps.json
@@ -1,6 +1,7 @@
 {
   "repository": "https://github.com/taiki-e/cargo-no-dev-deps",
   "tag_prefix": "v",
+  "rust_crate": "${package}",
   "asset_name": "${package}-${rust_target}.tar.gz",
   "platform": {
     "x86_64_linux_musl": {},

diff --git a/tools/codegen/base/cargo-tarpaulin.json b/tools/codegen/base/cargo-tarpaulin.json
@@ -1,6 +1,7 @@
 {
   "repository": "https://github.com/xd009642/tarpaulin",
   "tag_prefix": "",
+  "rust_crate": "${package}",
   "asset_name": "${package}-${rust_target}.tar.gz",
   "version_range": "> 0.22.0",
   "platform": {

diff --git a/tools/codegen/base/cargo-udeps.json b/tools/codegen/base/cargo-udeps.json
@@ -1,6 +1,7 @@
 {
   "repository": "https://github.com/est31/cargo-udeps",
   "tag_prefix": "v",
+  "rust_crate": "${package}",
   "asset_name": "${package}-v${version}-${rust_target}.tar.gz",
   "bin": "./${package}-v${version}-${rust_target}/${package}${exe}",
   "platform": {

diff --git a/tools/codegen/base/cargo-valgrind.json b/tools/codegen/base/cargo-valgrind.json
@@ -1,6 +1,7 @@
 {
   "repository": "https://github.com/jfrimmel/cargo-valgrind",
   "tag_prefix": "v",
+  "rust_crate": "${package}",
   "asset_name": "${package}-${version}-${rust_target}.tar.gz",
   "platform": {
     "x86_64_linux_musl": {},

diff --git a/tools/codegen/base/cross.json b/tools/codegen/base/cross.json
@@ -1,6 +1,7 @@
 {
   "repository": "https://github.com/cross-rs/cross",
   "tag_prefix": "v",
+  "rust_crate": "${package}",
   "asset_name": [
     "${package}-${rust_target}.tar.gz",
     "${package}-v${version}-${rust_target}.tar.gz"

diff --git a/tools/codegen/base/dprint.json b/tools/codegen/base/dprint.json
@@ -1,6 +1,7 @@
 {
   "repository": "https://github.com/dprint/dprint",
   "tag_prefix": "",
+  "rust_crate": "${package}",
   "asset_name": "${package}-${rust_target}.zip",
   "platform": {
     "x86_64_linux_gnu": {},