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

build: Add a metadata/ directory to binary-only releases


This is a subset of sources/ listing what went into a build.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent 36abb306
No related branches found
No related tags found
No related merge requests found
...@@ -160,7 +160,7 @@ def main(): ...@@ -160,7 +160,7 @@ def main():
) )
os.makedirs(os.path.join(destdir_prefix, 'bin'), exist_ok=True) os.makedirs(os.path.join(destdir_prefix, 'bin'), exist_ok=True)
os.makedirs(os.path.join(destdir_prefix, 'sources'), exist_ok=True) os.makedirs(os.path.join(destdir_prefix, 'metadata'), exist_ok=True)
for arch in ARCHS: for arch in ARCHS:
os.makedirs( os.makedirs(
...@@ -182,7 +182,7 @@ def main(): ...@@ -182,7 +182,7 @@ def main():
install( install(
os.path.join(args.srcdir, 'THIRD-PARTY.md'), os.path.join(args.srcdir, 'THIRD-PARTY.md'),
os.path.join(destdir_prefix, 'sources', 'README.txt'), os.path.join(destdir_prefix, 'metadata', 'README.txt'),
0o644, 0o644,
) )
...@@ -199,7 +199,7 @@ def main(): ...@@ -199,7 +199,7 @@ def main():
install( install(
'/usr/share/doc/libcapsule-tools-relocatable/copyright', '/usr/share/doc/libcapsule-tools-relocatable/copyright',
os.path.join(destdir_prefix, 'sources', 'libcapsule.txt'), os.path.join(destdir_prefix, 'metadata', 'libcapsule.txt'),
) )
else: else:
for arch in ARCHS: for arch in ARCHS:
...@@ -239,17 +239,9 @@ def main(): ...@@ -239,17 +239,9 @@ def main():
'debian', 'debian',
'copyright', 'copyright',
), ),
os.path.join(destdir_prefix, 'sources', 'libcapsule.txt'), os.path.join(destdir_prefix, 'metadata', 'libcapsule.txt'),
) )
for dsc in glob.glob(
os.path.join(args.srcdir, 'libcapsule*.dsc')
):
v_check_call([
'dcmd', 'install', '-m644', dsc,
os.path.join(destdir_prefix, 'sources'),
])
primary_architecture = subprocess.check_output([ primary_architecture = subprocess.check_output([
'dpkg', '--print-architecture', 'dpkg', '--print-architecture',
]).decode('utf-8').strip() ]).decode('utf-8').strip()
...@@ -356,7 +348,7 @@ def main(): ...@@ -356,7 +348,7 @@ def main():
'/usr/share/doc/{}/copyright'.format(package), '/usr/share/doc/{}/copyright'.format(package),
os.path.join( os.path.join(
destdir_prefix, destdir_prefix,
'sources', 'metadata',
'{}.txt'.format(source), '{}.txt'.format(source),
), ),
) )
...@@ -375,12 +367,26 @@ def main(): ...@@ -375,12 +367,26 @@ def main():
'build-relocatable/usr/share/doc/{}/copyright'.format(package), 'build-relocatable/usr/share/doc/{}/copyright'.format(package),
os.path.join( os.path.join(
destdir_prefix, destdir_prefix,
'sources', 'metadata',
'{}.txt'.format(source), '{}.txt'.format(source),
), ),
) )
source_to_download.add(source) source_to_download.add(source)
shutil.copytree(
os.path.join(destdir_prefix, 'metadata'),
os.path.join(destdir_prefix, 'sources'),
)
if not args.relocatabledir:
for dsc in glob.glob(
os.path.join(args.srcdir, 'libcapsule*.dsc')
):
v_check_call([
'dcmd', 'install', '-m644', dsc,
os.path.join(destdir_prefix, 'sources'),
])
v_check_call( v_check_call(
[ [
'apt-get', 'apt-get',
...@@ -474,6 +480,7 @@ def main(): ...@@ -474,6 +480,7 @@ def main():
r'--transform=s,^\(\.\(/\|$\)\)\?,pressure-vessel-{}/,'.format( r'--transform=s,^\(\.\(/\|$\)\)\?,pressure-vessel-{}/,'.format(
args.version, args.version,
), ),
'--exclude=metadata', # this is all duplicated in sources/
'-zcvf', src_tar + '.tmp', '-zcvf', src_tar + '.tmp',
'-C', destdir_prefix, '-C', destdir_prefix,
'.', '.',
......
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