From 17401372c003949a86540c7581e830b980606b73 Mon Sep 17 00:00:00 2001
From: Niels Weber <niels.weber@digia.com>
Date: Thu, 6 Jun 2013 09:49:46 +0200
Subject: Remove broken repogen -u functionality.

Change-Id: I5199dac61e05278e85ef44e72bd30dd281881d28
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
---
 tools/common/repositorygen.cpp |  8 +-------
 tools/common/repositorygen.h   |  2 +-
 tools/repogen/repogen.cpp      | 11 +----------
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/tools/common/repositorygen.cpp b/tools/common/repositorygen.cpp
index e820436fe..60a38377c 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) {
diff --git a/tools/common/repositorygen.h b/tools/common/repositorygen.h
index 49a81eb1d..d9a4ec476 100644
--- a/tools/common/repositorygen.h
+++ b/tools/common/repositorygen.h
@@ -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 QString &packageDir, const QString &repoDir, PackageInfoVector *const infos);
 
 
diff --git a/tools/repogen/repogen.cpp b/tools/repogen/repogen.cpp
index dfa8852f3..74829be2a 100644
--- a/tools/repogen/repogen.cpp
+++ b/tools/repogen/repogen.cpp
@@ -69,8 +69,6 @@ static void printUsage()
     QInstallerTools::printRepositoryGenOptions();
 
     std::cout << "  -r|--remove               Force removing target directory if existent." << std::endl;
-    std::cout << "  -u|--updateurl            URL instructs clients to receive updates from a " << std::endl;
-    std::cout << "                            different location" << std::endl;
 
     std::cout << "  --update                  Update a set of existing components (defined by " << std::endl;
     std::cout << "                            --include or --exclude) in the repository" << std::endl;
@@ -104,7 +102,6 @@ int main(int argc, char** argv)
         QStringList filteredPackages;
         bool updateExistingRepository = false;
         QString packagesDir;
-        QString redirectUpdateUrl;
         QInstallerTools::FilterType filterType = QInstallerTools::Exclude;
         bool remove = false;
 
@@ -154,12 +151,6 @@ int main(int argc, char** argv)
                     return printErrorAndUsageAndExit(QObject::tr("Error: Config parameter missing argument"));
                 args.removeFirst();
                 std::cout << "Config file parameter is deprecated and ignored." << std::endl;
-            } else if (args.first() == QLatin1String("-u") || args.first() == QLatin1String("--updateurl")) {
-                args.removeFirst();
-                if (args.isEmpty())
-                    return printErrorAndUsageAndExit(QObject::tr("Error: Config parameter missing argument"));
-                redirectUpdateUrl = args.first();
-                args.removeFirst();
             } else if (args.first() == QLatin1String("--ignore-translations")
                 || args.first() == QLatin1String("--ignore-invalid-packages")) {
                     args.removeFirst();
@@ -204,7 +195,7 @@ int main(int argc, char** argv)
         tmpMetaDir = QInstaller::createTemporaryDirectory();
         QInstallerTools::copyComponentData(packagesDir, repositoryDir, &packages);
         QInstallerTools::copyMetaData(tmpMetaDir, repositoryDir, packages, QLatin1String("{AnyApplication}"),
-            QLatin1String(QUOTE(IFW_REPOSITORY_FORMAT_VERSION)), redirectUpdateUrl);
+            QLatin1String(QUOTE(IFW_REPOSITORY_FORMAT_VERSION)));
         QInstallerTools::compressMetaDirectories(tmpMetaDir, tmpMetaDir, pathToVersionMapping);
 
         QDirIterator it(repositoryDir, QStringList(QLatin1String("Updates*.xml")), QDir::Files | QDir::CaseSensitive);
-- 
cgit v1.2.3