diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2010-02-28 20:28:45 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2010-02-28 20:28:45 +0000 |
commit | 239976ebfaa2227f93e6369ddd0fd7a429eb42c3 (patch) | |
tree | 80bf4c15b6b558bb53d9917dae2ad8f408c21c74 | |
parent | 495edfb7b95994ed44a5ebb4ef1fca716d1254d4 (diff) | |
download | rockbox-239976ebfaa2227f93e6369ddd0fd7a429eb42c3.tar.gz 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
-rw-r--r-- | rbutil/rbutilqt/Info.plist | 2 | ||||
-rwxr-xr-x | rbutil/rbutilqt/deploy-release.py | 6 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 2 | ||||
-rw-r--r-- | 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 @@ | |||
3 | <plist version="1.0"> | 3 | <plist version="1.0"> |
4 | <dict> | 4 | <dict> |
5 | <key>CFBundleExecutable</key> | 5 | <key>CFBundleExecutable</key> |
6 | <string>Rockbox Utility</string> | 6 | <string>RockboxUtility</string> |
7 | <key>CFBundleName</key> | 7 | <key>CFBundleName</key> |
8 | <string>Rockbox Utility</string> | 8 | <string>Rockbox Utility</string> |
9 | <key>CFBundleShortVersionString</key> | 9 | <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: | |||
63 | # == Global stuff == | 63 | # == Global stuff == |
64 | # Windows nees some special treatment. Differentiate between program name | 64 | # Windows nees some special treatment. Differentiate between program name |
65 | # and executable filename. | 65 | # and executable filename. |
66 | program = "rbutilqt" | 66 | program = "RockboxUtility" |
67 | project = "rbutil/rbutilqt/rbutilqt.pro" | 67 | project = "rbutil/rbutilqt/rbutilqt.pro" |
68 | environment = os.environ | 68 | environment = os.environ |
69 | make = "make" | 69 | make = "make" |
70 | if sys.platform == "win32": | 70 | if sys.platform == "win32": |
71 | progexe = "Release/rbutilqt.exe" | 71 | progexe = "Release/" + program + ".exe" |
72 | make = "mingw32-make" | 72 | make = "mingw32-make" |
73 | elif sys.platform == "darwin": | 73 | elif sys.platform == "darwin": |
74 | progexe = "rbutilqt.app" | 74 | progexe = program + ".app" |
75 | # OS X 10.6 defaults to gcc 4.2. Building universal binaries that are | 75 | # OS X 10.6 defaults to gcc 4.2. Building universal binaries that are |
76 | # compatible with 10.4 requires using gcc-4.0. | 76 | # compatible with 10.4 requires using gcc-4.0. |
77 | if not "QMAKESPEC" in environment: | 77 | 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) | |||
1257 | else { | 1257 | else { |
1258 | QString toParse(update->readAll()); | 1258 | QString toParse(update->readAll()); |
1259 | 1259 | ||
1260 | QRegExp searchString("<a[^>]*>(rbutilqt[^<]*)</a>"); | 1260 | QRegExp searchString("<a[^>]*>([a-zA-Z]+[^<]*)</a>"); |
1261 | QStringList rbutilList; | 1261 | QStringList rbutilList; |
1262 | int pos = 0; | 1262 | int pos = 0; |
1263 | while ((pos = searchString.indexIn(toParse, pos)) != -1) | 1263 | 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 { | |||
200 | message("release") | 200 | message("release") |
201 | } | 201 | } |
202 | 202 | ||
203 | TARGET = rbutilqt | 203 | TARGET = RockboxUtility |
204 | 204 | ||
205 | FORMS += rbutilqtfrm.ui \ | 205 | FORMS += rbutilqtfrm.ui \ |
206 | aboutbox.ui \ | 206 | aboutbox.ui \ |