lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-21 04:16:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

Browse Source 
* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  init-repository: also create the staging remote for qt5
This commit is contained in:
Qt Continuous Integration System
2011-05-06 16:27:15 +10:00
parent 66cbe5de4d 65ac36828a
commit 7d94af3595
1 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
init-repository
View File

@@ -188,6 +188,7 @@ my %PROTOCOLS = (
); );
my %STAGING_REPOS = map { $_ => "git://gitorious.org/qt/$_.git" } qw( my %STAGING_REPOS = map { $_ => "git://gitorious.org/qt/$_.git" } qw(
qt5-staging
qt3support-staging qt3support-staging
qtactiveqt-staging qtactiveqt-staging
qtbase-earth-staging qtbase-earth-staging
@@ -399,6 +400,42 @@ sub git_clone_all_submodules
return; return;
} }
sub git_add_staging_remote
{
my ($self, $repo_basename) = @_;
my $protocol = $self->{protocol};
my $url_base_for_protocol = $PROTOCOLS{$protocol};
my %current_remotes;
for my $line (qx(git remote show)) {
chomp $line;
$current_remotes{$line} = 1;
}
# We assume that any staging starting with `$repo_basename-' relates to this
# repo. For example, for the `qtbase' module, `qtbase-staging'
# and `qtbase-earth-staging' are considered as related staging repos.
my @staging = grep { /^\Q$repo_basename\E-/; } keys %STAGING_REPOS;
STAGING:
foreach my $staging_repo (@staging) {
# nothing to do if remote already exists
next STAGING if ($current_remotes{$staging_repo});
my $staging_repo_url = $STAGING_REPOS{$staging_repo};
if ($protocol) {
if ($protocol ne 'http') {
$staging_repo_url =~ s,^git://gitorious\.org/qt-labs/,${url_base_for_protocol}qt/,;
}
$staging_repo_url =~ s,^git://gitorious\.org/,$url_base_for_protocol,;
}
$self->exe('git', 'remote', 'add', $staging_repo, $staging_repo_url);
}
return;
}
sub git_clone_one_submodule sub git_clone_one_submodule
{ {
my ($self, $submodule, $url) = @_; my ($self, $submodule, $url) = @_;
@@ -406,8 +443,6 @@ sub git_clone_one_submodule
my $alternates = $self->{ 'alternates' }; my $alternates = $self->{ 'alternates' };
my $mirror_url = $self->{ 'mirror-url' }; my $mirror_url = $self->{ 'mirror-url' };
my $mirror_webkit_url = $self->{ 'mirror-webkit-url' }; my $mirror_webkit_url = $self->{ 'mirror-webkit-url' };
my $protocol = $self->{protocol};
my $url_base_for_protocol = $PROTOCOLS{$protocol};
# `--reference FOO' args for the clone, if any. # `--reference FOO' args for the clone, if any.
my @reference_args; my @reference_args;
@@ -447,31 +482,7 @@ sub git_clone_one_submodule
$self->exe('git', 'remote', 'add', 'mirror', $mirror); $self->exe('git', 'remote', 'add', 'mirror', $mirror);
} }
my %current_remotes; $self->git_add_staging_remote($submodule);
for my $line (qx(git remote show)) {
chomp $line;
$current_remotes{$line} = 1;
}
# We assume that any staging starting with `$submodule-' relates to this
# submodule. For example, for the `qtbase' module, `qtbase-staging'
# and `qtbase-earth-staging' are considered as related staging repos.
my @staging = grep { /^\Q$submodule\E-/; } keys %STAGING_REPOS;
STAGING:
foreach my $staging_repo (@staging) {
# nothing to do if remote already exists
next STAGING if ($current_remotes{$staging_repo});
my $staging_repo_url = $STAGING_REPOS{$staging_repo};
if ($protocol) {
if ($protocol ne 'http') {
$staging_repo_url =~ s,^git://gitorious\.org/qt-labs/,${url_base_for_protocol}qt/,;
}
$staging_repo_url =~ s,^git://gitorious\.org/,$url_base_for_protocol,;
}
$self->exe('git', 'remote', 'add', $staging_repo, $staging_repo_url);
}
if ($self->{'detach-alternates'}) { if ($self->{'detach-alternates'}) {
$self->exe('git', 'repack', '-a'); $self->exe('git', 'repack', '-a');
@@ -502,6 +513,8 @@ sub run
$self->git_clone_all_submodules; $self->git_clone_all_submodules;
} }
$self->git_add_staging_remote('qt5');
return; return;
} }