diff --git a/bin/Packager/AppImagePackager.py b/bin/Packager/AppImagePackager.py new file mode 100644 index 000000000..814f7381b --- /dev/null +++ b/bin/Packager/AppImagePackager.py @@ -0,0 +1,57 @@ +# -*- coding: utf-8 -*- +# Copyright Hannah von Reth +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +from .CollectionPackagerBase import * +from .SevenZipPackager import * +from .NullsoftInstallerPackager import * + +class AppImagePackager(CollectionPackagerBase): + """ +Packager for portal 7zip archives +""" + + @InitGuard.init_once + def __init__(self, whitelists=None, blacklists=None): + CollectionPackagerBase.__init__(self, whitelists, blacklists) + + def _setDefaults(self): + # TODO: Fix defaults + self.defines.setdefault("apppath", "") + self.defines.setdefault("appname", self.package.name.lower()) + + def createPackage(self): + """ create a package """ + + if 1: + if not self.internalCreatePackage(): + return False + utils.mergeTree(self.archiveDir(), os.path.join(self.archiveDir(), "usr")) + + self._setDefaults() + # TODO: "--plugin=checkrt" + return utils.system(["linuxdeploy", "--appdir", self.archiveDir(), "--executable", os.path.join(self.archiveDir(), "usr", "bin", self.defines['appname']), + #"--desktop-file", os.path.join(self.archiveDir(), "usr", "share", "applications" ,"org.kde.kate.desktop"), + "--create-desktop-file", + "--icon-file", os.path.join(CraftCore.standardDirs.craftRoot(), "share", "icons", "hicolor", "64x64", "apps", "kate.png"), + "-v", "0", + "--output=appimage"]) diff --git a/bin/Packager/TypePackager.py b/bin/Packager/TypePackager.py index b35ff88e6..5acaebceb 100644 --- a/bin/Packager/TypePackager.py +++ b/bin/Packager/TypePackager.py @@ -1,76 +1,77 @@ # -*- coding: utf-8 -*- # Copyright (c) 2015 Patrick Spendrin # Copyright Hannah von Reth # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. from Packager.CreateArchivePackager import * from Packager.MacDMGPackager import * from Packager.MSIFragmentPackager import * from Packager.NullsoftInstallerPackager import * from Packager.PortablePackager import * from Packager.SevenZipPackager import * from Packager.QtIFPackager import * from Packager.AppxPackager import * +from Packager.AppImagePackager import AppImagePackager class TypePackager(PackagerBase): """packager that is used in place of different other packagers The packager used can be decided at runtime """ def __init__(self): CraftCore.log.debug("TypePackager __init__") self.__packager = None self.changePackager(None) def changePackager(self, packager=None): if not packager: packager = CraftCore.settings.get("Packager", "PackageType", "") if not packager: if CraftCore.compiler.isWindows: packager = NullsoftInstallerPackager elif CraftCore.compiler.isMacOS: packager = MacDMGPackager else: packager = SevenZipPackager if isinstance(packager, str): if packager == "MultiCollectionPackager": packager = "NullsoftInstallerPackager" CraftCore.log.warning("MultiCollectionPackager is deprecated, please use NullsoftInstallerPackager") packager = eval(packager) if self.__packager: bases = list(self.__class__.__bases__) for i in range(len(bases)): if bases[i] == self.__packager: CraftCore.log.info(f"Replace Packager: {bases[i]} with {packager}") bases[i] = packager self.__class__.__bases__ = tuple(bases) else: self.__class__.__bases__ += (packager,) packager.__init__(self) self.__packager = packager def createPackage(self): return self.__packager.createPackage(self)