openlp/packaging
1
0
Fork 0
mirror of https://gitlab.com/openlp/packaging.git synced 2024-12-22 21:12:50 +00:00
Code Issues Projects Releases Wiki Activity

Add an option for providing tag and revision to avoid using bzr. Useful on Appveyor where bzr does not work.

Browse Source 
bzr-revno: 38
This commit is contained in:
Tomas Groth 2018-07-13 21:19:14 +02:00
commit 1872fd58f6
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builders/builder.py
View File

@ -160,6 +160,8 @@ class Builder(object):
parser.add_argument('--skip-translations', action='store_true', default=False, parser.add_argument('--skip-translations', action='store_true', default=False,
help='Do NOT update the language translation files') help='Do NOT update the language translation files')
parser.add_argument('--debug', action='store_true', default=False, help='Create a debug build') parser.add_argument('--debug', action='store_true', default=False, help='Create a debug build')
parser.add_argument('--tag-override', metavar='<tag>-bzr<revision>', default=None,
help='Override tag and revision, should be in format <tag>-bzr<revision>')
self.add_extra_args(parser) self.add_extra_args(parser)
self.args = parser.parse_args() self.args = parser.parse_args()
@ -297,6 +299,9 @@ class Builder(object):
""" """
self._print('Writing version file...') self._print('Writing version file...')
if not self.args.release: if not self.args.release:
if self.args.tag_override:
self.version = self.args.tag_override
else:
# This is a development build, get the tag and revision # This is a development build, get the tag and revision
output = self._bzr('tags', self.branch_path, err_msg='Error running bzr tags') output = self._bzr('tags', self.branch_path, err_msg='Error running bzr tags')
lines = output.splitlines() lines = output.splitlines()