From fa92725782516e5cf1e69f3a727529380228b2ff Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Wed, 28 Dec 2016 20:09:03 -0700
Subject: [PATCH] Update pixelcannon recipe
---
all.sh | 4 ++++
cook.sh | 23 ++++++++++++-----------
jenkins.sh | 8 +++++++-
recipes/pixelcannon/recipe.sh | 2 ++
4 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/all.sh b/all.sh
index 93af660c7..098cb8936 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 d26cbcaf5..75f10427a 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 8873ad616..dc70f68d1 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 66b84aa62..257527bc3 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"
}
--
GitLab