Skip to content
Snippets Groups Projects
Commit 1771f5c6 authored by Simon McVittie's avatar Simon McVittie
Browse files

build-relocatable-install: Add a way to produce predictable tarball names

parent cde43d61
No related branches found
No related tags found
No related merge requests found
...@@ -141,6 +141,11 @@ def main(): ...@@ -141,6 +141,11 @@ def main():
parser.add_argument('--archive', default=None) parser.add_argument('--archive', default=None)
parser.add_argument('--apt-get-source', action='store_true') parser.add_argument('--apt-get-source', action='store_true')
parser.add_argument('--set-version', dest='version', default=None) parser.add_argument('--set-version', dest='version', default=None)
parser.add_argument(
'--archive-versions', action='store_true', default=True)
parser.add_argument(
'--no-archive-versions', dest='archive_versions',
action='store_false', default=True)
args = parser.parse_args() args = parser.parse_args()
if args.srcdir is None: if args.srcdir is None:
...@@ -468,19 +473,24 @@ def main(): ...@@ -468,19 +473,24 @@ def main():
writer.write('{}\n'.format(args.version)) writer.write('{}\n'.format(args.version))
if args.archive: if args.archive:
if args.archive_versions:
tail = '-' + args.version
else:
tail = ''
bin_tar = os.path.join( bin_tar = os.path.join(
args.archive, args.archive,
'pressure-vessel-{}-bin.tar.gz'.format(args.version), 'pressure-vessel{}-bin.tar.gz'.format(tail),
) )
src_tar = os.path.join( src_tar = os.path.join(
args.archive, args.archive,
'pressure-vessel-{}-bin+src.tar.gz'.format(args.version), 'pressure-vessel{}-bin+src.tar.gz'.format(tail),
) )
subprocess.check_call([ subprocess.check_call([
'tar', 'tar',
r'--transform=s,^\(\.\(/\|$\)\)\?,pressure-vessel-{}/,'.format( r'--transform=s,^\(\.\(/\|$\)\)\?,pressure-vessel{}/,'.format(
args.version, tail,
), ),
'--exclude=metadata', # this is all duplicated in sources/ '--exclude=metadata', # this is all duplicated in sources/
'-zcvf', src_tar + '.tmp', '-zcvf', src_tar + '.tmp',
...@@ -489,8 +499,8 @@ def main(): ...@@ -489,8 +499,8 @@ def main():
]) ])
subprocess.check_call([ subprocess.check_call([
'tar', 'tar',
r'--transform=s,^\(\.\(/\|$\)\)\?,pressure-vessel-{}/,'.format( r'--transform=s,^\(\.\(/\|$\)\)\?,pressure-vessel{}/,'.format(
args.version, tail,
), ),
'--exclude=sources', '--exclude=sources',
'-zcvf', bin_tar + '.tmp', '-zcvf', bin_tar + '.tmp',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment