devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix a potential variable problem. Change some messages a bit.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29534 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2011-03-06 17:37:27 +00:00
parent 7d2ab2df5f
commit 4cc2cc430c
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
utils/common/deploy.py
View file

@ -335,7 +335,7 @@ def finddlls(program, extrapaths=[], cross=""):
dllpaths = [] dllpaths = []
for file in dlls: for file in dlls:
if file in systemdlls: if file in systemdlls:
print file + ": System DLL" print "System DLL: " + file
continue continue
dllpath = "" dllpath = ""
for path in extrapaths: for path in extrapaths:
@ -350,11 +350,11 @@ def finddlls(program, extrapaths=[], cross=""):
print file + ": found at " + dllpath print file + ": found at " + dllpath
dllpaths.append(dllpath) dllpaths.append(dllpath)
except: except:
print file + ": NOT FOUND." print "MISSING DLL: " + file
return dllpaths return dllpaths
def zipball(versionstring, buildfolder, platform=sys.platform): def zipball(programfiles, versionstring, buildfolder, platform=sys.platform):
'''package created binary''' '''package created binary'''
print "Creating binary zipball." print "Creating binary zipball."
archivebase = program + "-" + versionstring archivebase = program + "-" + versionstring
@ -363,7 +363,6 @@ def zipball(versionstring, buildfolder, platform=sys.platform):
# create output folder # create output folder
os.mkdir(outfolder) os.mkdir(outfolder)
# move program files to output folder # move program files to output folder
programfiles.append(progexe[platform])
for f in programfiles: for f in programfiles:
if re.match(r'^(/|[a-zA-Z]:)', f) != None: if re.match(r'^(/|[a-zA-Z]:)', f) != None:
shutil.copy(f, outfolder) shutil.copy(f, outfolder)
@ -386,7 +385,7 @@ def zipball(versionstring, buildfolder, platform=sys.platform):
return archivename return archivename
def tarball(versionstring, buildfolder): def tarball(programfiles, versionstring, buildfolder):
'''package created binary''' '''package created binary'''
print "Creating binary tarball." print "Creating binary tarball."
archivebase = program + "-" + versionstring archivebase = program + "-" + versionstring
@ -597,6 +596,8 @@ def deploy():
tempclean(workfolder, cleanup and not keeptemp) tempclean(workfolder, cleanup and not keeptemp)
sys.exit(1) sys.exit(1)
buildtime = time.time() - buildstart buildtime = time.time() - buildstart
progfiles = programfiles
progfiles.append(progexe[platform])
if platform == "win32": if platform == "win32":
if useupx == True: if useupx == True:
if not upxfile(sourcefolder, platform) == 0: if not upxfile(sourcefolder, platform) == 0:
@ -605,8 +606,8 @@ def deploy():
dllfiles = finddlls(sourcefolder + "/" + progexe[platform], \ dllfiles = finddlls(sourcefolder + "/" + progexe[platform], \
[os.path.dirname(qm)], cross) [os.path.dirname(qm)], cross)
if dllfiles.count > 0: if dllfiles.count > 0:
programfiles.extend(dllfiles) progfiles.extend(dllfiles)
archive = zipball(ver, sourcefolder, platform) archive = zipball(progfiles, ver, sourcefolder, platform)
# only when running native right now. # only when running native right now.
if nsisscript != "" and makensis != "": if nsisscript != "" and makensis != "":
nsisfileinject(sourcefolder + "/" + nsisscript, sourcefolder \ nsisfileinject(sourcefolder + "/" + nsisscript, sourcefolder \
@ -617,7 +618,7 @@ def deploy():
else: else:
if os.uname()[4].endswith("64"): if os.uname()[4].endswith("64"):
ver += "-64bit" ver += "-64bit"
archive = tarball(ver, sourcefolder) archive = tarball(progfiles, ver, sourcefolder)
# remove temporary files # remove temporary files
tempclean(workfolder, cleanup) tempclean(workfolder, cleanup)