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
diff --git a/rbutil/rbutilqt/deploy-release.py b/rbutil/rbutilqt/deploy-release.py
index 989783b..ffb8f71 100755
--- a/rbutil/rbutilqt/deploy-release.py
+++ b/rbutil/rbutilqt/deploy-release.py
@@ -109,6 +109,12 @@
# only used on w32.
useupx = False
+# OS X: files to copy into the bundle. Workaround for out-of-tree builds.
+bundlecopy = {
+ "icons/rbutilqt.icns" : "Contents/Resources/",
+ "Info.plist" : "Contents/"
+}
+
# == Functions ==
def usage(myself):
print "Usage: %s [options]" % myself
@@ -316,10 +322,10 @@
dmgfile = program + "-" + versionstring + ".dmg"
appbundle = buildfolder + "/" + progexe
- # workaround to Qt issues when building out-of-tree. Hardcoded for simplicity.
+ # workaround to Qt issues when building out-of-tree. Copy files into bundle.
sourcebase = buildfolder + re.sub('rbutilqt.pro$', '', project)
- shutil.copy(sourcebase + "icons/rbutilqt.icns", appbundle + "/Contents/Resources/")
- shutil.copy(sourcebase + "Info.plist", appbundle + "/Contents/")
+ for src in bundlecopy:
+ shutil.copy(sourcebase + src, appbundle + bundlecopy[src])
# end of Qt workaround
output = subprocess.Popen(["macdeployqt", progexe, "-dmg"], stdout=subprocess.PIPE, cwd=buildfolder)