diff --git a/extragear/atcore/atcore.py b/extragear/atcore/atcore.py index 3d56d473..ed071d95 100644 --- a/extragear/atcore/atcore.py +++ b/extragear/atcore/atcore.py @@ -1,48 +1,36 @@ import info class subinfo(info.infoclass): def setTargets(self): self.svnTargets['master'] = 'git://anongit.kde.org/atcore|master' self.svnTargets['1.0'] = 'git://anongit.kde.org/atcore|1.0' self.defaultTarget = '1.0' self.displayName = "AtCoreTest" self.description = "The KDE core of Atelier Printer Host" def setDependencies(self): self.buildDependencies["kde/frameworks/extra-cmake-modules"] = "default" self.runtimeDependencies["libs/qt5/qtbase"] = "default" self.runtimeDependencies["libs/qt5/qtserialport"] = "default" self.runtimeDependencies["libs/qt5/qtcharts"] = "default" from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__(self): CMakePackageBase.__init__(self) - self.subinfo.options.configure.args = "-DBUILD_GUI=ON " if self.buildTarget != "1.0": - self.subinfo.options.configure.args += "-DDEPLOY_PLUGINS_WITH_BINARY=ON " - - self.blacklist_file = [ - PackagerLists.runtimeBlacklist, - os.path.join(self.packageDir(), 'blacklist.txt') - ] - def preArchive(self): - if CraftCore.compiler.isMacOS: - if self.buildTarget != "1.0": - return utils.mergeTree(os.path.join(self.archiveDir(), "bin/plugins/"), os.path.join(self.archiveDir(), "AtCoreTest.app/Contents/MacOS/plugins")) - else: - return utils.mergeTree(os.path.join(self.archiveDir(), "bin/plugins/"), os.path.join(self.archiveDir(), "atcore-gui.app/Contents/MacOS/plugins")) - else: - return True + self.subinfo.options.configure.args = "-DBUILD_GUI=ON " + + self.blacklist_file.append(os.path.join(self.packageDir(), 'blacklist.txt')) def createPackage(self): self.defines["executable"] = "bin\\atcore-gui.exe" self.defines["appname"] = "atcore-gui" self.defines["website"] = "https://atelier.kde.org" self.defines["icon"] = os.path.join(self.packageDir(), "atcore.ico") return TypePackager.createPackage(self)