raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed traceback error that occurs in windows-builder.py if the bzr version info contains non-ascii characters.

Browse Source 
Added Mako requirement documentation

bzr-revno: 1610
This commit is contained in:
Stevan Pettit 2011-06-04 14:49:22 +01:00 committed by Tim Bentley
commit 9cf864650b
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/windows-builder.py
View File

@ -102,6 +102,13 @@ psvince.dll
the install will fail. The dll can be obtained from here: the install will fail. The dll can be obtained from here:
http://www.vincenzo.net/isxkb/index.php?title=PSVince) http://www.vincenzo.net/isxkb/index.php?title=PSVince)
Mako
Mako Templates for Python. This package is required for building the
remote plugin. It can be installed by going to your
python_directory\scripts\.. and running "easy_install Mako". If you do not
have easy_install, the Mako package can be obtained here:
http://www.makotemplates.org/download.html
""" """
import os import os
@ -194,7 +201,8 @@ def write_version_file():
code = bzr.wait() code = bzr.wait()
if code != 0: if code != 0:
raise Exception(u'Error running bzr log') raise Exception(u'Error running bzr log')
latest = output.split(u':')[0] outputAscii = unicode(output, errors='ignore')
latest = outputAscii.split(u':')[0]
versionstring = latest == revision and tag or u'%s-bzr%s' % (tag, latest) versionstring = latest == revision and tag or u'%s-bzr%s' % (tag, latest)
f = open(os.path.join(dist_path, u'.version'), u'w') f = open(os.path.join(dist_path, u'.version'), u'w')
f.write(versionstring) f.write(versionstring)