lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-07 04:46:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

init-repository: Support submodules more than one dir deep

Browse Source 
Change-Id: I8783ded72032dda42bc24a855e190e0a2e699b01
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
This commit is contained in:
Jocelyn Turcotte
2014-08-14 13:44:52 +02:00
parent ce45f45dfb
commit 633051d095
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
init-repository
View File

@@ -476,10 +476,11 @@ sub git_clone_all_submodules
$self->git_clone_one_submodule($1, $2);
if ($1 eq "qtwebengine") {
$self->exe('git', 'submodule', 'update', $1);
my $orig_cwd = getcwd();
chdir($1) or confess "chdir $1: $OS_ERROR";
$self->exe('git', 'submodule', 'init');
$self->git_clone_all_submodules;
chdir("..") or confess "chdir $1: $OS_ERROR";
chdir("$orig_cwd") or confess "chdir $orig_cwd: $OS_ERROR";
}
}
}
@@ -560,6 +561,7 @@ sub git_clone_one_submodule
$self->exe('git', 'clone', @reference_args, ($mirror ? $mirror : $url), $submodule);
}
my $orig_cwd = getcwd();
chdir($submodule) or confess "chdir $submodule: $OS_ERROR";
$self->exe('git', 'config', 'remote.origin.url', $url);
@@ -588,7 +590,7 @@ sub git_clone_one_submodule
}
}
chdir("..") or confess "cd ..: $OS_ERROR";
chdir($orig_cwd) or confess "cd $orig_cwd: $OS_ERROR";
return;
}