Bug 374813 - Replace rsync with scp and tar with zip, to work around Windows oddities, r=luser

This commit is contained in:
benjamin@smedbergs.us 2007-03-23 11:05:24 -07:00
parent 1e619f723b
commit 30777ba15e
2 changed files with 11 additions and 5 deletions

View File

@ -148,15 +148,15 @@ ifdef MOZ_AIRBAG
$(DIST)/airbag-symbols/$(BUILDID)/$(BUILDID)-symbols.txt
echo packing symbols
mkdir -p $(topsrcdir)/../$(BUILDID)
cd $(DIST)/airbag-symbols/$(BUILDID) && tar -cvjf airbag-symbols-$(BUILDID).tar.bz2 *
mv $(DIST)/airbag-symbols/$(BUILDID)/airbag-symbols-$(BUILDID).tar.bz2 $(topsrcdir)/../$(BUILDID)
cd $(DIST)/airbag-symbols/$(BUILDID) && zip -r9D ../airbag-symbols-$(BUILDID).zip .
mv $(DIST)/airbag-symbols/airbag-symbols-$(BUILDID).zip $(topsrcdir)/../$(BUILDID)
endif # MOZ_DEBUG_SYMBOLS
endif # MOZ_AIRBAG
uploadsymbols:
ifdef MOZ_DEBUG_SYMBOLS
ifdef MOZ_AIRBAG
$(topsrcdir)/toolkit/airbag/tools/upload_symbols.sh $(topsrcdir)/../$(BUILDID)/airbag-symbols-$(BUILDID).tar.bz2
$(topsrcdir)/toolkit/airbag/tools/upload_symbols.sh $(topsrcdir)/../$(BUILDID)/airbag-symbols-$(BUILDID).zip
endif
endif

View File

@ -41,10 +41,16 @@
# AIRBAG_SYMBOL_USER : username on that host
# AIRBAG_SYMBOL_PATH : path on that host to put symbols in
#
set -e
: ${AIRBAG_SYMBOL_SERVER?} ${AIRBAG_SYMBOL_USER?} ${AIRBAG_SYMBOL_PATH?} ${1?"You must specify a symbol archive to upload"}
archive=`basename $1`
echo "Transferring symbols... $1"
rsync -avvz -e "ssh -2" $1 ${AIRBAG_SYMBOL_USER}@${AIRBAG_SYMBOL_SERVER}:${AIRBAG_SYMBOL_PATH}/
scp -v $1 ${AIRBAG_SYMBOL_USER}@${AIRBAG_SYMBOL_SERVER}:${AIRBAG_SYMBOL_PATH}/
echo "Unpacking symbols on remote host..."
ssh -2 -l ${AIRBAG_SYMBOL_USER} ${AIRBAG_SYMBOL_SERVER} "cd ${AIRBAG_SYMBOL_PATH}; tar -xvjf $archive; rm -fv $archive"
ssh -2 -l ${AIRBAG_SYMBOL_USER} ${AIRBAG_SYMBOL_SERVER} \
"set -e;
cd ${AIRBAG_SYMBOL_PATH};
unzip $archive;
rm -v $archive;"
echo "Symbol transfer completed"