[tor-commits] [builders/tor-browser-build] 02/05: Bug 40067: Rename osx64 mar and dmg files to macos
gitolite role
git at cupani.torproject.org
Tue Nov 15 09:35:04 UTC 2022
This is an automated email from the git hooks/post-receive script.
boklm pushed a commit to branch main
in repository builders/tor-browser-build.
commit 7431ad67575c8fef5105a3c82ee1b193c7524166
Author: Nicolas Vigier <boklm at torproject.org>
AuthorDate: Mon Oct 3 12:25:39 2022 +0200
Bug 40067: Rename osx64 mar and dmg files to macos
The new macos mar and dmg files contain both x86_64 and aarch64 builds
for macOS.
In projects/release/update_responses_config.yml and
tools/signing/nightly/update-responses-base-config.yml we update the
build_target to mar_osname mapping to use `macos` instead of `osx64`.
We also add the new aarch64 build_target (Darwin_aarch64-gcc3).
We update update_responses to take into account the new dmg file
names using `macos` instead of `osx64`.
We also update tools/dmg2mar and various signing scripts for the
`osx64 -> macos` change in both mar files and dmg files.
---
projects/browser/config | 2 +-
projects/release/update_responses_config.yml | 8 +++++---
tools/dmg2mar | 6 +++---
tools/marsigning_check.sh | 2 +-
tools/signing/check_file_counts | 4 ++--
tools/signing/gatekeeper-bundling.sh | 2 +-
tools/signing/macos-signer-gatekeeper-signing | 2 +-
tools/signing/nightly/update-responses-base-config.yml | 11 +++++------
tools/update-responses/update_responses | 6 +++---
9 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/projects/browser/config b/projects/browser/config
index e7d9f31f..6063c4c2 100644
--- a/projects/browser/config
+++ b/projects/browser/config
@@ -28,7 +28,7 @@ targets:
mar_osname: linux64
osx:
var:
- mar_osname: osx64
+ mar_osname: macos
arch_deps:
- genisoimage
- faketime
diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml
index 0f42a09b..d27afd84 100644
--- a/projects/release/update_responses_config.yml
+++ b/projects/release/update_responses_config.yml
@@ -2,7 +2,7 @@
tmp_dir: '[% c("tmp_dir") %]'
create_downloads_json: 1
appname_marfile: tor-browser
-appname_bundle_osx: TorBrowser
+appname_bundle_macos: TorBrowser
appname_bundle_linux: tor-browser
appname_bundle_win32: torbrowser-install
appname_bundle_win64: torbrowser-install-win64
@@ -20,7 +20,9 @@ build_targets:
- WINNT_x86-gcc3-x86
- WINNT_x86-gcc3-x64
win64: WINNT_x86_64-gcc3-x64
- osx64: Darwin_x86_64-gcc3
+ macos:
+ - Darwin_x86_64-gcc3
+ - Darwin_aarch64-gcc3
channels:
[% c('var/channel') %]: [% c("var/torbrowser_version") %]
versions:
@@ -41,7 +43,7 @@ versions:
migrate_langs:
minSupportedInstructionSet: SSE2
# minSupportedOsVersion on macOS corresponds to the Darwin version ( https://en.wikipedia.org/wiki/Darwin_(operating_system) )
- osx64:
+ macos:
# macOS v10.12.0
minSupportedOSVersion: 16.0.0
# minSupportedOsVersion on Windows corresponds to the operating system version ( https://docs.microsoft.com/en-us/windows/win32/sysinfo/operating-system-version )
diff --git a/tools/dmg2mar b/tools/dmg2mar
index 54bb512e..cd15c605 100755
--- a/tools/dmg2mar
+++ b/tools/dmg2mar
@@ -96,7 +96,7 @@ sub get_dmg_files_from_sha256sums {
foreach my $line (read_file('sha256sums-unsigned-build.txt')) {
my (undef, $filename) = split ' ', $line;
chomp $filename;
- next unless $filename =~ m/^$appname_dmg-(.+)-osx64_(.+)\.dmg$/;
+ next unless $filename =~ m/^$appname_dmg-(.+)-macos_(.+)\.dmg$/;
push @files, { filename => $filename, version => $1, lang => $2 };
}
return @files;
@@ -111,7 +111,7 @@ sub convert_files {
# internally on OSX, but the dmg file still uses 'ja' to avoid
# confusing users.
my $mar_lang = $file->{lang} eq 'ja' ? 'ja-JP-mac' : $file->{lang};
- my $output = "$appname_mar-osx64-$file->{version}_$mar_lang.mar";
+ my $output = "$appname_mar-macos-$file->{version}_$mar_lang.mar";
my $step_name = "$file->{filename} -> $output";
print "Starting $step_name\n";
$pm->start($step_name) and next;
@@ -160,7 +160,7 @@ sub remove_incremental_mars {
foreach my $line (read_file('sha256sums-unsigned-build.incrementals.txt')) {
my (undef, $filename) = split ' ', $line;
chomp $filename;
- next unless $filename =~ m/^$appname_mar-osx64.+\.incremental\.mar$/;
+ next unless $filename =~ m/^$appname_mar-macos.+\.incremental\.mar$/;
next unless -f $filename;
print "Removing $filename\n";
unlink $filename;
diff --git a/tools/marsigning_check.sh b/tools/marsigning_check.sh
index 28f149a7..343765fa 100755
--- a/tools/marsigning_check.sh
+++ b/tools/marsigning_check.sh
@@ -124,7 +124,7 @@ for f in *.mar; do
then
not_reproduced_mars=$((not_reproduced_mars + 1))
case "$f" in
- *osx64*)
+ *macos*)
not_reproduced_mars_expected=$((not_reproduced_mars_expected + 1))
;;
*) echo "$f does not have the SHA-256 sum of the unsigned MAR file!"
diff --git a/tools/signing/check_file_counts b/tools/signing/check_file_counts
index d374aa0a..3439644b 100755
--- a/tools/signing/check_file_counts
+++ b/tools/signing/check_file_counts
@@ -13,9 +13,9 @@ if [ "$#" -ne 4 ]; then
exit
fi
-INSTALL_PLATFORMS="tor-browser-linux32-${VERSION}_\*.tar.xz tor-browser-linux64-${VERSION}_\*.tar.xz torbrowser-install-${VERSION}_\*.exe torbrowser-install-win64-${VERSION}_\*.exe TorBrowser-${VERSION}-osx64_\*.dmg"
+INSTALL_PLATFORMS="tor-browser-linux32-${VERSION}_\*.tar.xz tor-browser-linux64-${VERSION}_\*.tar.xz torbrowser-install-${VERSION}_\*.exe torbrowser-install-win64-${VERSION}_\*.exe TorBrowser-${VERSION}-macos_\*.dmg"
-MAR_PLATFORMS="linux32 linux64 win32 win64 osx64"
+MAR_PLATFORMS="linux32 linux64 win32 win64 macos"
MAR_TOOLS_PLATFORMS="linux32 linux64 win32 win64 mac64"
total_count=0
diff --git a/tools/signing/gatekeeper-bundling.sh b/tools/signing/gatekeeper-bundling.sh
index 046efbff..ba9543ba 100755
--- a/tools/signing/gatekeeper-bundling.sh
+++ b/tools/signing/gatekeeper-bundling.sh
@@ -62,7 +62,7 @@ do
cd $tmpdir/dmg
unzip -q $macos_stapled_dir/tb-${tbb_version}_$lang-stapled.zip
cd ..
- $script_dir/ddmg.sh $macos_signed_dir/TorBrowser-${tbb_version}-osx64_$lang.dmg $tmpdir/dmg/
+ $script_dir/ddmg.sh $macos_signed_dir/TorBrowser-${tbb_version}-macos_$lang.dmg $tmpdir/dmg/
rm -rf 'dmg/Tor Browser.app'
done
diff --git a/tools/signing/macos-signer-gatekeeper-signing b/tools/signing/macos-signer-gatekeeper-signing
index 8efc3fd5..c2cb4534 100755
--- a/tools/signing/macos-signer-gatekeeper-signing
+++ b/tools/signing/macos-signer-gatekeeper-signing
@@ -67,7 +67,7 @@ do
echo "DMG already mounted. Please correct."
exit 1
fi
- hdiutil attach TorBrowser-${tbb_version}-osx64_$LANG.dmg
+ hdiutil attach TorBrowser-${tbb_version}-macos_$LANG.dmg
cp -rf "/Volumes/Tor Browser/Tor Browser.app" "Tor Browser.app"
echo "Signing Tor Browser_$LANG.app"
codesign -vvv --deep -o runtime --entitlements="$ENTITLEMENTS" --timestamp -f -s "Developer ID Application: The Tor Project, Inc (MADPSAYN6T)" "Tor Browser.app/"
diff --git a/tools/signing/nightly/update-responses-base-config.yml b/tools/signing/nightly/update-responses-base-config.yml
index 2f18cd12..7c8342cd 100644
--- a/tools/signing/nightly/update-responses-base-config.yml
+++ b/tools/signing/nightly/update-responses-base-config.yml
@@ -10,8 +10,9 @@ build_targets:
- WINNT_x86-gcc3-x86
- WINNT_x86-gcc3-x64
win64: WINNT_x86_64-gcc3-x64
- osx32: Darwin_x86-gcc3
- osx64: Darwin_x86_64-gcc3
+ macos:
+ - Darwin_x86_64-gcc3
+ - Darwin_aarch64-gcc3
channels:
nightly: nightly_version
versions:
@@ -21,10 +22,8 @@ versions:
migrate_langs:
pt-PT: pt-BR
minSupportedInstructionSet: SSE2
- osx32:
- minSupportedOSVersion: 13.0.0
- osx64:
- minSupportedOSVersion: 13.0.0
+ macos:
+ minSupportedOSVersion: 16.0.0
win32:
minSupportedOSVersion: 6.1
win64:
diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses
index af81875b..265994a5 100755
--- a/tools/update-responses/update_responses
+++ b/tools/update-responses/update_responses
@@ -133,8 +133,8 @@ sub get_version_downloads {
foreach my $file (readdir $d) {
next unless -f "$vdir/$file";
my ($os, $lang);
- if ($file =~ m/^$config->{appname_bundle_osx}-$version-osx64_(.+).dmg$/) {
- ($os, $lang) = ('osx64', $1);
+ if ($file =~ m/^$config->{appname_bundle_macos}-$version-macos_(.+).dmg$/) {
+ ($os, $lang) = ('macos', $1);
} elsif ($file =~ m/^$config->{appname_bundle_linux}-(linux32|linux64)-${version}_(.+).tar.xz$/) {
($os, $lang) = ($1, $2);
} elsif ($file =~ m/^$config->{appname_bundle_win64}-${version}_(.+).exe$/) {
@@ -220,7 +220,7 @@ sub create_incremental_mar {
extract_mar(mar_filename($config, $appname, $new_version, $os, $lang),
"$tmpdir/B", $mar_c_new);
# bug 26054: make sure previous macOS version is code signed
- if (!$ENV{NO_CODESIGNATURE} && ($os eq 'osx64')
+ if (!$ENV{NO_CODESIGNATURE} && ($os eq 'macos')
&& ! -f "$tmpdir/A/Contents/_CodeSignature/CodeResources") {
exit_error "Missing code signature in $from_version while creating $mar_file";
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the tor-commits
mailing list