Commit eb5f3bd2 authored by Richard Pospesel's avatar Richard Pospesel Committed by richard
Browse files

Bug 40935: Fix fallout from build target rename in signing scripts

parent 6c264f8e

tools/dmg2mar

+2 −2
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+3 −2
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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/"