summaryrefslogtreecommitdiffstats
path: root/rbutil/rbutilqt
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2010-02-28 20:28:45 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2010-02-28 20:28:45 +0000
commit239976ebfaa2227f93e6369ddd0fd7a429eb42c3 (patch)
tree80bf4c15b6b558bb53d9917dae2ad8f408c21c74 /rbutil/rbutilqt
parent495edfb7b95994ed44a5ebb4ef1fca716d1254d4 (diff)
downloadrockbox-239976ebfaa2227f93e6369ddd0fd7a429eb42c3.tar.gz
rockbox-239976ebfaa2227f93e6369ddd0fd7a429eb42c3.tar.bz2
rockbox-239976ebfaa2227f93e6369ddd0fd7a429eb42c3.zip
Rename Rockbox Utility output binary to RockboxUtility.
This will also cause the archives created by deploy-release.py to use the new binary name, so also update the update checking code to accept any base filename when retrieving version numbers from the download server. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24980 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt')
-rw-r--r--rbutil/rbutilqt/Info.plist2
-rwxr-xr-xrbutil/rbutilqt/deploy-release.py6
-rw-r--r--rbutil/rbutilqt/rbutilqt.cpp2
-rw-r--r--rbutil/rbutilqt/rbutilqt.pro2
4 files changed, 6 insertions, 6 deletions
diff --git a/rbutil/rbutilqt/Info.plist b/rbutil/rbutilqt/Info.plist
index 3f4d3e1dba..e43bad726f 100644
--- a/rbutil/rbutilqt/Info.plist
+++ b/rbutil/rbutilqt/Info.plist
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>CFBundleExecutable</key>
- <string>Rockbox Utility</string>
+ <string>RockboxUtility</string>
<key>CFBundleName</key>
<string>Rockbox Utility</string>
<key>CFBundleShortVersionString</key>
diff --git a/rbutil/rbutilqt/deploy-release.py b/rbutil/rbutilqt/deploy-release.py
index c2071a29d7..f37535ea69 100755
--- a/rbutil/rbutilqt/deploy-release.py
+++ b/rbutil/rbutilqt/deploy-release.py
@@ -63,15 +63,15 @@ except ImportError:
# == Global stuff ==
# Windows nees some special treatment. Differentiate between program name
# and executable filename.
-program = "rbutilqt"
+program = "RockboxUtility"
project = "rbutil/rbutilqt/rbutilqt.pro"
environment = os.environ
make = "make"
if sys.platform == "win32":
- progexe = "Release/rbutilqt.exe"
+ progexe = "Release/" + program + ".exe"
make = "mingw32-make"
elif sys.platform == "darwin":
- progexe = "rbutilqt.app"
+ progexe = program + ".app"
# OS X 10.6 defaults to gcc 4.2. Building universal binaries that are
# compatible with 10.4 requires using gcc-4.0.
if not "QMAKESPEC" in environment:
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index a721183fbd..4cb2e09aeb 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -1257,7 +1257,7 @@ void RbUtilQt::downloadUpdateDone(bool error)
else {
QString toParse(update->readAll());
- QRegExp searchString("<a[^>]*>(rbutilqt[^<]*)</a>");
+ QRegExp searchString("<a[^>]*>([a-zA-Z]+[^<]*)</a>");
QStringList rbutilList;
int pos = 0;
while ((pos = searchString.indexIn(toParse, pos)) != -1)
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index f8321182e3..fc62e77241 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -200,7 +200,7 @@ dbg {
message("release")
}
-TARGET = rbutilqt
+TARGET = RockboxUtility
FORMS += rbutilqtfrm.ui \
aboutbox.ui \