diff options
| -rwxr-xr-x | cdist | 55 |
1 files changed, 27 insertions, 28 deletions
@@ -578,33 +578,6 @@ class DockerTarget(Target): self.mounts.append(m) -class FlatpakTarget(Target): - def __init__(self, project, checkout): - super(FlatpakTarget, self).__init__('flatpak') - self.build_dependencies = False - self.project = project - self.checkout = checkout - - def setup(self): - pass - - def command(self, cmd): - command(cmd) - - def checkout_dependencies(self): - tree = globals.trees.get(self.project, self.checkout, self) - return tree.checkout_dependencies() - - def flatpak(self): - return 'flatpak' - - def flatpak_builder(self): - b = 'flatpak-builder' - if config.has('flatpak_state_dir'): - b += ' --state-dir=%s' % config.get('flatpak_state_dir') - return b - - class WindowsDockerTarget(DockerTarget): """ This target exposes the following additional API: @@ -750,6 +723,32 @@ class AppImageTarget(LinuxTarget): self.privileged = True +class FlatpakTarget(LinuxTarget): + def __init__(self, project, checkout, work): + super(FlatpakTarget, self).__init__('ubuntu', '22.04', 64, work) + self.platform = 'flatpak' + self.privileged = True + # XXX: needed? + self.build_dependencies = False + # XXX: remove + self.project = project + self.checkout = checkout + + def checkout_dependencies(self): + # XXX: remove + tree = globals.trees.get(self.project, self.checkout, self) + return tree.checkout_dependencies() + + def flatpak(self): + return 'flatpak' + + def flatpak_builder(self): + b = 'flatpak-builder' + if config.has('flatpak_state_dir'): + b += ' --state-dir=%s' % config.get('flatpak_state_dir') + return b + + def notarize_dmg(dmg): p = subprocess.run( config.get('osx_notarytool') + [ @@ -947,7 +946,7 @@ def target_factory(args): elif s == 'source': target = SourceTarget() elif s == 'flatpak': - target = FlatpakTarget(args.project, args.checkout) + target = FlatpakTarget(args.project, args.checkout, args.work) elif s == 'appimage': target = AppImageTarget(args.work) |