[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser-build][main] Bug 40935: Fix fallout from build target rename in signing scripts

Title: GitLab

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:

Changes:

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

  • tools/signing/dmg2mar
    ... ... @@ -22,7 +22,7 @@ test -d "$signed_version_dir" || \
    22 22
    23 23 
     ProjName=$(ProjectName)
    24 24 
     nb_locales=$(echo $bundle_locales | wc -w)
    25 
    -nb_bundles=$(ls -1 "$signed_version_dir/$ProjName"-*.dmg | wc -l)
    25 
    +nb_bundles=$(ls -1 "$signed_version_dir/$(project-name)"-*.dmg | wc -l)
    26 26 
     test "$nb_locales" -eq "$nb_bundles" || \
    27 27 
       exit_error "Wrong number of bundles: $nb_locales != $nb_bundles"
    28 28

  • tools/signing/gatekeeper-bundling.sh
    ... ... @@ -54,6 +54,7 @@ test -f "$hfstools_file" || \
    54 54
    55 55 
     ProjName=$(ProjectName)
    56 56 
     Proj_Name=$(Project_Name)
    57 
    +proj_name=$(project-name)
    57 58
    58 59 
     test -d "$macos_signed_dir" || mkdir "$macos_signed_dir"
    59 60 
     tmpdir="$macos_stapled_dir/tmp"
    ... ... @@ -70,10 +71,10 @@ do
    70 71 
       cd $tmpdir/dmg
    71 72 
       unzip -q $macos_stapled_dir/tb-${tbb_version}_$lang-stapled.zip
    72 73 
       cd ..
    73 
    -  $script_dir/ddmg.sh $macos_signed_dir/$ProjName-${tbb_version}-macos_$lang.dmg $tmpdir/dmg/ "$Proj_Name"
    74 
    +  $script_dir/ddmg.sh $macos_signed_dir/${proj_name}-macos-${tbb_version}.dmg $tmpdir/dmg/ "$Proj_Name"
    74 75 
       rm -rf "dmg/$Proj_Name.app"
    75 76 
     done
    76 77 
     rm -Rf "$tmpdir"
    77 78
    78 79 
     # move the signed+stapled dmgs to expected output directory for publishing and mar generation
    79 
    -mv -vf "$macos_signed_dir"/"$ProjName"-*.dmg "$signed_version_dir"/
    80 
    +mv -vf "$macos_signed_dir"/"${proj_name}"-*.dmg "$signed_version_dir"/

  • tools/signing/macos-signer-gatekeeper-signing
    ... ... @@ -69,7 +69,7 @@ do
    69 69 
         echo "DMG already mounted. Please correct."
    70 70 
         exit 1
    71 71 
       fi
    72 
    -  hdiutil attach $(ProjectName)-${tbb_version}-macos_$LANG.dmg
    72 
    +  hdiutil attach $(project-name)-macos-${tbb_version}.dmg
    73 73 
       cp -rf "/Volumes/$app_name/$app_name.app" "$app_name.app"
    74 74 
       echo "Signing ${app_name}_${LANG}.app"
    75 75 
       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.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

    _______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits