From 71e720902880e639f75a3817626b84a5bcd2412c Mon Sep 17 00:00:00 2001 From: Dominik Wenger Date: Sat, 18 Oct 2008 16:19:07 +0000 Subject: rbutil: make release versions local to devices. To allow different releases on different devices. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18825 a1c6a512-1295-4272-9138-f99709370657 --- rbutil/rbutilqt/install.cpp | 8 ++++---- rbutil/rbutilqt/rbsettings.cpp | 8 ++++---- rbutil/rbutilqt/rbsettings.h | 4 ++-- rbutil/rbutilqt/rbutil.ini | 34 ++++++++++++++++++++++++++++++++-- rbutil/rbutilqt/rbutilqt.cpp | 4 ++-- 5 files changed, 44 insertions(+), 14 deletions(-) diff --git a/rbutil/rbutilqt/install.cpp b/rbutil/rbutilqt/install.cpp index 7810f7f3d8..d9c750ea4d 100644 --- a/rbutil/rbutilqt/install.cpp +++ b/rbutil/rbutilqt/install.cpp @@ -91,11 +91,11 @@ void Install::accept() QString myversion; QString buildname = settings->curPlatformName(); if(ui.radioStable->isChecked()) { - file = QString("%1/rockbox-%2-%3.zip") - .arg(settings->downloadUrl(), - buildname, settings->lastRelease()); + file = QString("%1/%2/rockbox-%3-%4.zip") + .arg(settings->releaseUrl(),settings->lastRelease(settings->curPlatform()), + buildname, settings->lastRelease(settings->curPlatform())); fileName = QString("rockbox-%1-%2.zip") - .arg(settings->lastRelease(), buildname); + .arg(settings->lastRelease(settings->curPlatform()), buildname); settings->setBuild("stable"); myversion = version.value("rel_rev"); } diff --git a/rbutil/rbutilqt/rbsettings.cpp b/rbutil/rbutilqt/rbsettings.cpp index 6f8a6e69cc..8a8972b36c 100644 --- a/rbutil/rbutilqt/rbsettings.cpp +++ b/rbutil/rbutilqt/rbsettings.cpp @@ -113,9 +113,9 @@ QString RbSettings::bleedingUrl() return devices->value("bleeding_url").toString(); } -QString RbSettings::lastRelease() +QString RbSettings::lastRelease(QString plattform) { - return devices->value("last_release").toString(); + return deviceSettingCurGet("last_release").toString(); } QString RbSettings::cachePath() @@ -148,9 +148,9 @@ QString RbSettings::doomUrl() return devices->value("doom_url").toString(); } -QString RbSettings::downloadUrl() +QString RbSettings::releaseUrl() { - return devices->value("download_url").toString(); + return devices->value("release_url").toString(); } QString RbSettings::dailyUrl() diff --git a/rbutil/rbutilqt/rbsettings.h b/rbutil/rbutilqt/rbsettings.h index 49bdb81a11..cc4d32100b 100644 --- a/rbutil/rbutilqt/rbsettings.h +++ b/rbutil/rbutilqt/rbsettings.h @@ -48,14 +48,14 @@ class RbSettings : public QObject QString mountpoint(); QString manualUrl(); QString bleedingUrl(); - QString lastRelease(); + QString lastRelease(QString plattform); QString cachePath(); QString bootloaderUrl(); QString bootloaderInfoUrl(); QString fontUrl(); QString voiceUrl(); QString doomUrl(); - QString downloadUrl(); + QString releaseUrl(); QString dailyUrl(); QString serverConfUrl(); QString themeUrl(); diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini index 739bbb1ed2..9fe07bc01a 100644 --- a/rbutil/rbutilqt/rbutil.ini +++ b/rbutil/rbutilqt/rbutil.ini @@ -1,12 +1,11 @@ [general] -download_url=http://download.rockbox.org/release/3.0/ +release_url=http://download.rockbox.org/release/ daily_url=http://download.rockbox.org/daily/ bleeding_url=http://build.rockbox.org/dist/build- server_conf_url=http://www.rockbox.org/daily/build-info bootloader_info_url=http://download.rockbox.org/bootloader/bootloaders-info bleeding_info=http://build.rockbox.org/cvsmod/build-info font_url=http://www.rockbox.org/daily/fonts/rockbox-fonts.zip -last_release=3.0 prog_name=rockbox bootloader_url=http://download.rockbox.org/bootloader themes_url=http://themes.rockbox.org/ @@ -63,6 +62,7 @@ brand=Archos voicename=player targetid=1 encoder=lame +last_release=3.0 [recorder] name="Jukebox Recorder 6 / 10 / 15 / 20" @@ -77,6 +77,7 @@ brand=Archos voicename=recorder targetid=2 encoder=lame +last_release=3.0 [recorder8mb] name="Jukebox Recorder 6 / 10 / 15 / 20 (with 8MiB memory)" @@ -91,6 +92,7 @@ brand=Archos voicename=recorder targetid=2 encoder=lame +last_release=3.0 [recorderv2] name="Jukebox Recorder v2 (20GB)" @@ -105,6 +107,7 @@ brand=Archos voicename=recorderv2 targetid=4 encoder=lame +last_release=3.0 [fmrecorder] name="Jukebox Recorder FM" @@ -119,6 +122,7 @@ brand=Archos voicename=fmrecorder targetid=3 encoder=lame +last_release=3.0 [fmrecorder8mb] name="Jukebox Recorder FM (with 8MiB memory)" @@ -133,6 +137,7 @@ brand=Archos voicename=fmrecorder targetid=3 encoder=lame +last_release=3.0 [ondiosp] name="Ondio SP" @@ -147,6 +152,7 @@ brand=Archos voicename=ondiosp targetid=7 encoder=lame +last_release=3.0 [ondiofm] name="Ondio FM" @@ -161,6 +167,7 @@ brand=Archos voicename=ondiofm targetid=8 encoder=lame +last_release=3.0 [h100] name="iHP100 / iHP110" @@ -177,6 +184,7 @@ usbid=0x10063001 voicename=h100 targetid=11 encoder=rbspeex +last_release=3.0 [h120] name="iHP120 / iHP140 / H120 / H140" @@ -193,6 +201,7 @@ usbid=0x10063002 voicename=h120 targetid=9 encoder=rbspeex +last_release=3.0 [h300] name="H320 / H340" @@ -209,6 +218,7 @@ usbid=0x10063003 voicename=h300 targetid=10 encoder=rbspeex +last_release=3.0 [h10_5gbums] name="H10 (5 / 6GB) UMS" @@ -225,6 +235,7 @@ usbid=0x41022002 voicename=h10_5gb targetid=24 encoder=rbspeex +last_release=3.0 [h10_5gbmtp] name="H10 (5 / 6GB) MTP" @@ -241,6 +252,7 @@ usbid=0x41022105 voicename=h10_5gb targetid=24 encoder=rbspeex +last_release=3.0 [h10] name="H10 (20GB)" @@ -258,6 +270,7 @@ usberror=0x41022101 voicename=h10 targetid=22 encoder=rbspeex +last_release=3.0 [ipod1g2g] name="Ipod (1st / 2nd gen)" @@ -272,6 +285,7 @@ brand=Apple voicename=ipod1g2g targetid=29 encoder=rbspeex +last_release=3.0 [ipodcolor] name="Ipod Colour / Photo / U2 (4th gen)" @@ -286,6 +300,7 @@ brand=Apple voicename=ipodcolor targetid=13 encoder=rbspeex +last_release=3.0 [ipodnano] name="Ipod Nano (1st gen)" @@ -301,6 +316,7 @@ usbincompat=0x05ac1260 voicename=ipodnano targetid=14 encoder=rbspeex +last_release=3.0 [ipod4gray] name="Ipod (4th gen, greyscale)" @@ -315,6 +331,7 @@ brand=Apple voicename=ipod4gray targetid=17 encoder=rbspeex +last_release=3.0 [ipodvideo] name="Ipod Video (5th gen) 30GB" @@ -329,6 +346,7 @@ brand=Apple voicename=ipodvideo targetid=15 encoder=rbspeex +last_release=3.0 [ipodvideo64mb] name="Ipod Video (5th gen) 60/80GB" @@ -344,6 +362,7 @@ voicename=ipodvideo usbincompat=0x05ac1261 targetid=15 encoder=rbspeex +last_release=3.0 [ipod3g] name="Ipod (3rd gen)" @@ -359,6 +378,7 @@ usbid=0x05ac1201 voicename=ipod3g targetid=16 encoder=rbspeex +last_release=3.0 [ipodmini1g] name="Ipod Mini (1st gen)" @@ -373,6 +393,7 @@ brand=Apple voicename=ipodmini1g targetid=18 encoder=rbspeex +last_release=3.0 [ipodmini2g] name="Ipod Mini (2nd gen)" @@ -387,6 +408,7 @@ brand=Apple voicename=ipodmini2g targetid=21 encoder=rbspeex +last_release=3.0 [iaudiox5] name="iAudio X5 / X5L" @@ -403,6 +425,7 @@ usbid=0x0e210510, 0x0e210513 voicename=iaudiox5 targetid=12 encoder=rbspeex +last_release=3.0 [iaudiox5v] name="iAudio X5V" @@ -418,6 +441,7 @@ brand=Cowon voicename=iaudiox5v targetid=12 encoder=rbspeex +last_release=3.0 [iaudiom5] name="iAudio M5 / M5L" @@ -434,6 +458,7 @@ usbid=0x0e210520 voicename=iaudiom5 targetid=28 encoder=rbspeex +last_release=3.0 [iaudiom3] name="iAudio M3 / M3L" @@ -450,6 +475,7 @@ usbid=0x0e210500 voicename=iaudiom3 targetid=37 encoder=rbspeex +last_release=3.0 [gigabeatf] name="Gigabeat F / X" @@ -466,6 +492,7 @@ usbid=0x09300009 voicename=gigabeatf targetid=20 encoder=rbspeex +last_release=3.0 [sansae200] name="Sansa E200" @@ -483,6 +510,7 @@ usbincompat=0x07817422, 0x07817423 voicename=sansae200 targetid=23 encoder=rbspeex +last_release=3.0 [sansac200] name="Sansa C200" @@ -498,6 +526,7 @@ usbid=0x07817450, 0x07817451 voicename=sansac200 targetid=30 encoder=rbspeex +last_release=3.0 [mrobe100] name="m:robe100" @@ -514,6 +543,7 @@ usbid=0x07b40280 voicename=mrobe100 targetid=33 encoder=rbspeex +last_release=3.0 [languages] lang1=afrikaans diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 4f0e4b5994..e9f6f7fcf2 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp @@ -491,7 +491,7 @@ bool RbUtilQt::installAuto() if(settings->curReleased()) { // only set the keys if needed -- querying will yield an empty string // if not set. - versmap.insert("rel_rev", settings->lastRelease()); + versmap.insert("rel_rev", settings->lastRelease(settings->curPlatform())); versmap.insert("rel_date", ""); // FIXME: provide the release timestamp } @@ -568,7 +568,7 @@ void RbUtilQt::install() if(settings->curReleased()) { // only set the keys if needed -- querying will yield an empty string // if not set. - versmap.insert("rel_rev", settings->lastRelease()); + versmap.insert("rel_rev", settings->lastRelease(settings->curPlatform())); versmap.insert("rel_date", ""); // FIXME: provide the release timestamp } installWindow->setVersionStrings(versmap); -- cgit v1.2.3