diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2010-07-28 21:05:16 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2010-07-28 21:05:16 +0000 |
commit | 85f84060c4566d2a9e0867a1203751d77899547c (patch) | |
tree | 161b8c37480b64f8e96e873996792217ebe14998 /utils | |
parent | ce1d2bf7b19960d7a5a1dc208a291dce7c6b305e (diff) | |
download | rockbox-85f84060c4566d2a9e0867a1203751d77899547c.tar.gz rockbox-85f84060c4566d2a9e0867a1203751d77899547c.zip |
Correct OS X post-build bundle copying.
Make copying files to the bundle work when building other applications than
Rockbox Utility by replacing a hardcoded workaround.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27606 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'utils')
-rwxr-xr-x | utils/common/deploy.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/utils/common/deploy.py b/utils/common/deploy.py index f4f3fac786..42d0375529 100755 --- a/utils/common/deploy.py +++ b/utils/common/deploy.py | |||
@@ -289,9 +289,10 @@ def macdeploy(versionstring, buildfolder): | |||
289 | appbundle = buildfolder + "/" + progexe | 289 | appbundle = buildfolder + "/" + progexe |
290 | 290 | ||
291 | # workaround to Qt issues when building out-of-tree. Copy files into bundle. | 291 | # workaround to Qt issues when building out-of-tree. Copy files into bundle. |
292 | sourcebase = buildfolder + re.sub('rbutilqt.pro$', '', project) | 292 | sourcebase = buildfolder + re.sub('[^/]+.pro$', '', project) + "/" |
293 | print sourcebase | ||
293 | for src in bundlecopy: | 294 | for src in bundlecopy: |
294 | shutil.copy(sourcebase + src, appbundle + bundlecopy[src]) | 295 | shutil.copy(sourcebase + src, appbundle + "/" + bundlecopy[src]) |
295 | # end of Qt workaround | 296 | # end of Qt workaround |
296 | 297 | ||
297 | output = subprocess.Popen(["macdeployqt", progexe, "-dmg"], stdout=subprocess.PIPE, cwd=buildfolder) | 298 | output = subprocess.Popen(["macdeployqt", progexe, "-dmg"], stdout=subprocess.PIPE, cwd=buildfolder) |