Permalink
Browse files

Last Comment Bug 619980 - patcher-config-bump.pl and update-verify-bu…

…mp.pl need to special case 64-bit platforms. r=catlee
  • Loading branch information...
1 parent 1a829a2 commit 69ce782fbaff6ca939705a6d318a335227e2ef86 @rail rail committed Jan 10, 2011
Showing with 18 additions and 4 deletions.
  1. +16 −2 release/patcher-config-bump.pl
  2. +2 −2 release/update-verify-bump.pl
View
18 release/patcher-config-bump.pl
@@ -10,7 +10,9 @@
use MozBuild::Util qw(GetBuildIDFromFTP);
use Bootstrap::Util qw(GetBouncerPlatforms GetBouncerToPatcherPlatformMap
- LoadLocaleManifest GetBuildbotToFTPPlatformMap);
+ GetEqualPlatforms LoadLocaleManifest
+ GetBuildbotToFTPPlatformMap
+ GetFTPToBuildbotPlatformMap);
use Release::Patcher::Config qw(GetProductDetails);
@@ -355,6 +357,7 @@ sub BumpPatcherConfig {
$releaseObj->{'platforms'} = {};
my %platformFTPMap = GetBuildbotToFTPPlatformMap();
+ my %FTPplatformMap = GetFTPToBuildbotPlatformMap();
foreach my $os (@$platforms){
my $buildID = GetBuildIDFromFTP(os => $os,
releaseDir => $candidateDir,
@@ -413,7 +416,18 @@ sub BumpPatcherConfig {
my @supportedPatcherPlatforms = ();
foreach my $platform (@{$localeInfo->{$locale}}) {
- push(@supportedPatcherPlatforms, $platformMap{$platform});
+ if (exists $FTPplatformMap{$platformMap{$platform}} &&
+ grep($FTPplatformMap{$platformMap{$platform}} eq $_, @{$platforms})){
+ push(@supportedPatcherPlatforms, $platformMap{$platform});
+ }
+ # Get platforms not mentioned in shipped-locales
+ my $equal_platforms = GetEqualPlatforms($platform);
+ if ($equal_platforms){
+ foreach my $equal_platform (@{$equal_platforms}){
+ push(@supportedPatcherPlatforms, $platformMap{$equal_platform})
+ if grep($FTPplatformMap{$platformMap{$equal_platform}} eq $_, @{$platforms});
+ }
+ }
}
if (keys(%{$allPlatformsHash}) > 0) {
View
4 release/update-verify-bump.pl
@@ -219,7 +219,7 @@ sub BumpVerifyConfig {
}
} elsif ($osname eq 'linux64') {
$buildTarget = 'Linux_x86_64-gcc3';
- $platform = 'linux64';
+ $platform = 'linux';
$ftpOsname = 'linux-x86_64';
$releaseFile = lc($oldBinaryName).'-'.$oldVersion.'.tar.'.$linuxExtension;
if ($prettyCandidatesDir) {
@@ -242,7 +242,7 @@ sub BumpVerifyConfig {
}
} elsif ($osname eq 'macosx64') {
$buildTarget = 'Darwin_x86_64-gcc3';
- $platform = 'osx64';
+ $platform = 'osx';
$ftpOsname = 'mac64';
$releaseFile = $oldBinaryName.' '.$oldLongVersion.'.dmg';
if ($prettyCandidatesDir) {

0 comments on commit 69ce782

Please sign in to comment.