diff options
| author | Renato Golin <renato.golin@linaro.org> | 2017-05-05 16:25:08 +0100 |
|---|---|---|
| committer | Renato Golin <renato.golin@linaro.org> | 2017-05-05 16:26:03 +0100 |
| commit | 6324314ffd712fd6d86cbd4c34d2a2bb0f6446fc (patch) | |
| tree | 27da01e4964e3898f5ed4a2d87a6f02e5d66a5dd /tcwg-llvm-release.sh | |
| parent | 130d57ae840f4c9de52b4d7070b5069adc2424df (diff) | |
tcwg-llvm-*: Move toolchain name logic to toolchain_file
Change-Id: I3742ada9e0c2e6342355a5d7294dd03648fa8ac2
Diffstat (limited to 'tcwg-llvm-release.sh')
| -rwxr-xr-x | tcwg-llvm-release.sh | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/tcwg-llvm-release.sh b/tcwg-llvm-release.sh index e21d2bc6..9e19cdb0 100755 --- a/tcwg-llvm-release.sh +++ b/tcwg-llvm-release.sh @@ -17,7 +17,8 @@ SYN_RELEASE="--release=M.m.p" SYN_CANDIDATE="--candidate=N (or 'final')" SYN_BUILDJOBS="--buildjobs=N (def. CPUS)" SYN_TOOLCHAIN="--toolchain=http://url/for/tarball" -SYNTAX="$0 $SYN_WORKSPACE $SYN_RELEASE $SYN_CANDIDATE $SYN_TOOLCHAIN" +SYN_TOOLCHAIN_FILE="--toolchain-file=<file-name> (file name to copy the produced toolchain file name)" +SYNTAX="$0 $SYN_WORKSPACE $SYN_RELEASE $SYN_CANDIDATE $SYN_TOOLCHAIN $SYN_TOOLCHAIN_FILE" # Environment Variables and default values WORKSPACE=$(pwd) @@ -29,6 +30,7 @@ RCDIR="" CPUS=$(nproc --all) BUILDJOBS=$CPUS TOOLCHAIN="" +TOOLCHAIN_FILE="" CC="" CXX="" @@ -83,6 +85,15 @@ while [ "$#" -gt 0 ]; do --toolchain) download_toolchain "$WORKSPACE" "$VAL" shift ;; + --toolchain-file) + if [ "$VAL" != "" ]; then + TOOLCHAIN_FILE="$VAL" + else + echo "ERROR: Toolchain file '$VAL' not valid" + echo "Syntax: $SYN_TOOLCHAIN_FILE" + exit 1 + fi + shift ;; *) echo "ERROR: Invalid argument '$1'" echo "Syntax: $SYNTAX" @@ -152,11 +163,17 @@ result=0 wait $! || result=$? # Ship -PKGNAME="$(push_binary_name "$RELEASE$RCTAG" "$TRIPLE")" +PKGTAG="$RELEASE$RCTAG" +PKGNAME="$(push_binary_name "$PKGTAG" "$TRIPLE")" PUSHTYPE="releases" PUSHDIR="$(push_binary_dir "$PUSHTYPE")" ssh $PUSHSERVER mkdir -p $PUSHDIR cd "$WORKSPACE/$RCDIR" && scp "$PKGNAME.$PUSHSUFFIX" "$(push_scp_url "$PUSHTYPE")" +# Create toolchain file (wget URL) +if [ "$TOOLCHAIN_FILE" != "" ]; then + echo "$(push_wget_url "$PKGTAG" "$TARGET" "$PUSHTYPE")" >> "$TOOLCHAIN_FILE" +fi + exit $result |