s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'shel' into 'master'

Browse Source 
cargo.sh fixes

Closes #118

See merge request Librem5/squeekboard!182
This commit is contained in:
David Boddie
2019-09-27 15:18:10 +00:00
parent 32b85e75db 0985724b19
commit 35ba8ad81c
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cargo.sh
View File

@ -6,18 +6,19 @@
set -e set -e
SCRIPT_PATH=`realpath $0` SCRIPT_PATH="$(realpath "$0")"
SOURCE_DIR=`dirname $0` SOURCE_DIR="$(dirname "$SCRIPT_PATH")"
export CARGO_TARGET_DIR=`pwd` CARGO_TARGET_DIR="$(pwd)"
if [ ! -z ${1} ]; then export CARGO_TARGET_DIR
OUT_PATH=`realpath "${1}"` if [ -n "${1}" ]; then
OUT_PATH="$(realpath "$1")"
fi fi
cd $SOURCE_DIR cd "$SOURCE_DIR"
shift shift
cargo $BUILD_ARG $@ cargo "$@"
if [ ! -z ${OUT_PATH} ]; then if [ -n "${OUT_PATH}" ]; then
cp "${CARGO_TARGET_DIR}"/debug/librs.a "${OUT_PATH}" cp "${CARGO_TARGET_DIR}"/debug/librs.a "${OUT_PATH}"
fi fi