diff options
author | tjenssen <tim.jenssen@digia.com> | 2012-09-27 15:51:34 +0200 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@digia.com> | 2012-09-28 13:44:51 +0200 |
commit | 05d52508571c37f46df6b5a538bf5239c0fe43d6 (patch) | |
tree | 255f5642bbdc9c09c4a96a9037bc7d3ac3ee837c | |
parent | a66d7bf15aabdb04b113b3c6a3fa1b96e4c85fe4 (diff) |
remove unused arch dependend filesize info
Change-Id: Ie1e187038378ddc6b4fa446b2f0b526cf65f40ad
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Niels Weber <niels.weber@digia.com>
-rw-r--r-- | src/libs/kdtools/kdupdaterupdatefinder.cpp | 50 | ||||
-rw-r--r-- | src/libs/kdtools/kdupdaterupdatesinfo.cpp | 4 | ||||
-rw-r--r-- | src/libs/kdtools/kdupdaterupdatesinfo_p.h | 2 | ||||
-rw-r--r-- | tools/common/repositorygen.cpp | 15 |
4 files changed, 10 insertions, 61 deletions
diff --git a/src/libs/kdtools/kdupdaterupdatefinder.cpp b/src/libs/kdtools/kdupdaterupdatefinder.cpp index a883d98b9..caa66982e 100644 --- a/src/libs/kdtools/kdupdaterupdatefinder.cpp +++ b/src/libs/kdtools/kdupdaterupdatefinder.cpp @@ -117,7 +117,6 @@ public: const QList<UpdateInfo> &updateInfoList); bool checkForUpdatePriority(const UpdateSourceInfo &sourceInfo, const UpdateInfo &updateInfo); - int pickUpdateFileInfo(const QList<UpdateFileInfo> &updateFiles); void slotDownloadDone(); }; @@ -396,17 +395,13 @@ bool UpdateFinder::Private::computeApplicableUpdates() if (found) { q->reportProgress(80, tr("Found compatibility update.")); - // Create an update for this compat update. - // Pick a update file based on arch and OS. - int pickUpdateFileIndex = pickUpdateFileInfo(compatUpdateInfo.updateFiles); - if (pickUpdateFileIndex < 0) { - q->reportError(tr("Compatibility update for the required architecture and hardware configuration was " - "not found.")); - q->reportProgress(100, tr("Compatibility update not found.")); + if (compatUpdateInfo.updateFiles.isEmpty()) { + q->reportError(tr("Update not found.")); + q->reportProgress(100, tr("Update not found.")); return false; } - UpdateFileInfo fileInfo = compatUpdateInfo.updateFiles.at(pickUpdateFileIndex); + UpdateFileInfo fileInfo = compatUpdateInfo.updateFiles.at(0); // Create an update for this entry QUrl url = QString::fromLatin1("%1/%2").arg( compatUpdateSourceInfo.url.toString(), fileInfo.fileName); @@ -549,12 +544,10 @@ void UpdateFinder::Private::createUpdateObjects(const UpdateSourceInfo &sourceIn continue; } - // Pick a update file based on arch and OS. - int pickUpdateFileIndex = this->pickUpdateFileInfo(info.updateFiles); - if (pickUpdateFileIndex < 0) + if (info.updateFiles.isEmpty()) continue; - UpdateFileInfo fileInfo = info.updateFiles.at(pickUpdateFileIndex); + UpdateFileInfo fileInfo = info.updateFiles.at(0); // Create an update for this entry QUrl url(QString::fromLatin1("%1/%2").arg( sourceInfo.url.toString(), fileInfo.fileName)); @@ -594,37 +587,6 @@ bool UpdateFinder::Private::checkForUpdatePriority(const UpdateSourceInfo &sourc return true; } -int UpdateFinder::Private::pickUpdateFileInfo(const QList<UpdateFileInfo> &updateFiles) -{ -#ifdef Q_OS_MAC - QString os = QLatin1String( "MacOSX" ); -#endif -#ifdef Q_OS_WIN - QString os = QLatin1String( "Windows" ); -#endif -#ifdef Q_WS_X11 - QString os = QLatin1String( "Linux" ); -#endif - - QString arch = QLatin1String( "i386" ); // only one architecture considered for now. - - for (int i = 0; i < updateFiles.count(); i++) { - UpdateFileInfo fileInfo = updateFiles.at(i); - - if (fileInfo.arch != arch) - continue; - - if (fileInfo.os != QLatin1String("Any") && fileInfo.os != os) - continue; - - return i; - } - - return -1; -} - - - // // UpdateFinder // diff --git a/src/libs/kdtools/kdupdaterupdatesinfo.cpp b/src/libs/kdtools/kdupdaterupdatesinfo.cpp index 202e30457..756fcbf9a 100644 --- a/src/libs/kdtools/kdupdaterupdatesinfo.cpp +++ b/src/libs/kdtools/kdupdaterupdatesinfo.cpp @@ -152,8 +152,6 @@ bool UpdatesInfo::UpdatesInfoData::parsePackageUpdateElement(const QDomElement & info.data[childE.tagName()] = QUrl(childE.text()); } else if (childE.tagName() == QLatin1String("UpdateFile")) { UpdateFileInfo ufInfo; - ufInfo.arch = childE.attribute(QLatin1String("Arch"), QLatin1String("i386")); - ufInfo.os = childE.attribute(QLatin1String("OS")); ufInfo.compressedSize = childE.attribute(QLatin1String("CompressedSize")).toLongLong(); ufInfo.uncompressedSize = childE.attribute(QLatin1String("UncompressedSize")).toLongLong(); ufInfo.sha1sum = QByteArray::fromHex(childE.attribute(QLatin1String("sha1sum")).toAscii()); @@ -231,8 +229,6 @@ bool UpdatesInfo::UpdatesInfoData::parseCompatUpdateElement(const QDomElement &u info.data[childE.tagName()] = QUrl(childE.text()); } else if (childE.tagName() == QLatin1String("UpdateFile")) { UpdateFileInfo ufInfo; - ufInfo.arch = childE.attribute(QLatin1String("Arch"), QLatin1String("i386")); - ufInfo.os = childE.attribute(QLatin1String("OS")); ufInfo.fileName = childE.text(); info.updateFiles.append(ufInfo); } else { diff --git a/src/libs/kdtools/kdupdaterupdatesinfo_p.h b/src/libs/kdtools/kdupdaterupdatesinfo_p.h index 311c313e4..926133eb1 100644 --- a/src/libs/kdtools/kdupdaterupdatesinfo_p.h +++ b/src/libs/kdtools/kdupdaterupdatesinfo_p.h @@ -46,8 +46,6 @@ struct UpdateFileInfo uncompressedSize(0) {} - QString arch; - QString os; QString fileName; QByteArray sha1sum; quint64 compressedSize; diff --git a/tools/common/repositorygen.cpp b/tools/common/repositorygen.cpp index eeed91516..17305be34 100644 --- a/tools/common/repositorygen.cpp +++ b/tools/common/repositorygen.cpp @@ -220,17 +220,10 @@ void QInstallerTools::generateMetaDataDirectory(const QString &outDir, const QSt } } - // add fake update files - const QStringList platforms = QStringList() << QLatin1String("Windows") << QLatin1String("MacOSX") - << QLatin1String("Linux"); - foreach (const QString &platform, platforms) { - QDomElement file = doc.createElement(QLatin1String("UpdateFile")); - file.setAttribute(QLatin1String("OS"), platform); - file.setAttribute(QLatin1String("UncompressedSize"), componentSize); - file.setAttribute(QLatin1String("CompressedSize"), compressedComponentSize); - file.appendChild(doc.createTextNode(QLatin1String("(null)"))); - update.appendChild(file); - } + QDomElement fileElement = doc.createElement(QLatin1String("UpdateFile")); + fileElement.setAttribute(QLatin1String("UncompressedSize"), componentSize); + fileElement.setAttribute(QLatin1String("CompressedSize"), compressedComponentSize); + update.appendChild(fileElement); root.appendChild(update); |