diff options
author | Liang Qi <liang.qi@qt.io> | 2017-04-01 11:40:15 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-04-03 12:06:27 +0000 |
commit | 285ee106e7748a08ab1271b140cfe0429587e2a6 (patch) | |
tree | bac0ab40f6e38462eaf4337b724ba2f32cba89c4 /init-repository | |
parent | 95223c7466afb4791f630cd76c6574f13e7506b3 (diff) | |
parent | e00cb3ac596db7200108174cd85c66f4e3c1107a (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.9v5.9.0-beta1
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
This also fixes the 7Z extraction code to work on the windows 7 x86
installation where 7z is not in the PATH anymore with revision 2. The
fallback code was 64-bit only and needs the null check for ProgramFiles(x86)
along with the fall back to ProgramFiles to locate the 7z executable.
Change-Id: Ifcf014c3a99685c427a62898e1fa83910a4a7247
Diffstat (limited to 'init-repository')
-rwxr-xr-x | init-repository | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/init-repository b/init-repository index 7a97c199..ff3390f8 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 { @@ -381,7 +381,7 @@ sub git_clone_all_submodules # manually clone each repo here, so we can easily use reference repos, mirrors etc my @configresult = qx(git config -l); foreach my $line (@configresult) { - # Example line: submodule.qtqa.url=git://gitorious.org/qt/qtqa.git + # Example line: submodule.qtqa.url=git://code.qt.io/qt/qtqa.git next if ($line !~ /submodule\.([^.=]+)\.url=/); my $module = $1; @@ -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; |