Compare commits

...

7 Commits

Author SHA1 Message Date
Iikka Eklund
84a1676ed6 Update .gitmodules for automated release src package creation
Introduce new "deprecated" value for status attribute.

We have two flavors of big source packages we need to produce:

qt-everywhere-* which needs to include:

 - essential
 - addon
 - preview
 - deprecated (e.g. qtscript and qtenginio for Qt5.6 release)

Installer only specific source package:

 - essential
 - addon

 The rest (deprecated, preview, ...) need to be shown as split src
 packages in the installer.

The above leads to the following changes:

qtscript: addon -> deprecated

 Needs to be part of big src packages but excluded from installer
 specific big source package.

qtenginio: obsolete -> deprecated

 We can't exclude this module from qt-everywhere src packages.

qtwayland: preview -> addon

 Needs to be part of installer specific big src package and the
 module status is not preview anymore.

Change-Id: I52e10629bf81860f56ebc4ce9d395e0ca54c4264
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-03-08 17:54:29 +00:00
Qt Submodule Update Bot
5e15831271 Updated submodules.
Change-Id: Id993273e16fbbffd43d958419ab103a857fd1346
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2016-03-04 04:26:10 +00:00
Qt Submodule Update Bot
d74af1270a Updated submodules.
Change-Id: I49c2a3948ba6c7e8a12f1077b96ddbde1453f67e
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-03-03 00:11:54 +00:00
Qt Submodule Update Bot
e6076450e1 Updated submodules.
Change-Id: I3459d79f2daa9d681759f0cb7b8c841aeae7179a
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2016-02-27 20:21:00 +00:00
Qt Submodule Update Bot
fb1345171a Updated submodules.
Change-Id: Ife7e51372a57f53efefc1fe0c8c805442908d8d9
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2016-02-19 05:24:28 +00:00
Qt Submodule Update Bot
6bdec75429 Updated submodules.
Change-Id: I6ad2f0dfbfb78f8f4d9c20f81a84803472a4b31c
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2016-02-16 12:15:51 +00:00
Qt Submodule Update Bot
6efabf6dfe Updated submodules.
Change-Id: I444b4f3ddbb851d94abda55e2e2dfcfee3921d94
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
2016-02-15 10:26:46 +00:00
23 changed files with 37 additions and 31 deletions

6
.gitmodules vendored
View File

@@ -28,7 +28,7 @@
path = qtscript path = qtscript
url = ../qtscript.git url = ../qtscript.git
branch = 5.6.0 branch = 5.6.0
status = addon status = deprecated
[submodule "qtmultimedia"] [submodule "qtmultimedia"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
@@ -144,7 +144,7 @@
path = qtwayland path = qtwayland
url = ../qtwayland.git url = ../qtwayland.git
branch = 5.6.0 branch = 5.6.0
status = preview status = addon
[submodule "qt3d"] [submodule "qt3d"]
depends = qtdeclarative qtimageformats depends = qtdeclarative qtimageformats
path = qt3d path = qt3d
@@ -219,7 +219,7 @@
path = qtenginio path = qtenginio
url = ../qtenginio.git url = ../qtenginio.git
branch = 5.6.0 branch = 5.6.0
status = obsolete status = deprecated
[submodule "qtwebsockets"] [submodule "qtwebsockets"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative

View File

@@ -72,11 +72,12 @@ Options:
Only initialize the specified subset of modules given as the Only initialize the specified subset of modules given as the
argument. Specified modules must already exist in .gitmodules. The argument. Specified modules must already exist in .gitmodules. The
string "all" results in cloning all known modules. The strings string "all" results in cloning all known modules. The strings
"essential", "addon", "preview", "obsolete", and "ignore" refer to "essential", "addon", "preview", "deprecated", "obsolete", and
classes of modules; "default" maps to "essential,addon,preview", "ignore" refer to classes of modules; "default" maps to
which corresponds with the set of maintained modules and is also "essential,addon,preview,deprecated", which corresponds with the
the default set. Module names may be prefixed with a dash to set of maintained modules and is also the default set. Module
exclude them from a bigger set, e.g. "all,-ignore". names may be prefixed with a dash to exclude them from a bigger
set, e.g. "all,-ignore".
--no-update --no-update
Skip the `git submodule update' command. Skip the `git submodule update' command.
@@ -237,7 +238,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'} =~ s/\bdefault\b/preview,essential,addon/; $self->{'module-subset'} =~ s/\bdefault\b/preview,essential,addon,deprecated/;
$self->{'module-subset'} = [ split(/,/, $self->{'module-subset'}) ]; $self->{'module-subset'} = [ split(/,/, $self->{'module-subset'}) ];
return; return;
@@ -280,7 +281,8 @@ use constant {
STS_PREVIEW => 1, STS_PREVIEW => 1,
STS_ESSENTIAL => 2, STS_ESSENTIAL => 2,
STS_ADDON => 3, STS_ADDON => 3,
STS_OBSOLETE => 4 STS_DEPRECATED => 4,
STS_OBSOLETE => 5
}; };
sub git_clone_all_submodules sub git_clone_all_submodules
@@ -314,6 +316,8 @@ sub git_clone_all_submodules
$subinits{$1} = STS_ESSENTIAL; $subinits{$1} = STS_ESSENTIAL;
} elsif ($3 eq "addon") { } elsif ($3 eq "addon") {
$subinits{$1} = STS_ADDON; $subinits{$1} = STS_ADDON;
} elsif ($3 eq "deprecated") {
$subinits{$1} = STS_DEPRECATED;
} elsif ($3 eq "obsolete") { } elsif ($3 eq "obsolete") {
$subinits{$1} = STS_OBSOLETE; $subinits{$1} = STS_OBSOLETE;
} elsif ($3 eq "ignore") { } elsif ($3 eq "ignore") {
@@ -334,6 +338,8 @@ sub git_clone_all_submodules
map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_ADDON } keys %subbases; map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_ADDON } keys %subbases;
} elsif ($mod eq "preview") { } elsif ($mod eq "preview") {
map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_PREVIEW } keys %subbases; map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_PREVIEW } keys %subbases;
} elsif ($mod eq "deprecated") {
map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_DEPRECATED } keys %subbases;
} elsif ($mod eq "obsolete") { } elsif ($mod eq "obsolete") {
map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_OBSOLETE } keys %subbases; map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_OBSOLETE } keys %subbases;
} elsif ($mod =~ s/^-//) { } elsif ($mod =~ s/^-//) {

2
qt3d

Submodule qt3d updated: 190795b1f8...7a208d76ed

2
qtbase

Submodule qtbase updated: 8c2b426600...d0cdc7ad1e

2
qtdoc

Submodule qtdoc updated: 2479b039d1...2ed0ac4bbb

2
qtqa

Submodule qtqa updated: e5bbdb2162...683f523bcc

Submodule qttools updated: eb59d8084a...9904992dc4