summaryrefslogtreecommitdiffstats
path: root/utils/common/deploy.py
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2011-03-06 17:37:27 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2011-03-06 17:37:27 +0000
commit4cc2cc430c026ce59d089f76c678202d977bad37 (patch)
tree3484e3005103fb9f7a5b82a5a5141002af070efa /utils/common/deploy.py
parent7d2ab2df5faff2dd91b5887ee80927a36c108798 (diff)
downloadrockbox-4cc2cc430c026ce59d089f76c678202d977bad37.tar.gz
rockbox-4cc2cc430c026ce59d089f76c678202d977bad37.tar.bz2
rockbox-4cc2cc430c026ce59d089f76c678202d977bad37.zip
Fix a potential variable problem. Change some messages a bit.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29534 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'utils/common/deploy.py')
-rwxr-xr-xutils/common/deploy.py17
1 files changed, 9 insertions, 8 deletions
diff --git a/utils/common/deploy.py b/utils/common/deploy.py
index 02fc437313..44635c851d 100755
--- a/utils/common/deploy.py
+++ b/utils/common/deploy.py
@@ -335,7 +335,7 @@ def finddlls(program, extrapaths=[], cross=""):
dllpaths = []
for file in dlls:
if file in systemdlls:
- print file + ": System DLL"
+ print "System DLL: " + file
continue
dllpath = ""
for path in extrapaths:
@@ -350,11 +350,11 @@ def finddlls(program, extrapaths=[], cross=""):
print file + ": found at " + dllpath
dllpaths.append(dllpath)
except:
- print file + ": NOT FOUND."
+ print "MISSING DLL: " + file
return dllpaths
-def zipball(versionstring, buildfolder, platform=sys.platform):
+def zipball(programfiles, versionstring, buildfolder, platform=sys.platform):
'''package created binary'''
print "Creating binary zipball."
archivebase = program + "-" + versionstring
@@ -363,7 +363,6 @@ def zipball(versionstring, buildfolder, platform=sys.platform):
# create output folder
os.mkdir(outfolder)
# move program files to output folder
- programfiles.append(progexe[platform])
for f in programfiles:
if re.match(r'^(/|[a-zA-Z]:)', f) != None:
shutil.copy(f, outfolder)
@@ -386,7 +385,7 @@ def zipball(versionstring, buildfolder, platform=sys.platform):
return archivename
-def tarball(versionstring, buildfolder):
+def tarball(programfiles, versionstring, buildfolder):
'''package created binary'''
print "Creating binary tarball."
archivebase = program + "-" + versionstring
@@ -597,6 +596,8 @@ def deploy():
tempclean(workfolder, cleanup and not keeptemp)
sys.exit(1)
buildtime = time.time() - buildstart
+ progfiles = programfiles
+ progfiles.append(progexe[platform])
if platform == "win32":
if useupx == True:
if not upxfile(sourcefolder, platform) == 0:
@@ -605,8 +606,8 @@ def deploy():
dllfiles = finddlls(sourcefolder + "/" + progexe[platform], \
[os.path.dirname(qm)], cross)
if dllfiles.count > 0:
- programfiles.extend(dllfiles)
- archive = zipball(ver, sourcefolder, platform)
+ progfiles.extend(dllfiles)
+ archive = zipball(progfiles, ver, sourcefolder, platform)
# only when running native right now.
if nsisscript != "" and makensis != "":
nsisfileinject(sourcefolder + "/" + nsisscript, sourcefolder \
@@ -617,7 +618,7 @@ def deploy():
else:
if os.uname()[4].endswith("64"):
ver += "-64bit"
- archive = tarball(ver, sourcefolder)
+ archive = tarball(progfiles, ver, sourcefolder)
# remove temporary files
tempclean(workfolder, cleanup)