lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-17 10:36:07 +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:
  Have init-repository init nested submodule in qtdeclarative
  Add --berlin to set up WebKit mirror accordingly.
This commit is contained in:
Qt Continuous Integration System
2011-06-22 01:23:17 +10:00
parent 865e04b617 8484878f25
commit f899887738
1 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
init-repository
View File

@@ -120,6 +120,11 @@ Switch to internal Nokia URLs.
Switch to internal Nokia URLs and make use of the Brisbane git mirrors.
(Implies `--mirror' and `--mirror-webkit').
=item --berlin
Switch to internal Nokia URLs and make use of the Berlin git mirrors.
(Implies `--mirror' and `--mirror-webkit').
=item --ssh
@@ -231,6 +236,13 @@ my $BNE_MIRROR_URL_BASE
my $BNE_MIRROR_WEBKIT_URL
= 'git://bq-git.apac.nokia.com/qtsoftware/research/gitorious-org-webkit-qtwebkit-mirror.git';
my $BER_MIRROR_URL_BASE
= 'git://ber-git.europe.nokia.com/qt/';
my $BER_MIRROR_WEBKIT_URL
= 'git://ber-git.europe.nokia.com/qtwebkit/qtwebkit.git';
sub new
{
my ($class, @arguments) = @_;
@@ -301,6 +313,13 @@ sub parse_arguments
$self->{'ignore-submodules'} = 1;
},
'berlin|berlin-nokia-developer' => sub {
$self->{'nokia-developer'} = 1;
$self->{'protocol'} = 'internal';
$self->{'mirror-url'} = $BER_MIRROR_URL_BASE;
$self->{'mirror-webkit-url'} = $BER_MIRROR_WEBKIT_URL;
},
'nokia-developer' => sub {
$self->{'nokia-developer'} = 1;
$self->{'protocol'} = 'internal';
@@ -560,6 +579,11 @@ sub git_clone_one_submodule
unlink($alternates_path) || confess "unlink $alternates_path: $OS_ERROR";
}
if ($submodule eq "qtdeclarative") { #Extra step needed to setup declarative
$self->exe('git', 'submodule', 'init');
$self->exe('git', 'submodule', 'update');
}
chdir("..") or confess "cd ..: $OS_ERROR";
return;