qiurui
/
qt5
mirror of https://github.com/qt/qt5.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove init-repository assumption of repo url “…/qt/<repo>” 

Task-number: QTBUG-59355
Change-Id: I7bc2c94f13c6cf43bd9d4472f18b3b769e75954b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Jason Erb 2017-03-07 18:08:11 -05:00 committed by Jason Erb (Suitable Technologies)
parent 460cfd01b3
commit 8c0390143b
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
init-repository
View File

@ -144,7 +144,7 @@ Options:
For example: For example:
--mirror user\@machine:/foo/bar/ --mirror user\@machine:/foo/bar/qt/
...will use the following as a mirror for qtbase: ...will use the following as a mirror for qtbase:
@ -167,13 +167,13 @@ my $script_path = abs_path($0);
$script_path =~ s,[/\\][^/\\]+$,,; $script_path =~ s,[/\\][^/\\]+$,,;
my $GERRIT_SSH_BASE my $GERRIT_SSH_BASE
= 'ssh://@USER@codereview.qt-project.org@PORT@/'; = 'ssh://@USER@codereview.qt-project.org@PORT@/qt/';
my $BER_MIRROR_URL_BASE my $BER_MIRROR_URL_BASE
= 'git://hegel/'; = 'git://hegel/qt/';
my $OSLO_MIRROR_URL_BASE my $OSLO_MIRROR_URL_BASE
= 'git://qilin/'; = 'git://qilin/qt/';
sub new sub new
{ {
@ -638,12 +638,12 @@ sub run
chomp(my $url = `git config remote.origin.url`); chomp(my $url = `git config remote.origin.url`);
die("Have no origin remote.\n") if (!$url); die("Have no origin remote.\n") if (!$url);
$url =~ s,\.git$,,; $url =~ s,\.git$,,;
$url =~ s,qt/qt5$,,; $url =~ s/qt5$//;
$self->{'base-url'} = $url; $self->{'base-url'} = $url;
$self->git_clone_all_submodules('qt/qt5', $self->{branch}, @{$self->{'module-subset'}}); $self->git_clone_all_submodules('qt5', $self->{branch}, @{$self->{'module-subset'}});
$self->git_add_remotes('qt/qt5'); $self->git_add_remotes('qt5');
$self->git_install_hooks; $self->git_install_hooks;