Skip to content
Snippets Groups Projects
Verified Commit ab95a716 authored by jD91mZM2's avatar jD91mZM2
Browse files

New flag: Enable example binaries alongside using EXAMPLES=1

parent 1e812da7
No related branches found
No related tags found
1 merge request!213New flag: Enable example binaries alongside using EXAMPLES=1
...@@ -10,6 +10,7 @@ export CARGO=(env RUSTFLAGS="$PREFIX_RUSTFLAGS" xargo) ...@@ -10,6 +10,7 @@ export CARGO=(env RUSTFLAGS="$PREFIX_RUSTFLAGS" xargo)
export CARGOBUILD=rustc export CARGOBUILD=rustc
export CARGOFLAGS= export CARGOFLAGS=
export DEBUG= export DEBUG=
export EXAMPLES=
export PREPARE_COPY=1 export PREPARE_COPY=1
if [ ! "$(uname -s)" = "Redox" ] if [ ! "$(uname -s)" = "Redox" ]
...@@ -355,6 +356,7 @@ function op { ...@@ -355,6 +356,7 @@ function op {
op $1 unstage op $1 unstage
mkdir -p stage mkdir -p stage
stage="$(realpath stage)" stage="$(realpath stage)"
source="$(realpath source)"
pushd build > /dev/null pushd build > /dev/null
skip=0 skip=0
if [ "$(type -t recipe_stage)" = "function" ] if [ "$(type -t recipe_stage)" = "function" ]
...@@ -372,15 +374,15 @@ function op { ...@@ -372,15 +374,15 @@ function op {
fi fi
bins="$(find target/$TARGET/$build/ -maxdepth 1 -type f ! -name '*.*')" bins="$(find target/$TARGET/$build/ -maxdepth 1 -type f ! -name '*.*')"
if [ -z "$bins" ] if [ -z "$bins" ] || [ "$EXAMPLES" == 1 ]
then then
example=true example=true
bins="$(find target/$TARGET/$build/examples/ -maxdepth 1 -type f ! -name '*.*' ! -name '*-*' \ bins="$bins $(find target/$TARGET/$build/examples/ -maxdepth 1 -type f ! -name '*.*' ! -name '*-*' \
2> /dev/null || true)" 2> /dev/null || true)"
fi fi
if [ -n "$bins" ] if [ -n "$bins" ]
then then
if [ -n "$example" ] if [ -n "$example" ] && [ "$EXAMPLES" != 1 ]
then then
echo "$(tput bold)Note$(tput sgr0): No binaries detected, using example binaries" echo "$(tput bold)Note$(tput sgr0): No binaries detected, using example binaries"
fi fi
...@@ -398,7 +400,7 @@ function op { ...@@ -398,7 +400,7 @@ function op {
echo "$(tput bold)Warning$(tput sgr0): Recipe does not have any binaries" >&2 echo "$(tput bold)Warning$(tput sgr0): Recipe does not have any binaries" >&2
fi fi
docgen ../source ../stage/ref docgen "$source" "$stage/ref"
fi fi
popd > /dev/null popd > /dev/null
;; ;;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment