diff options
author | Jason Erb <erb@suitabletech.com> | 2017-03-07 18:08:11 -0500 |
---|---|---|
committer | Jason Erb (Suitable Technologies) <erb@suitabletech.com> | 2017-03-13 15:18:47 +0000 |
commit | 8c0390143b847b1b8ed7b8b42d5a09aa2c0025df (patch) | |
tree | 0e3a5c09e964f22ee36e8f2d69825197b63a2dd8 /init-repository | |
parent | 460cfd01b3ee32bc35fcfb7b58c783680e14ddcc (diff) | |
download | qt5-8c0390143b847b1b8ed7b8b42d5a09aa2c0025df.tar.gz |
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>
Diffstat (limited to 'init-repository')
-rwxr-xr-x | init-repository | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/init-repository b/init-repository index 7a97c199..570e124f 100755 --- a/init-repository +++ b/init-repository @@ -144,7 +144,7 @@ Options: For example: - --mirror user\@machine:/foo/bar/ + --mirror user\@machine:/foo/bar/qt/ ...will use the following as a mirror for qtbase: @@ -167,13 +167,13 @@ my $script_path = abs_path($0); $script_path =~ s,[/\\][^/\\]+$,,; my $GERRIT_SSH_BASE - = 'ssh://@USER@codereview.qt-project.org@PORT@/'; + = 'ssh://@USER@codereview.qt-project.org@PORT@/qt/'; my $BER_MIRROR_URL_BASE - = 'git://hegel/'; + = 'git://hegel/qt/'; my $OSLO_MIRROR_URL_BASE - = 'git://qilin/'; + = 'git://qilin/qt/'; sub new { @@ -638,12 +638,12 @@ sub run chomp(my $url = `git config remote.origin.url`); die("Have no origin remote.\n") if (!$url); $url =~ s,\.git$,,; - $url =~ s,qt/qt5$,,; + $url =~ s/qt5$//; $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; |