Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Commit b09b6f1

Browse files
committed
Bug 1533589: [win64-aarch64] Simplify logic about unpacking builds in update-verify; r=sfraser
We always pass in the platform formated as an update platform. Since the only variation in formats is between major platforms, be liberal in parsing platforms, when selecting which unpack logic to use. This makes win64-aarch64 support fall out automatically. Differential Revision: https://phabricator.services.mozilla.com/D26201 --HG-- extra : moz-landing-system : lando
1 parent 02ff9a3 commit b09b6f1

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

tools/update-verify/release/common/unpack.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ unpack_build () {
2020
mkdir -p $dir_name
2121
pushd $dir_name > /dev/null
2222
case $unpack_platform in
23-
mac|mac64|mac-ppc|Darwin_ppc-gcc|Darwin_Universal-gcc3|Darwin_x86_64-gcc3|Darwin_x86-gcc3-u-ppc-i386|Darwin_x86-gcc3-u-i386-x86_64|Darwin_x86_64-gcc3-u-i386-x86_64)
23+
Darwin_*)
2424
os=`uname`
2525
# How we unpack a dmg differs depending on which platform we're on.
2626
if [[ "$os" == "Darwin" ]]
@@ -52,7 +52,7 @@ unpack_build () {
5252
fi
5353
update_settings_file="${appdir}/update-settings.ini"
5454
;;
55-
win32|win64|WINNT_x86-msvc|WINNT_x86-msvc-x86|WINNT_x86-msvc-x64|WINNT_x86_64-msvc|WINNT_x86_64-msvc-x64)
55+
WINNT_*)
5656
7z x ../"$pkg_file" > /dev/null
5757
if [ -d localized ]
5858
then
@@ -80,7 +80,7 @@ unpack_build () {
8080
fi
8181
update_settings_file='bin/update-settings.ini'
8282
;;
83-
linux-i686|linux-x86_64|linux|linux64|Linux_x86-gcc|Linux_x86-gcc3|Linux_x86_64-gcc3)
83+
Linux_*)
8484
if `echo $pkg_file | grep -q "tar.gz"`
8585
then
8686
tar xfz ../"$pkg_file" > /dev/null
@@ -93,6 +93,9 @@ unpack_build () {
9393
fi
9494
update_settings_file=`echo $product | tr '[A-Z]' '[a-z]'`'/update-settings.ini'
9595
;;
96+
*)
97+
echo "Unknown platform to unpack: $unpack_platform"
98+
exit 1
9699
esac
97100

98101
if [ ! -z $unpack_jars ]; then

0 commit comments

Comments
 (0)