diff options
| author | Alexander Lenhardt <alexander.lenhardt@nokia.com> | 2011-11-03 13:51:32 +0100 |
|---|---|---|
| committer | Alexander Lenhardt <alexander.lenhardt@nokia.com> | 2011-11-04 11:28:33 +0100 |
| commit | d0036d6138e27dccc25512d00274a941b60ef535 (patch) | |
| tree | 71cefc39571f6960f003b315254211278133ab3b /installerbuilder/common | |
| parent | 3e742ba4937aa1336314850c27aa8874400d8533 (diff) | |
added support for updateUrl redirects
- Updates.xml can now have a tag <RedirectUpdateUrl> which can be set via
repogen -u [URL]
Change-Id: I6748d32341464a868b27e937f104f5601c39a726
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Diffstat (limited to 'installerbuilder/common')
| -rw-r--r-- | installerbuilder/common/repositorygen.cpp | 11 | ||||
| -rw-r--r-- | installerbuilder/common/repositorygen.h | 5 |
2 files changed, 9 insertions, 7 deletions
diff --git a/installerbuilder/common/repositorygen.cpp b/installerbuilder/common/repositorygen.cpp index d281e267b..a0510b6c7 100644 --- a/installerbuilder/common/repositorygen.cpp +++ b/installerbuilder/common/repositorygen.cpp @@ -326,10 +326,11 @@ void QInstaller::compressMetaDirectories(const QString& configDir, const QString } } -void QInstaller::generateMetaDataDirectory(const QString& metapath_, const QString& dataDir, - const QVector< PackageInfo >& packages, const QString& appName, const QString& appVersion) +void QInstaller::generateMetaDataDirectory(const QString& outDir, const QString& dataDir, + const QVector< PackageInfo >& packages, const QString& appName, const QString& appVersion, + const QString &redirectUpdateUrl) { - QString metapath = metapath_; + QString metapath = outDir; if (QFileInfo(metapath).isRelative()) metapath = QDir::cleanPath(QDir::current().absoluteFilePath(metapath)); verbose() << "Generating meta data..." << std::endl; @@ -349,6 +350,10 @@ void QInstaller::generateMetaDataDirectory(const QString& metapath_, const QStri doc.createTextNode(appVersion)); root.appendChild(doc.createElement("Checksum")).appendChild( doc.createTextNode(QLatin1String("true"))); + if (!redirectUpdateUrl.isEmpty()) { + root.appendChild(doc.createElement("RedirectUpdateUrl")).appendChild( + doc.createTextNode(redirectUpdateUrl)); + } } else { root = doc.documentElement(); } diff --git a/installerbuilder/common/repositorygen.h b/installerbuilder/common/repositorygen.h index 0e149a9ca..ddd12a61d 100644 --- a/installerbuilder/common/repositorygen.h +++ b/installerbuilder/common/repositorygen.h @@ -48,12 +48,9 @@ namespace QInstaller { const QVector<PackageInfo> &infos ); void generateMetaDataDirectory( const QString &outDir, const QString &dataDir, const QVector<PackageInfo> &packages, const QString &appName, - const QString& appVersion ); + const QString& appVersion, const QString &redirectUpdateUrl = QString() ); QVector<PackageInfo> createListOfPackages( const QStringList &components, const QString &packagesDirectory, bool addDependencies = true ); - void generateMetaDataDirectory( const QString &outDir, const QString &dataDir, - const QVector<PackageInfo> &packages, const QString &appName, - const QString &appVersion ); } #endif // QINSTALLER_REPOSITORYGEN_H |