зеркало из https://github.com/mozilla/gecko-dev.git
Bug 315455 - Make makexpi.sh use 'safeCommand' to handle errors consitently.
ChatZilla only and NPOB. r=rginda
This commit is contained in:
silver%warwickcompsoc.co.uk
Родитель
a6a4d92134
Коммит
08f11e2985
|
|
@ -6,6 +6,90 @@ if [ -z "$CONFIGDIR" ]; then CONFIGDIR=$FEDIR/../../config; fi
|
|||
if [ -z "$XPIFILES" ]; then XPIFILES=$PWD/resources; fi
|
||||
if [ -z "$XPIROOT" ]; then XPIROOT=$PWD/xpi-tree; fi
|
||||
if [ -z "$JARROOT" ]; then JARROOT=$PWD/jar-tree; fi
|
||||
if [ -z "$PERL" ]; then PERL=perl; fi
|
||||
if [ -z "$DEBUG" ]; then DEBUG=0; fi
|
||||
|
||||
|
||||
function showParams()
|
||||
{
|
||||
I=0
|
||||
for P in "$@"; do
|
||||
I=$((I+1))
|
||||
echo PARAM $I: "$P"
|
||||
done
|
||||
}
|
||||
|
||||
## Call this with lots of parameters to run a command, log errors, and abort
|
||||
## if it fails. Supports redirection if '>' and '<' are passed as arguments,
|
||||
## e.g.:
|
||||
## safeCommand cmd arg1 arg2 '<' input.file '>' output-file
|
||||
##
|
||||
## Note: only a single input and single output redirection is supported.
|
||||
##
|
||||
function safeCommand()
|
||||
{
|
||||
local -a CMD
|
||||
CMD_COUNT=$((0))
|
||||
INF=""
|
||||
OUTF=""
|
||||
LASTP=""
|
||||
for P in "$@"; do
|
||||
if [ "$LASTP" == "<" ]; then
|
||||
if [ -n "$INF" ]; then
|
||||
echo "ERROR: Multiple input files passed to safeCommand()." >&2
|
||||
exit 2
|
||||
fi
|
||||
INF="$P"
|
||||
elif [ "$LASTP" == ">" ]; then
|
||||
if [ -n "$OUTF" ]; then
|
||||
echo "ERROR: Multiple output files passed to safeCommand()." >&2
|
||||
exit 2
|
||||
fi
|
||||
OUTF="$P"
|
||||
elif [ "$P" == ">" -o "$P" == "<" ]; then
|
||||
echo >/dev/null
|
||||
else
|
||||
CMD[$CMD_COUNT]="$P"
|
||||
CMD_COUNT=$((CMD_COUNT+1))
|
||||
fi
|
||||
LASTP="$P"
|
||||
done
|
||||
|
||||
if [ $DEBUG -gt 0 ]; then
|
||||
echo
|
||||
showParams "${CMD[@]}"
|
||||
echo 'INPUT :' "$INF"
|
||||
echo 'OUTPUT :' "$OUTF"
|
||||
fi
|
||||
|
||||
touch log.stdout log.stderr
|
||||
if [ -z "$INF" -a -z "$OUTF" ]; then
|
||||
"${CMD[@]}" 1>log.stdout 2>log.stderr
|
||||
elif [ -z "$INF" ]; then
|
||||
"${CMD[@]}" 1> "$OUTF" 2>log.stderr
|
||||
elif [ -z "$OUTF" ]; then
|
||||
"${CMD[@]}" < "$INF" 1>log.stdout 2>log.stderr
|
||||
else
|
||||
"${CMD[@]}" < "$INF" 1> "$OUTF" 2>log.stderr
|
||||
fi
|
||||
|
||||
EC=$?
|
||||
if [ $DEBUG -gt 0 ]; then
|
||||
echo 'RESULT :' $EC
|
||||
fi
|
||||
if [ "$EC" != "0" ]; then
|
||||
echo "ERROR ($EC)"
|
||||
cat log.stdout
|
||||
cat log.stderr
|
||||
rm -f log.stdout log.stderr
|
||||
exit 1
|
||||
fi
|
||||
rm -f log.stdout log.stderr
|
||||
return $EC
|
||||
}
|
||||
|
||||
|
||||
## Begin real program ##
|
||||
|
||||
|
||||
if [ "$1" = "clean" ]; then
|
||||
|
|
@ -34,6 +118,11 @@ fi
|
|||
# Extract version number.
|
||||
VERSION=`grep "const __cz_version" "$FEDIR/xul/content/static.js" | sed "s|.*\"\([^\"]\{1,\}\)\".*|\1|"`
|
||||
|
||||
if [ -z "$VERSION" ]; then
|
||||
echo "ERROR: Unable to get version number."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo Begining build of ChatZilla $VERSION...
|
||||
|
||||
|
||||
|
|
@ -64,28 +153,28 @@ echo ". done"
|
|||
# Make Firefox updates.
|
||||
echo -n " Updating Firefox Extension files"
|
||||
echo -n .
|
||||
sed "s|@REVISION@|$VERSION|g" < "$XPIFILES/install.rdf" > "$XPIROOT/install.rdf"
|
||||
safeCommand sed "s|@REVISION@|$VERSION|g" '<' "$XPIFILES/install.rdf" '>' "$XPIROOT/install.rdf"
|
||||
echo -n .
|
||||
cp "$XPIFILES/chatzilla-window.ico" "$XPIROOT/defaults/chatzilla-window.ico"
|
||||
safeCommand cp "$XPIFILES/chatzilla-window.ico" "$XPIROOT/defaults/chatzilla-window.ico"
|
||||
echo -n .
|
||||
cp "$XPIFILES/chatzilla-window.xpm" "$XPIROOT/defaults/chatzilla-window.xpm"
|
||||
safeCommand cp "$XPIFILES/chatzilla-window.xpm" "$XPIROOT/defaults/chatzilla-window.xpm"
|
||||
echo -n .
|
||||
cp "$XPIFILES/chatzilla-window16.xpm" "$XPIROOT/defaults/chatzilla-window16.xpm"
|
||||
safeCommand cp "$XPIFILES/chatzilla-window16.xpm" "$XPIROOT/defaults/chatzilla-window16.xpm"
|
||||
echo ". done"
|
||||
|
||||
|
||||
# Make Mozilla Suite updates.
|
||||
echo -n " Updating Mozilla Extension files"
|
||||
echo -n .
|
||||
sed "s|@REVISION@|$VERSION|g" < "$XPIFILES/install.js" > "$XPIROOT/install.js"
|
||||
safeCommand sed "s|@REVISION@|$VERSION|g" '<' "$XPIFILES/install.js" '>' "$XPIROOT/install.js"
|
||||
echo -n .
|
||||
mv "$FEDIR/xul/content/contents.rdf" "$FEDIR/xul/content/contents.rdf.in"
|
||||
sed "s|@MOZILLA_VERSION@|cz-$VERSION|g;s|\(chrome:displayName=\)\"[^\"]\{1,\}\"|\1\"ChatZilla $VERSION\"|g" < "$FEDIR/xul/content/contents.rdf.in" > "$FEDIR/xul/content/contents.rdf"
|
||||
rm "$FEDIR/xul/content/contents.rdf.in"
|
||||
safeCommand mv "$FEDIR/xul/content/contents.rdf" "$FEDIR/xul/content/contents.rdf.in"
|
||||
safeCommand sed "s|@MOZILLA_VERSION@|cz-$VERSION|g;s|\(chrome:displayName=\)\\\"[^\\\"]\+\\\"|\1\\\"ChatZilla $VERSION\\\"|g" '<' "$FEDIR/xul/content/contents.rdf.in" '>' "$FEDIR/xul/content/contents.rdf"
|
||||
safeCommand rm "$FEDIR/xul/content/contents.rdf.in"
|
||||
echo -n .
|
||||
mv "$FEDIR/xul/locale/en-US/contents.rdf" "$FEDIR/xul/locale/en-US/contents.rdf.in"
|
||||
sed "s|@MOZILLA_VERSION@|cz-$VERSION|g" < "$FEDIR/xul/locale/en-US/contents.rdf.in" > "$FEDIR/xul/locale/en-US/contents.rdf"
|
||||
rm "$FEDIR/xul/locale/en-US/contents.rdf.in"
|
||||
safeCommand mv "$FEDIR/xul/locale/en-US/contents.rdf" "$FEDIR/xul/locale/en-US/contents.rdf.in"
|
||||
safeCommand sed "s|@MOZILLA_VERSION@|cz-$VERSION|g" '<' "$FEDIR/xul/locale/en-US/contents.rdf.in" '>' "$FEDIR/xul/locale/en-US/contents.rdf"
|
||||
safeCommand rm "$FEDIR/xul/locale/en-US/contents.rdf.in"
|
||||
echo ". done"
|
||||
|
||||
|
||||
|
|
@ -95,14 +184,12 @@ echo -n .
|
|||
OLDPWD=`pwd`
|
||||
cd "$CONFIGDIR"
|
||||
echo -n .
|
||||
perl make-jars.pl -v -z zip -p preprocessor.pl -s "$FEDIR" -d "$JARROOT" < "$FEDIR/jar.mn" 1>log.tmp 2>&1
|
||||
if [ "$?" != "0" ]; then echo ERROR; cat log.tmp; exit 1; fi
|
||||
|
||||
safeCommand $PERL make-jars.pl -v -z zip -p preprocessor.pl -s "$FEDIR" -d "$JARROOT" '<' "$FEDIR/jar.mn"
|
||||
echo -n .
|
||||
perl make-jars.pl -v -z zip -p preprocessor.pl -s "$FEDIR/sm" -d "$JARROOT" < "$FEDIR/sm/jar.mn" 1>log.tmp 2>&1
|
||||
if [ "$?" != "0" ]; then echo ERROR; cat log.tmp; exit 1; fi
|
||||
safeCommand $PERL make-jars.pl -v -z zip -p preprocessor.pl -s "$FEDIR/sm" -d "$JARROOT" '<' "$FEDIR/sm/jar.mn"
|
||||
echo -n .
|
||||
perl make-jars.pl -v -z zip -p preprocessor.pl -s "$FEDIR/ff" -d "$JARROOT" < "$FEDIR/ff/jar.mn" 1>log.tmp 2>&1
|
||||
if [ "$?" != "0" ]; then echo ERROR; cat log.tmp; exit 1; fi
|
||||
safeCommand $PERL make-jars.pl -v -z zip -p preprocessor.pl -s "$FEDIR/ff" -d "$JARROOT" '<' "$FEDIR/ff/jar.mn"
|
||||
echo -n .
|
||||
cd "$OLDPWD"
|
||||
echo ". done"
|
||||
|
|
@ -111,21 +198,18 @@ echo ". done"
|
|||
# Make XPI.
|
||||
echo -n " Constructing XPI package"
|
||||
echo -n .
|
||||
cp -v "$JARROOT/chatzilla.jar" "$XPIROOT/chrome/" 1>log.tmp 2>&1
|
||||
if [ "$?" != "0" ]; then echo ERROR; cat log.tmp; exit 1; fi
|
||||
safeCommand cp -v "$JARROOT/chatzilla.jar" "$XPIROOT/chrome/"
|
||||
echo -n .
|
||||
cp -v "$FEDIR/js/lib/chatzilla-service.js" "$XPIROOT/components/" 1>log.tmp 2>&1
|
||||
if [ "$?" != "0" ]; then echo ERROR; cat log.tmp; exit 1; fi
|
||||
safeCommand cp -v "$FEDIR/js/lib/chatzilla-service.js" "$XPIROOT/components/"
|
||||
echo -n .
|
||||
chmod 664 "$XPIROOT/chrome/chatzilla.jar"
|
||||
safeCommand chmod 664 "$XPIROOT/chrome/chatzilla.jar"
|
||||
echo -n .
|
||||
chmod 664 "$XPIROOT/components/chatzilla-service.js"
|
||||
safeCommand chmod 664 "$XPIROOT/components/chatzilla-service.js"
|
||||
echo -n .
|
||||
OLDPWD=`pwd`
|
||||
cd "$XPIROOT"
|
||||
zip -vr ../chatzilla-$VERSION.xpi * 1>log.tmp 2>&1
|
||||
safeCommand zip -vr ../chatzilla-$VERSION.xpi . -i "*" -x log*
|
||||
cd "$OLDPWD"
|
||||
if [ "$?" != "0" ]; then echo ERROR; cat log.tmp; exit 1; fi
|
||||
echo ". done"
|
||||
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче