keep information about default repos in .gitmodules

it's backwards to keep this in the script itself.

Change-Id: I4248ba3fef984bdff5d034cb2e6db6cae3209d68
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2014-08-15 19:11:24 +02:00
parent 485f5f3776
commit 6ab23f16f5
2 changed files with 35 additions and 36 deletions

29
.gitmodules vendored
View File

@ -1,51 +1,67 @@
[submodule "qtbase"] [submodule "qtbase"]
path = qtbase path = qtbase
url = ../qtbase.git url = ../qtbase.git
initrepo = true
[submodule "qtsvg"] [submodule "qtsvg"]
path = qtsvg path = qtsvg
url = ../qtsvg.git url = ../qtsvg.git
initrepo = true
[submodule "qtdeclarative"] [submodule "qtdeclarative"]
path = qtdeclarative path = qtdeclarative
url = ../qtdeclarative.git url = ../qtdeclarative.git
initrepo = true
[submodule "qtactiveqt"] [submodule "qtactiveqt"]
path = qtactiveqt path = qtactiveqt
url = ../qtactiveqt.git url = ../qtactiveqt.git
initrepo = true
[submodule "qtscript"] [submodule "qtscript"]
path = qtscript path = qtscript
url = ../qtscript.git url = ../qtscript.git
initrepo = true
[submodule "qtmultimedia"] [submodule "qtmultimedia"]
path = qtmultimedia path = qtmultimedia
url = ../qtmultimedia.git url = ../qtmultimedia.git
initrepo = true
[submodule "qttools"] [submodule "qttools"]
path = qttools path = qttools
url = ../qttools.git url = ../qttools.git
initrepo = true
[submodule "qtxmlpatterns"] [submodule "qtxmlpatterns"]
path = qtxmlpatterns path = qtxmlpatterns
url = ../qtxmlpatterns.git url = ../qtxmlpatterns.git
initrepo = true
[submodule "qttranslations"] [submodule "qttranslations"]
path = qttranslations path = qttranslations
url = ../qttranslations.git url = ../qttranslations.git
initrepo = true
[submodule "qtdoc"] [submodule "qtdoc"]
path = qtdoc path = qtdoc
url = ../qtdoc.git url = ../qtdoc.git
initrepo = true
[submodule "qtrepotools"] [submodule "qtrepotools"]
path = qtrepotools path = qtrepotools
url = ../qtrepotools.git url = ../qtrepotools.git
initrepo = true
[submodule "qtwebkit"] [submodule "qtwebkit"]
path = qtwebkit path = qtwebkit
url = ../qtwebkit.git url = ../qtwebkit.git
initrepo = true
[submodule "qtwebkit-examples"] [submodule "qtwebkit-examples"]
path = qtwebkit-examples path = qtwebkit-examples
url = ../qtwebkit-examples.git url = ../qtwebkit-examples.git
initrepo = true
[submodule "qtqa"] [submodule "qtqa"]
path = qtqa path = qtqa
url = ../qtqa.git url = ../qtqa.git
initrepo = true
[submodule "qtlocation"] [submodule "qtlocation"]
path = qtlocation path = qtlocation
url = ../qtlocation.git url = ../qtlocation.git
initrepo = true
[submodule "qtsensors"] [submodule "qtsensors"]
path = qtsensors path = qtsensors
url = ../qtsensors.git url = ../qtsensors.git
initrepo = true
[submodule "qtsystems"] [submodule "qtsystems"]
path = qtsystems path = qtsystems
url = ../qtsystems.git url = ../qtsystems.git
@ -61,6 +77,7 @@
[submodule "qtconnectivity"] [submodule "qtconnectivity"]
path = qtconnectivity path = qtconnectivity
url = ../qtconnectivity.git url = ../qtconnectivity.git
initrepo = true
[submodule "qtwayland"] [submodule "qtwayland"]
path = qtwayland path = qtwayland
url = ../qtwayland.git url = ../qtwayland.git
@ -73,39 +90,51 @@
[submodule "qtimageformats"] [submodule "qtimageformats"]
path = qtimageformats path = qtimageformats
url = ../qtimageformats.git url = ../qtimageformats.git
initrepo = true
[submodule "qtquick1"] [submodule "qtquick1"]
path = qtquick1 path = qtquick1
url = ../qtquick1.git url = ../qtquick1.git
[submodule "qtgraphicaleffects"] [submodule "qtgraphicaleffects"]
path = qtgraphicaleffects path = qtgraphicaleffects
url = ../qtgraphicaleffects.git url = ../qtgraphicaleffects.git
initrepo = true
[submodule "qtquickcontrols"] [submodule "qtquickcontrols"]
path = qtquickcontrols path = qtquickcontrols
url = ../qtquickcontrols.git url = ../qtquickcontrols.git
initrepo = true
[submodule "qtserialport"] [submodule "qtserialport"]
path = qtserialport path = qtserialport
url = ../qtserialport.git url = ../qtserialport.git
initrepo = true
[submodule "qtx11extras"] [submodule "qtx11extras"]
path = qtx11extras path = qtx11extras
url = ../qtx11extras.git url = ../qtx11extras.git
initrepo = true
[submodule "qtmacextras"] [submodule "qtmacextras"]
path = qtmacextras path = qtmacextras
url = ../qtmacextras.git url = ../qtmacextras.git
initrepo = true
[submodule "qtwinextras"] [submodule "qtwinextras"]
path = qtwinextras path = qtwinextras
url = ../qtwinextras.git url = ../qtwinextras.git
initrepo = true
[submodule "qtandroidextras"] [submodule "qtandroidextras"]
path = qtandroidextras path = qtandroidextras
url = ../qtandroidextras.git url = ../qtandroidextras.git
initrepo = true
[submodule "qtenginio"] [submodule "qtenginio"]
path = qtenginio path = qtenginio
url = ../qtenginio.git url = ../qtenginio.git
initrepo = true
[submodule "qtwebsockets"] [submodule "qtwebsockets"]
path = qtwebsockets path = qtwebsockets
url = ../qtwebsockets.git url = ../qtwebsockets.git
initrepo = true
[submodule "qtwebchannel"] [submodule "qtwebchannel"]
path = qtwebchannel path = qtwebchannel
url = ../qtwebchannel.git url = ../qtwebchannel.git
initrepo = true
[submodule "qtwebengine"] [submodule "qtwebengine"]
path = qtwebengine path = qtwebengine
url = ../qtwebengine.git url = ../qtwebengine.git
initrepo = true

View File

@ -191,40 +191,6 @@ use Getopt::Long qw( GetOptionsFromArray );
use Pod::Usage qw( pod2usage ); use Pod::Usage qw( pod2usage );
use Cwd qw( getcwd ); use Cwd qw( getcwd );
my @DEFAULT_REPOS = qw(
qtactiveqt
qtandroidextras
qtbase
qtconnectivity
qtdeclarative
qtdoc
qtenginio
qtgraphicaleffects
qtimageformats
qtmacextras
qtmultimedia
qtqa
qtquick1
qtquickcontrols
qtlocation
qtrepotools
qtscript
qtsensors
qtserialport
qtsvg
qttools
qttranslations
qtwayland
qtwebchannel
qtwebengine
qtwebsockets
qtwebkit
qtwebkit-examples
qtwinextras
qtx11extras
qtxmlpatterns
);
my $GERRIT_SSH_BASE my $GERRIT_SSH_BASE
= 'ssh://@USER@codereview.qt-project.org@PORT@/'; = 'ssh://@USER@codereview.qt-project.org@PORT@/';
@ -304,8 +270,7 @@ sub parse_arguments
# Replace any double trailing slashes from end of mirror # Replace any double trailing slashes from end of mirror
$self->{'mirror-url'} =~ s{//+$}{/}; $self->{'mirror-url'} =~ s{//+$}{/};
$self->{'module-subset'} = [ map { $_ eq "default" ? (@DEFAULT_REPOS) : ($_) } $self->{'module-subset'} = [ split(/,/, $self->{'module-subset'}) ];
split(/,/, $self->{'module-subset'}) ];
if (!$self->{webkit}) { if (!$self->{webkit}) {
push @{$self->{'module-subset'}}, "-qtwebkit", "-qtwebkit-examples"; push @{$self->{'module-subset'}}, "-qtwebkit", "-qtwebkit-examples";
} }
@ -362,6 +327,7 @@ sub git_clone_all_submodules
my %subdirs = (); my %subdirs = ();
my %subbases = (); my %subbases = ();
my %subinits = ();
my @submodconfig = qx(git config -l -f .gitmodules); my @submodconfig = qx(git config -l -f .gitmodules);
foreach my $line (@submodconfig) { foreach my $line (@submodconfig) {
# Example line: submodule.qtqa.url=../qtqa.git # Example line: submodule.qtqa.url=../qtqa.git
@ -376,6 +342,8 @@ sub git_clone_all_submodules
$subbases{$mod} = $base; $subbases{$mod} = $base;
} elsif ($2 eq "update") { } elsif ($2 eq "update") {
push @subset, '-'.$1 if ($3 eq 'ignore'); push @subset, '-'.$1 if ($3 eq 'ignore');
} elsif ($2 eq "initrepo") {
$subinits{$1} = ($3 eq "yes" or $3 eq "true");
} }
} }
@ -383,6 +351,8 @@ sub git_clone_all_submodules
foreach my $mod (@subset) { foreach my $mod (@subset) {
if ($mod eq "all") { if ($mod eq "all") {
map { $include{$_} = 1; } keys %subbases; map { $include{$_} = 1; } keys %subbases;
} elsif ($mod eq "default") {
map { $include{$_} = 1; } grep { $subinits{$_} } keys %subbases;
} elsif ($mod =~ s/^-//) { } elsif ($mod =~ s/^-//) {
delete $include{$mod}; delete $include{$mod};
} else { } else {