diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-06-17 11:21:04 +0200 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2012-06-17 11:21:04 +0200 |
commit | d3ddad95be5acac99b4f6e2a45336cc2b99a2ab2 (patch) | |
tree | 235e7681238b6a45b48cd27b3f184bf63c04ded4 /rbutil/rbutilqt/base | |
parent | 94555a0b08534ba6345d8ba65eef808b6e3d1dca (diff) | |
download | rockbox-d3ddad95be5acac99b4f6e2a45336cc2b99a2ab2.tar.gz rockbox-d3ddad95be5acac99b4f6e2a45336cc2b99a2ab2.zip |
Read release candidate information from build-info.
Change-Id: I73ac0922f25dd247588f945eba1e78f4026d747d
Diffstat (limited to 'rbutil/rbutilqt/base')
-rw-r--r-- | rbutil/rbutilqt/base/serverinfo.cpp | 19 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/serverinfo.h | 2 |
2 files changed, 21 insertions, 0 deletions
diff --git a/rbutil/rbutilqt/base/serverinfo.cpp b/rbutil/rbutilqt/base/serverinfo.cpp index 4abaeb2aa7..eef7b1bdfe 100644 --- a/rbutil/rbutilqt/base/serverinfo.cpp +++ b/rbutil/rbutilqt/base/serverinfo.cpp | |||
@@ -32,6 +32,8 @@ const static struct { | |||
32 | } ServerInfoList[] = { | 32 | } ServerInfoList[] = { |
33 | { ServerInfo::CurReleaseVersion, ":platform:/releaseversion", "" }, | 33 | { ServerInfo::CurReleaseVersion, ":platform:/releaseversion", "" }, |
34 | { ServerInfo::CurReleaseUrl, ":platform:/releaseurl", "" }, | 34 | { ServerInfo::CurReleaseUrl, ":platform:/releaseurl", "" }, |
35 | { ServerInfo::RelCandidateVersion, ":platform:/rcversion", "" }, | ||
36 | { ServerInfo::RelCandidateUrl, ":platform:/rcurl", "" }, | ||
35 | { ServerInfo::CurStatus, ":platform:/status", "Unknown" }, | 37 | { ServerInfo::CurStatus, ":platform:/status", "Unknown" }, |
36 | { ServerInfo::BleedingRevision, "bleedingrev", "" }, | 38 | { ServerInfo::BleedingRevision, "bleedingrev", "" }, |
37 | { ServerInfo::BleedingDate, "bleedingdate", "" }, | 39 | { ServerInfo::BleedingDate, "bleedingdate", "" }, |
@@ -67,6 +69,8 @@ void ServerInfo::readBuildInfo(QString file) | |||
67 | variants = SystemInfo::platforms(SystemInfo::PlatformVariantDisabled, platforms.at(i)); | 69 | variants = SystemInfo::platforms(SystemInfo::PlatformVariantDisabled, platforms.at(i)); |
68 | QString releaseVersion; | 70 | QString releaseVersion; |
69 | QString releaseUrl; | 71 | QString releaseUrl; |
72 | QString relCandidateVersion; | ||
73 | QString relCandidateUrl; | ||
70 | info.beginGroup("release"); | 74 | info.beginGroup("release"); |
71 | if(keys.contains(platforms.at(i))) { | 75 | if(keys.contains(platforms.at(i))) { |
72 | releaseVersion = info.value(platforms.at(i)).toString(); | 76 | releaseVersion = info.value(platforms.at(i)).toString(); |
@@ -76,6 +80,17 @@ void ServerInfo::readBuildInfo(QString file) | |||
76 | releaseUrl.replace("%RELVERSION%", releaseVersion); | 80 | releaseUrl.replace("%RELVERSION%", releaseVersion); |
77 | } | 81 | } |
78 | info.endGroup(); | 82 | info.endGroup(); |
83 | // "release-candidate" section currently only support the 2nd format. | ||
84 | info.beginGroup("release-candidate"); | ||
85 | if(keys.contains(platforms.at(i))) { | ||
86 | QStringList entry = info.value(platforms.at(i)).toStringList(); | ||
87 | relCandidateVersion = entry.at(0); | ||
88 | if(entry.size() > 1) { | ||
89 | relCandidateUrl = entry.at(1); | ||
90 | } | ||
91 | } | ||
92 | info.endGroup(); | ||
93 | |||
79 | 94 | ||
80 | info.beginGroup("status"); | 95 | info.beginGroup("status"); |
81 | QString status = tr("Unknown"); | 96 | QString status = tr("Unknown"); |
@@ -106,6 +121,10 @@ void ServerInfo::readBuildInfo(QString file) | |||
106 | setPlatformValue(variants.at(j), ServerInfo::CurReleaseVersion, releaseVersion); | 121 | setPlatformValue(variants.at(j), ServerInfo::CurReleaseVersion, releaseVersion); |
107 | setPlatformValue(variants.at(j), ServerInfo::CurReleaseUrl, releaseUrl); | 122 | setPlatformValue(variants.at(j), ServerInfo::CurReleaseUrl, releaseUrl); |
108 | } | 123 | } |
124 | if(!relCandidateUrl.isEmpty()) { | ||
125 | setPlatformValue(variants.at(j), ServerInfo::RelCandidateVersion, relCandidateVersion); | ||
126 | setPlatformValue(variants.at(j), ServerInfo::RelCandidateUrl, relCandidateUrl); | ||
127 | } | ||
109 | setPlatformValue(variants.at(j), ServerInfo::CurDevelUrl, develUrl); | 128 | setPlatformValue(variants.at(j), ServerInfo::CurDevelUrl, develUrl); |
110 | } | 129 | } |
111 | } | 130 | } |
diff --git a/rbutil/rbutilqt/base/serverinfo.h b/rbutil/rbutilqt/base/serverinfo.h index f541c86540..7021c3f154 100644 --- a/rbutil/rbutilqt/base/serverinfo.h +++ b/rbutil/rbutilqt/base/serverinfo.h | |||
@@ -36,6 +36,8 @@ class ServerInfo : public QObject | |||
36 | CurDevelUrl, | 36 | CurDevelUrl, |
37 | BleedingRevision, | 37 | BleedingRevision, |
38 | BleedingDate, | 38 | BleedingDate, |
39 | RelCandidateVersion, | ||
40 | RelCandidateUrl, | ||
39 | }; | 41 | }; |
40 | 42 | ||
41 | //! read in buildinfo file | 43 | //! read in buildinfo file |