[util, sw/host] Add cargo fmt to build scripts
To prevent of compilation on unformatted Rust code
build scripts where extended with 'cargo fmt' invocations.
During compilation of unformatted code build scripts will return
error. Also output will contain diff with description where and
how formatting should be corrected.
Signed-off-by: Michał Mazurek <maz@semihalf.com>
diff --git a/sw/host/opentitansession/meson.build b/sw/host/opentitansession/meson.build
index 6d90101..16b26ca 100644
--- a/sw/host/opentitansession/meson.build
+++ b/sw/host/opentitansession/meson.build
@@ -22,6 +22,20 @@
cargo_flags += '--' + flag + ' '
endforeach
+# CARGO FMT FLAGS:
+# These flags will only be used for checking code formatting
+cargo_fmt_flags_array = [
+ 'verbose',
+ 'all',
+ 'manifest-path=' + manifest_path,
+ 'check',
+]
+
+cargo_fmt_flag = ''
+foreach flag : cargo_fmt_flags_array
+ cargo_fmt_flag += '--' + flag + ' '
+endforeach
+
# RUSTFLAGS:
# These flags will apply to all the dependencies, as well as the final
# binary. Linker and linker flavor amongst other things can be passed through
@@ -39,6 +53,7 @@
cargo_invoke_cmd,
cargo,
cargo_flags,
+ cargo_fmt_flag,
rust_flags,
meson.project_source_root(),
meson.project_build_root(),
diff --git a/sw/host/opentitantool/meson.build b/sw/host/opentitantool/meson.build
index 7227583..5d27509 100644
--- a/sw/host/opentitantool/meson.build
+++ b/sw/host/opentitantool/meson.build
@@ -22,6 +22,20 @@
cargo_flags += '--' + flag + ' '
endforeach
+# CARGO FMT FLAGS:
+# These flags will only be used for checking code formatting
+cargo_fmt_flags_array = [
+ 'verbose',
+ 'all',
+ 'manifest-path=' + manifest_path,
+ 'check',
+]
+
+cargo_fmt_flag = ''
+foreach flag : cargo_fmt_flags_array
+ cargo_fmt_flag += '--' + flag + ' '
+endforeach
+
# RUSTFLAGS:
# These flags will apply to all the dependencies, as well as the final
# binary. Linker and linker flavor amongst other things can be passed through
@@ -39,6 +53,7 @@
cargo_invoke_cmd,
cargo,
cargo_flags,
+ cargo_fmt_flag,
rust_flags,
meson.project_source_root(),
meson.project_build_root(),
diff --git a/sw/host/rom_ext_image_tools/signer/meson.build b/sw/host/rom_ext_image_tools/signer/meson.build
index 38caede..2a61d0c 100644
--- a/sw/host/rom_ext_image_tools/signer/meson.build
+++ b/sw/host/rom_ext_image_tools/signer/meson.build
@@ -22,6 +22,20 @@
cargo_flags += '--' + flag + ' '
endforeach
+# CARGO FMT FLAGS:
+# These flags will only be used for checking code formatting
+cargo_fmt_flags_array = [
+ 'verbose',
+ 'all',
+ 'manifest-path=' + manifest_path,
+ 'check',
+]
+
+cargo_fmt_flag = ''
+foreach flag : cargo_fmt_flags_array
+ cargo_fmt_flag += '--' + flag + ' '
+endforeach
+
# RUSTFLAGS:
# These flags will apply to all the dependencies, as well as the final
# binary. Linker and linker flavor amongst other things can be passed through
@@ -48,6 +62,7 @@
cargo_invoke_cmd,
cargo,
cargo_flags,
+ cargo_fmt_flag,
rust_flags,
'',
meson.project_source_root(),
diff --git a/util/invoke_cargo.sh b/util/invoke_cargo.sh
index 0f87787..dd83006 100755
--- a/util/invoke_cargo.sh
+++ b/util/invoke_cargo.sh
@@ -11,20 +11,23 @@
CARGO="${1}"
CARGO_FLAGS="${2}"
-export RUSTFLAGS="${3}"
+CARGO_FMT_FLAG="${3}"
+export RUSTFLAGS="${4}"
-TOOLCHAIN_FILE="${4}"
+TOOLCHAIN_FILE="${5}"
if [[ -f $TOOLCHAIN_FILE ]]; then
TOOLCHAIN="$(cat ${TOOLCHAIN_FILE})"
fi
-export MESON_SOURCE_ROOT="${5}"
-export MESON_BUILD_ROOT="${6}"
+export MESON_SOURCE_ROOT="${6}"
+export MESON_BUILD_ROOT="${7}"
if [ "${CARGO_TEST}" == 1 ]; then
echo "CARGO TEST BUILD!"
+ "${CARGO}" fmt ${CARGO_FMT_FLAG}
"${CARGO}" +"${TOOLCHAIN}" test ${CARGO_FLAGS} --workspace
"${CARGO}" +"${TOOLCHAIN}" build ${CARGO_FLAGS}
else
+ "${CARGO}" fmt ${CARGO_FMT_FLAG}
"${CARGO}" +"${TOOLCHAIN}" build ${CARGO_FLAGS}
fi
