mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-24 13:21:05 +00:00
Bug 609401 - Stop spamming "Section [Build] not found" to the terminal. r=ted
--HG-- extra : rebase_source : 534a86362d5b464a2157d94bbc7583510e7859f9
This commit is contained in:
parent
5cbbb7cba7
commit
890f71e904
@ -162,7 +162,7 @@ ifdef MOZ_SYMBOLS_EXTRA_BUILDID
|
|||||||
EXTRA_BUILDID := -$(MOZ_SYMBOLS_EXTRA_BUILDID)
|
EXTRA_BUILDID := -$(MOZ_SYMBOLS_EXTRA_BUILDID)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
export SYMBOL_INDEX_NAME = \
|
SYMBOL_INDEX_NAME = \
|
||||||
$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)-$(OS_TARGET)-$(BUILDID)$(EXTRA_BUILDID)-symbols.txt
|
$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)-$(OS_TARGET)-$(BUILDID)$(EXTRA_BUILDID)-symbols.txt
|
||||||
|
|
||||||
buildsymbols:
|
buildsymbols:
|
||||||
@ -194,7 +194,7 @@ endif # MOZ_CRASHREPORTER
|
|||||||
|
|
||||||
uploadsymbols:
|
uploadsymbols:
|
||||||
ifdef MOZ_CRASHREPORTER
|
ifdef MOZ_CRASHREPORTER
|
||||||
$(SHELL) $(topsrcdir)/toolkit/crashreporter/tools/upload_symbols.sh "$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip"
|
$(SHELL) $(topsrcdir)/toolkit/crashreporter/tools/upload_symbols.sh $(SYMBOL_INDEX_NAME) "$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip"
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# defined in package-name.mk
|
# defined in package-name.mk
|
||||||
|
@ -48,14 +48,23 @@
|
|||||||
# uploading. The full path of the symbol index
|
# uploading. The full path of the symbol index
|
||||||
# file will be appended to the commandline.
|
# file will be appended to the commandline.
|
||||||
#
|
#
|
||||||
|
# The script expects two command-line arguments, in this order:
|
||||||
|
# - The symbol index name
|
||||||
|
# - The symbol archive
|
||||||
|
#
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
: ${SYMBOL_SERVER_HOST?} ${SYMBOL_SERVER_USER?} ${SYMBOL_SERVER_PATH?} ${1?"You must specify a symbol archive to upload"}
|
: ${SYMBOL_SERVER_HOST?} ${SYMBOL_SERVER_USER?} ${SYMBOL_SERVER_PATH?} ${1?"You must specify a symbol index name."} ${2?"You must specify a symbol archive to upload"}
|
||||||
hash=`openssl dgst -sha1 "$1" | sed 's/^.*)=//' | sed 's/\ //g'`
|
|
||||||
archive="${hash}-"`basename "$1" | sed 's/\ //g'`
|
SYMBOL_INDEX_NAME="$1"
|
||||||
echo "Transferring symbols... $1"
|
SYMBOL_ARCHIVE="$2"
|
||||||
|
|
||||||
|
hash=`openssl dgst -sha1 "${SYMBOL_ARCHIVE}" | sed 's/^.*)=//' | sed 's/\ //g'`
|
||||||
|
archive="${hash}-"`basename "${SYMBOL_ARCHIVE}" | sed 's/\ //g'`
|
||||||
|
echo "Transferring symbols... ${SYMBOL_ARCHIVE}"
|
||||||
scp ${SYMBOL_SERVER_PORT:+-P $SYMBOL_SERVER_PORT} \
|
scp ${SYMBOL_SERVER_PORT:+-P $SYMBOL_SERVER_PORT} \
|
||||||
${SYMBOL_SERVER_SSH_KEY:+-i "$SYMBOL_SERVER_SSH_KEY"} "$1" \
|
${SYMBOL_SERVER_SSH_KEY:+-i "$SYMBOL_SERVER_SSH_KEY"} "${SYMBOL_ARCHIVE}" \
|
||||||
${SYMBOL_SERVER_USER}@${SYMBOL_SERVER_HOST}:"${SYMBOL_SERVER_PATH}/${archive}"
|
${SYMBOL_SERVER_USER}@${SYMBOL_SERVER_HOST}:"${SYMBOL_SERVER_PATH}/${archive}"
|
||||||
echo "Unpacking symbols on remote host..."
|
echo "Unpacking symbols on remote host..."
|
||||||
ssh -2 ${SYMBOL_SERVER_PORT:+-p $SYMBOL_SERVER_PORT} \
|
ssh -2 ${SYMBOL_SERVER_PORT:+-p $SYMBOL_SERVER_PORT} \
|
||||||
|
Loading…
Reference in New Issue
Block a user