smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

The manifest file must be named as the app-id.

This commit is contained in:
Matthieu Gautier 2018-12-12 11:28:08 +01:00
parent e11247c18a
commit abf0e639e1
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kiwixbuild/flatpak_builder.py
View File

@ -187,7 +187,9 @@ class FlatpakBuilder:
manifest = MANIFEST.copy() manifest = MANIFEST.copy()
manifest['modules'] = list(modules.values()) manifest['modules'] = list(modules.values())
with open(pj(self.platform.buildEnv.build_dir, 'manifest.json'), 'w') as f: manifest_name = "{}.json".format(MANIFEST['app-id'])
manifest_path = pj(self.platform.buildEnv.build_dir, manifest_name)
with open(manifest_path, 'w') as f:
f.write(json.dumps(manifest, indent=4)) f.write(json.dumps(manifest, indent=4))
def copy_patches(self): def copy_patches(self):
@ -206,7 +208,8 @@ class FlatpakBuilder:
def build(self): def build(self):
log = pj(self.platform.buildEnv.log_dir, 'cmd_build_flatpak.log') log = pj(self.platform.buildEnv.log_dir, 'cmd_build_flatpak.log')
context = Context('build', log, False) context = Context('build', log, False)
command = "flatpak-builder --user --ccache --force-clean --repo=repo builddir manifest.json" command = "flatpak-builder --user --ccache --force-clean --repo=repo builddir {id}.json"
command = command.format(id = MANIFEST['app-id'])
try: try:
run_command(command, self.platform.buildEnv.build_dir, context, self.platform.buildEnv) run_command(command, self.platform.buildEnv.build_dir, context, self.platform.buildEnv)
context._finalise() context._finalise()