Merge remote-tracking branch 'origin/1.4'

Conflicts:
	installerfw.pri
	tools/binarycreator/binarycreator.cpp
	tools/common/repositorygen.cpp
	tools/common/repositorygen.h
	tools/repogen/repogen.cpp

Change-Id: I97767b2e4ef9b7afd5ce368d99c6a7d38dfbd947

2 files changed, 15 insertions, 12 deletions

diff --git a/tools/common/repositorygen.cpp b/tools/common/repositorygen.cpp
index 1001c0a50..6fec75039 100644
--- a/tools/common/repositorygen.cpp
+++ b/tools/common/repositorygen.cpp
@@ -135,8 +135,7 @@ static QStringList copyFilesFromNode(const QString &parentNode, const QString &c
 }
 
 void QInstallerTools::copyMetaData(const QString &_targetDir, const QString &metaDataDir,
-    const PackageInfoVector &packages, const QString &appName, const QString &appVersion,
-    const QString &redirectUpdateUrl)
+    const PackageInfoVector &packages, const QString &appName, const QString &appVersion)
 {
     const QString targetDir = makePathAbsolute(_targetDir);
     if (!QFile::exists(targetDir))
@@ -160,7 +159,6 @@ void QInstallerTools::copyMetaData(const QString &_targetDir, const QString &met
             }
         }
         existingUpdatesXml.close();
-        // TODO: maybe we should replace or remove an existing redirect with the one given, if so
     } else {
         root = doc.createElement(QLatin1String("Updates"));
         root.appendChild(doc.createElement(QLatin1String("ApplicationName"))).appendChild(doc
@@ -169,10 +167,6 @@ void QInstallerTools::copyMetaData(const QString &_targetDir, const QString &met
             .createTextNode(appVersion));
         root.appendChild(doc.createElement(QLatin1String("Checksum"))).appendChild(doc
             .createTextNode(QLatin1String("true")));
-        if (!redirectUpdateUrl.isEmpty()) {
-            root.appendChild(doc.createElement(QLatin1String("RedirectUpdateUrl"))).appendChild(doc
-                .createTextNode(redirectUpdateUrl));
-        }
     }
 
     foreach (const PackageInfo &info, packages) {
@@ -365,7 +359,7 @@ void QInstallerTools::copyMetaData(const QString &_targetDir, const QString &met
 }
 
 PackageInfoVector QInstallerTools::createListOfPackages(const QStringList &packagesDirectories,
-    const QStringList &filteredPackages, FilterType filterType)
+    QStringList *packagesToFilter, FilterType filterType)
 {
     qDebug() << "\nCollecting information about available packages...";
 
@@ -377,11 +371,16 @@ PackageInfoVector QInstallerTools::createListOfPackages(const QStringList &packa
         entries.append(QDir(packagesDirectory).entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot));
     for (QFileInfoList::const_iterator it = entries.begin(); it != entries.end(); ++it) {
         if (filterType == Exclude) {
-            if (filteredPackages.contains(it->fileName()))
+            // Check for current file in exclude list, if found, skip it and remove it from exclude list
+            if (packagesToFilter->contains(it->fileName())) {
+                packagesToFilter->removeAll(it->fileName());
                 continue;
+            }
         } else {
-            if (!filteredPackages.contains(it->fileName()))
+            // Check for current file in include list, if not found, skip it; if found, remove it from include list
+            if (!packagesToFilter->contains(it->fileName()))
                 continue;
+            packagesToFilter->removeAll(it->fileName());
         }
         qDebug() << QString::fromLatin1("found subdirectory '%1'").arg(it->fileName());
         // because the filter is QDir::Dirs - filename means the name of the subdirectory
@@ -448,6 +447,10 @@ PackageInfoVector QInstallerTools::createListOfPackages(const QStringList &packa
         qDebug() << QString::fromLatin1("- it provides the package %1 - %2").arg(info.name, info.version);
     }
 
+    if (!packagesToFilter->isEmpty()) {
+        qWarning() << "The following explicitly given packages could not be found\n in package directory:" << *packagesToFilter;
+    }
+
     if (dict.isEmpty())
         qDebug() << "No available packages found at the specified location.";
 
diff --git a/tools/common/repositorygen.h b/tools/common/repositorygen.h
index c90f8332f..300ad3ca1 100644
--- a/tools/common/repositorygen.h
+++ b/tools/common/repositorygen.h
@@ -68,7 +68,7 @@ void printRepositoryGenOptions();
 QString makePathAbsolute(const QString &path);
 void copyWithException(const QString &source, const QString &target, const QString &kind = QString());
 
-PackageInfoVector createListOfPackages(const QStringList &packagesDirectory, const QStringList &filteredPackages,
+PackageInfoVector createListOfPackages(const QStringList &packagesDirectories, QStringList *packagesToFilter,
     FilterType ftype);
 QHash<QString, QString> buildPathToVersionMapping(const PackageInfoVector &info);
 
@@ -77,7 +77,7 @@ void compressMetaDirectories(const QString &repoDir, const QString &baseDir,
     const QHash<QString, QString> &versionMapping);
 
 void copyMetaData(const QString &outDir, const QString &dataDir, const PackageInfoVector &packages,
-    const QString &appName, const QString& appVersion, const QString &redirectUpdateUrl = QString());
+    const QString &appName, const QString& appVersion);
 void copyComponentData(const QStringList &packageDir, const QString &repoDir, PackageInfoVector *const infos);