Chromium Code Reviews| Index: third_party/binutils/upload.sh |
| diff --git a/third_party/binutils/upload.sh b/third_party/binutils/upload.sh |
| index 27c11ceb8f774a27aed3db583cb8da1541bac54b..86a3db43f12630afbbd47d84460374b99dfd543a 100755 |
| --- a/third_party/binutils/upload.sh |
| +++ b/third_party/binutils/upload.sh |
| @@ -5,21 +5,57 @@ |
| # Upload the generated output to Google storage. |
| -if [ ! -d $1 ]; then |
| +set -e |
| + |
| +if [ ! -d "$1" ]; then |
| echo "update.sh <output directory from build-all.sh>" |
| exit 1 |
| fi |
| -if [ ! -f ~/.boto ]; then |
| - echo "You need to run 'gsutil config' to set up authentication before running this script." |
| +if echo "$PWD" | grep -qE "/src/third_party/binutils$"; then |
| + echo -n |
| +else |
| + echo "update.sh should be run in src/third_party/binutils" |
| exit 1 |
| fi |
| -BINUTILS_TAR_BZ2=linux/binutils.tar.bz2 |
| -if [ -f ${BINUTILS_TAR_BZ2}.sha1 ]; then |
| - echo "Please remove ${BINUTILS_TAR_BZ2}.sha1 before starting..." |
| +if [ ! -f ~/.boto ]; then |
| + echo "You need to run 'gsutil config' to set up authentication before running this script." |
| exit 1 |
| fi |
| -(cd $1/; tar -jcvf ../$BINUTILS_TAR_BZ2 .) |
| -../depot_tools/upload_to_google_storage.py --bucket chromium-binutils $BINUTILS_TAR_BZ2 |
| +for DIR in $1/*; do |
| + # Skip if not directory |
| + if [ ! -d "$DIR" ]; then |
| + continue |
| + fi |
| + |
| + case "$DIR" in |
| + */i686-pc-linux-gnu) |
| + export ARCH="Linux_ia32" |
| + ;; |
| + |
| + */x86_64-unknown-linux-gnu) |
| + export ARCH="Linux_x64" |
| + ;; |
| + |
| + *) |
| + echo "Unknown architecture directory $DIR" |
| + exit 1 |
| + ;; |
| + esac |
| + |
| + if [ ! -d "$ARCH" ]; then |
| + mkdir -p "$ARCH" |
| + fi |
| + |
| + BINUTILS_TAR_BZ2="$ARCH/binutils.tar.bz2" |
| + FULL_BINUTILS_TAR_BZ2="$PWD/$BINUTILS_TAR_BZ2" |
| + if [ -f "${BINUTILS_TAR_BZ2}.sha1" ]; then |
| + rm "${BINUTILS_TAR_BZ2}.sha1" |
| + fi |
| + (cd "$DIR"; tar jcf "$FULL_BINUTILS_TAR_BZ2" .) |
| + |
| + upload_to_google_storage.py --bucket chromium-binutils "$BINUTILS_TAR_BZ2" |
| + git add -f "${BINUTILS_TAR_BZ2}.sha1" |
|
Lei Zhang
2014/04/01 05:10:48
You may want to print out a final message after th
mithro-old
2014/04/02 04:22:33
Done.
|
| +done |