diff --git a/all.sh b/all.sh index 93af660c71f55a5e05f19fa18a9d6372eebe829f..098cb8936cff4d9d205ece99a71ffc8d7f304777 100755 --- a/all.sh +++ b/all.sh @@ -1,3 +1,7 @@ +#!/bin/bash + +set -e + for recipe in `ls -1 recipes` do ./cook.sh $recipe $* diff --git a/cook.sh b/cook.sh index d26cbcaf502edfbde355384f0163f74f969042c2..75f10427af610b36b88931f6be474a6372e239bc 100755 --- a/cook.sh +++ b/cook.sh @@ -61,17 +61,18 @@ function op { if [ "$(type -t recipe_stage)" = "function" ] then recipe_stage ../stage - fi - #TODO xargo install --root "../stage" $CARGOFLAGS - bins="$(find target/x86_64-unknown-redox/release/ -maxdepth 1 -type f ! -name '*.*')" - if [ -n "$bins" ] - then - mkdir -p ../stage/bin - for bin in $bins - do - cp -v "$bin" "../stage/bin/$(basename $bin)" - strip -v "../stage/bin/$(basename $bin)" - done + else + #TODO xargo install --root "../stage" $CARGOFLAGS + bins="$(find target/$TARGET/release/ -maxdepth 1 -type f ! -name '*.*')" + if [ -n "$bins" ] + then + mkdir -p ../stage/bin + for bin in $bins + do + cp -v "$bin" "../stage/bin/$(basename $bin)" + strip -v "../stage/bin/$(basename $bin)" + done + fi fi popd > /dev/null ;; diff --git a/jenkins.sh b/jenkins.sh index 8873ad61686022d2ec73a8586204352ea03fa2da..dc70f68d106cad1bc54478cd997ce5845a6e259d 100755 --- a/jenkins.sh +++ b/jenkins.sh @@ -1 +1,7 @@ -./all.sh distclean dist publish +#!/bin/bash + +set -e + +./all.sh distclean +./all.sh dist +./all.sh publish diff --git a/recipes/pixelcannon/recipe.sh b/recipes/pixelcannon/recipe.sh index 66b84aa624efd61d51ec8315cc44047e0979ecd1..257527bc3caf64773cdad8fae75164f6bdc28a72 100644 --- a/recipes/pixelcannon/recipe.sh +++ b/recipes/pixelcannon/recipe.sh @@ -5,4 +5,6 @@ function recipe_stage { cp -Rv assets "$1/apps/pixelcannon" mkdir -pv "$1/ui/apps" cp -v manifest "$1/ui/apps/pixelcannon" + mkdir -pv "$1/ui/bin" + cp -v "target/$TARGET/release/pixelcannon" "$1/ui/bin" }