Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-14 02:31:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 406627: adjust Bootstrap to use patcher configs in mozilla/tools/patcher-configs. r=rhelmer, patch=me

Browse Source
This commit is contained in:
bhearsum@mozilla.com 2007-12-19 10:40:55 -08:00
parent 22a2469a58
commit 1cab86c318
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/release/Bootstrap/Step/PatcherConfig.pm
View File

@ -28,7 +28,7 @@ sub Execute {
my $configBumpDir = $config->Get(var => 'configBumpDir');
my $version = $config->Get(var => 'version');
my $oldVersion = $config->Get(var => 'oldVersion');
my $mofoCvsroot = $config->Get(var => 'mofoCvsroot');
my $mozillaCvsroot = $config->Get(var => 'mozillaCvsroot');
my $patcherConfig = $config->Get(var => 'patcherConfig');
my $ftpServer = $config->Get(var => 'ftpServer');
my $bouncerServer = $config->Get(var => 'bouncerServer');
@ -40,9 +40,10 @@ sub Execute {
}
# checkout config to bump
$this->CvsCo(cvsroot => $mofoCvsroot,
$this->CvsCo(cvsroot => $mozillaCvsroot,
checkoutDir => 'patcher',
modules => [CvsCatfile('release', 'patcher', $patcherConfig)],
modules => [CvsCatfile('mozilla', 'tools', 'patcher-configs',
$patcherConfig)],
logFile => catfile($logDir, 'patcherconfig-checkout.log'),
workDir => $configBumpDir
);
@ -65,7 +66,7 @@ sub Execute {
$this->Shell(
cmd => 'cvs',
cmdArgs => ['-d', $mofoCvsroot,
cmdArgs => ['-d', $mozillaCvsroot,
'ci', '-m', "\"Automated configuration bump: $patcherConfig, "
. "from $oldVersion to $version\"", $patcherConfig],
logFile => catfile($logDir, 'patcherconfig-checkin.log'),

6
tools/release/Bootstrap/Step/Updates.pm
View File

@ -24,7 +24,6 @@ sub Execute {
my $oldVersion = $config->Get(var => 'oldVersion');
my $version = $config->Get(var => 'version');
my $mozillaCvsroot = $config->Get(var => 'mozillaCvsroot');
my $mofoCvsroot = $config->Get(var => 'mofoCvsroot');
my $updateDir = $config->Get(var => 'updateDir');
my $patcherConfig = $config->Get(var => 'patcherConfig');
my $patcherToolsRev = $config->Get(var => 'patcherToolsRev');
@ -56,9 +55,10 @@ sub Execute {
);
# config lives in private repo
$this->CvsCo(cvsroot => $mofoCvsroot,
$this->CvsCo(cvsroot => $mozillaCvsroot,
checkoutDir => 'config',
modules => [CvsCatfile('release', 'patcher', $patcherConfig)],
modules => [CvsCatfile('mozilla', 'tools', 'patcher-configs',
$patcherConfig)],
logFile => catfile($logDir,
'updates_patcher-config-checkout.log'),
workDir => $versionedUpdateDir