diff options
| -rwxr-xr-x | init-repository | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/init-repository b/init-repository index e4555da3..4192929c 100755 --- a/init-repository +++ b/init-repository @@ -629,7 +629,7 @@ sub git_clone_one_submodule unlink($alternates_path) || confess "unlink $alternates_path: $OS_ERROR"; } - if ($submodule eq "qtdeclarative") { #Extra step needed to setup declarative + if ($submodule eq "qtbase" || $submodule eq "qtdeclarative") { #Extra steps needed to setup base and declarative $self->exe('git', 'submodule', 'init'); if ($mirror_v8_url || $protocol eq 'http') { my @configresult = qx(git config -l); @@ -640,23 +640,25 @@ sub git_clone_one_submodule $v8url = $1; } - if ($protocol eq 'http') { - # rewrite the git:// url to https:// - if ($v8url =~ s{^git://github}{https://github}) { - $self->exe('git', 'config', 'submodule.src/3rdparty/v8.url', $v8url); + if ($v8url) { + if ($protocol eq 'http') { + # rewrite the git:// url to https:// + if ($v8url =~ s{^git://github}{https://github}) { + $self->exe('git', 'config', 'submodule.src/3rdparty/v8.url', $v8url); + } + else { + warn 'You requested git over http, but I could not figure out how to ' + ."rewrite v8's giturl of $v8url"; + } } - else { - warn 'You requested git over http, but I could not figure out how to ' - ."rewrite v8's giturl of $v8url"; - } - } - if ($mirror_v8_url && $do_clone) { - chdir('src/3rdparty/') or confess "chdir $submodule/src/3rdparty: $OS_ERROR"; - $self->exe('git', 'clone', $mirror_v8_url, 'v8'); - chdir('v8') or confess "chdir $submodule/src/3rdparty/v8: $OS_ERROR"; - $self->exe('git', 'config', 'remote.origin.url', $v8url); - chdir('../../..') or confess "cd ../../..: $OS_ERROR"; + if ($mirror_v8_url && $do_clone) { + chdir('src/3rdparty/') or confess "chdir $submodule/src/3rdparty: $OS_ERROR"; + $self->exe('git', 'clone', $mirror_v8_url, 'v8'); + chdir('v8') or confess "chdir $submodule/src/3rdparty/v8: $OS_ERROR"; + $self->exe('git', 'config', 'remote.origin.url', $v8url); + chdir('../../..') or confess "cd ../../..: $OS_ERROR"; + } } } $self->exe('git', 'submodule', 'update'); |