summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2010-07-10 21:22:22 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2010-07-10 21:22:22 +0000
commita6df932003513a0811c9231475aa58c802cc4c80 (patch)
tree33fe4a75a1c01e5855b9320dd7dcc11a647e0cb4
parentd298fa857ec8a4073f1da995b1bb1dbc6d5464dc (diff)
downloadrockbox-a6df932003513a0811c9231475aa58c802cc4c80.tar.gz
rockbox-a6df932003513a0811c9231475aa58c802cc4c80.zip
Generalize the application bundle copy workaround to simplify later reuse.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27377 a1c6a512-1295-4272-9138-f99709370657
-rwxr-xr-xrbutil/rbutilqt/deploy-release.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/rbutil/rbutilqt/deploy-release.py b/rbutil/rbutilqt/deploy-release.py
index 989783b4d1..ffb8f71c0e 100755
--- a/rbutil/rbutilqt/deploy-release.py
+++ b/rbutil/rbutilqt/deploy-release.py
@@ -109,6 +109,12 @@ svnpaths = [ "rbutil/",
109# only used on w32. 109# only used on w32.
110useupx = False 110useupx = False
111 111
112# OS X: files to copy into the bundle. Workaround for out-of-tree builds.
113bundlecopy = {
114 "icons/rbutilqt.icns" : "Contents/Resources/",
115 "Info.plist" : "Contents/"
116}
117
112# == Functions == 118# == Functions ==
113def usage(myself): 119def usage(myself):
114 print "Usage: %s [options]" % myself 120 print "Usage: %s [options]" % myself
@@ -316,10 +322,10 @@ def macdeploy(versionstring, buildfolder):
316 dmgfile = program + "-" + versionstring + ".dmg" 322 dmgfile = program + "-" + versionstring + ".dmg"
317 appbundle = buildfolder + "/" + progexe 323 appbundle = buildfolder + "/" + progexe
318 324
319 # workaround to Qt issues when building out-of-tree. Hardcoded for simplicity. 325 # workaround to Qt issues when building out-of-tree. Copy files into bundle.
320 sourcebase = buildfolder + re.sub('rbutilqt.pro$', '', project) 326 sourcebase = buildfolder + re.sub('rbutilqt.pro$', '', project)
321 shutil.copy(sourcebase + "icons/rbutilqt.icns", appbundle + "/Contents/Resources/") 327 for src in bundlecopy:
322 shutil.copy(sourcebase + "Info.plist", appbundle + "/Contents/") 328 shutil.copy(sourcebase + src, appbundle + bundlecopy[src])
323 # end of Qt workaround 329 # end of Qt workaround
324 330
325 output = subprocess.Popen(["macdeployqt", progexe, "-dmg"], stdout=subprocess.PIPE, cwd=buildfolder) 331 output = subprocess.Popen(["macdeployqt", progexe, "-dmg"], stdout=subprocess.PIPE, cwd=buildfolder)