From 239976ebfaa2227f93e6369ddd0fd7a429eb42c3 Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Sun, 28 Feb 2010 20:28:45 +0000
Subject: 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
---
 rbutil/rbutilqt/Info.plist        | 2 +-
 rbutil/rbutilqt/deploy-release.py | 6 +++---
 rbutil/rbutilqt/rbutilqt.cpp      | 2 +-
 rbutil/rbutilqt/rbutilqt.pro      | 2 +-
 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 \
-- 
cgit v1.2.3