richard pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits: eb5f3bd2 by Richard Pospesel at 2023-08-24T17:09:38+00:00 Bug 40935: Fix fallout from build target rename in signing scripts

- - - - -

4 changed files:

- tools/dmg2mar - tools/signing/dmg2mar - tools/signing/gatekeeper-bundling.sh - tools/signing/macos-signer-gatekeeper-signing

Changes:

===================================== tools/dmg2mar ===================================== @@ -98,8 +98,8 @@ sub get_dmg_files_from_sha256sums { my (undef, $filename) = split ' ', $line; next unless $filename; chomp $filename; - next unless $filename =~ m/^$appname_dmg-(.+)-macos.dmg$/; - push @files, { filename => $filename, version => $1, lang => $2 }; + next unless $filename =~ m/^$appname_dmg-macos-(.+).dmg$/; + push @files, { filename => $filename, version => $1, lang => 'ALL' }; } return @files; }

===================================== tools/signing/dmg2mar ===================================== @@ -22,7 +22,7 @@ test -d "$signed_version_dir" || \

ProjName=$(ProjectName) nb_locales=$(echo $bundle_locales | wc -w) -nb_bundles=$(ls -1 "$signed_version_dir/$ProjName"-*.dmg | wc -l) +nb_bundles=$(ls -1 "$signed_version_dir/$(project-name)"-*.dmg | wc -l) test "$nb_locales" -eq "$nb_bundles" || \ exit_error "Wrong number of bundles: $nb_locales != $nb_bundles"

===================================== tools/signing/gatekeeper-bundling.sh ===================================== @@ -54,6 +54,7 @@ test -f "$hfstools_file" || \

ProjName=$(ProjectName) Proj_Name=$(Project_Name) +proj_name=$(project-name)

test -d "$macos_signed_dir" || mkdir "$macos_signed_dir" tmpdir="$macos_stapled_dir/tmp" @@ -70,10 +71,10 @@ do cd $tmpdir/dmg unzip -q $macos_stapled_dir/tb-${tbb_version}_$lang-stapled.zip cd .. - $script_dir/ddmg.sh $macos_signed_dir/$ProjName-${tbb_version}-macos_$lang.dmg $tmpdir/dmg/ "$Proj_Name" + $script_dir/ddmg.sh $macos_signed_dir/${proj_name}-macos-${tbb_version}.dmg $tmpdir/dmg/ "$Proj_Name" rm -rf "dmg/$Proj_Name.app" done rm -Rf "$tmpdir"

# move the signed+stapled dmgs to expected output directory for publishing and mar generation -mv -vf "$macos_signed_dir"/"$ProjName"-*.dmg "$signed_version_dir"/ +mv -vf "$macos_signed_dir"/"${proj_name}"-*.dmg "$signed_version_dir"/

===================================== tools/signing/macos-signer-gatekeeper-signing ===================================== @@ -69,7 +69,7 @@ do echo "DMG already mounted. Please correct." exit 1 fi - hdiutil attach $(ProjectName)-${tbb_version}-macos_$LANG.dmg + hdiutil attach $(project-name)-macos-${tbb_version}.dmg cp -rf "/Volumes/$app_name/$app_name.app" "$app_name.app" echo "Signing ${app_name}_${LANG}.app" codesign -vvv --deep -o runtime --entitlements="$ENTITLEMENTS" --timestamp -f -s "Developer ID Application: The Tor Project, Inc (MADPSAYN6T)" "$app_name.app/"

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/eb...