From 84a1676ed6566d548f2cce35ced9c0524f41c349 Mon Sep 17 00:00:00 2001
From: Iikka Eklund <iikka.eklund@theqtcompany.com>
Date: Fri, 4 Mar 2016 10:11:25 +0200
Subject: 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>
---
 .gitmodules     |  6 +++---
 init-repository | 20 +++++++++++++-------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 6f4cf63c..7b606d91 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,7 +28,7 @@
 	path = qtscript
 	url = ../qtscript.git
 	branch = 5.6.0
-	status = addon
+	status = deprecated
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
@@ -144,7 +144,7 @@
 	path = qtwayland
 	url = ../qtwayland.git
 	branch = 5.6.0
-	status = preview
+	status = addon
 [submodule "qt3d"]
 	depends = qtdeclarative qtimageformats
 	path = qt3d
@@ -219,7 +219,7 @@
 	path = qtenginio
 	url = ../qtenginio.git
 	branch = 5.6.0
-	status = obsolete
+	status = deprecated
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
diff --git a/init-repository b/init-repository
index ae3f0495..cf9487a2 100755
--- a/init-repository
+++ b/init-repository
@@ -72,11 +72,12 @@ Options:
         Only initialize the specified subset of modules given as the
         argument. Specified modules must already exist in .gitmodules. The
         string "all" results in cloning all known modules. The strings
-        "essential", "addon", "preview", "obsolete", and "ignore" refer to
-        classes of modules; "default" maps to "essential,addon,preview",
-        which corresponds with the set of maintained modules and is also
-        the default set. Module names may be prefixed with a dash to
-        exclude them from a bigger set, e.g. "all,-ignore".
+        "essential", "addon", "preview", "deprecated", "obsolete", and
+        "ignore" refer to classes of modules; "default" maps to
+        "essential,addon,preview,deprecated", which corresponds with the
+        set of maintained modules and is also the default set. Module
+        names may be prefixed with a dash to exclude them from a bigger
+        set, e.g. "all,-ignore".
 
     --no-update
         Skip the `git submodule update' command.
@@ -237,7 +238,7 @@ sub parse_arguments
     # Replace any double trailing slashes from end of mirror
     $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'}) ];
 
     return;
@@ -280,7 +281,8 @@ use constant {
     STS_PREVIEW => 1,
     STS_ESSENTIAL => 2,
     STS_ADDON => 3,
-    STS_OBSOLETE => 4
+    STS_DEPRECATED => 4,
+    STS_OBSOLETE => 5
 };
 
 sub git_clone_all_submodules
@@ -314,6 +316,8 @@ sub git_clone_all_submodules
                 $subinits{$1} = STS_ESSENTIAL;
             } elsif ($3 eq "addon") {
                 $subinits{$1} = STS_ADDON;
+            } elsif ($3 eq "deprecated") {
+                $subinits{$1} = STS_DEPRECATED;
             } elsif ($3 eq "obsolete") {
                 $subinits{$1} = STS_OBSOLETE;
             } elsif ($3 eq "ignore") {
@@ -334,6 +338,8 @@ sub git_clone_all_submodules
             map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_ADDON } keys %subbases;
         } elsif ($mod eq "preview") {
             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") {
             map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_OBSOLETE } keys %subbases;
         } elsif ($mod =~ s/^-//) {
-- 
cgit v1.2.3