diff --git a/blueprints/dev-utils/_windows/mingw-w64/mingw-w64.py b/blueprints/dev-utils/_windows/mingw-w64/mingw-w64.py index 0fb6c4902..dd9de5f42 100644 --- a/blueprints/dev-utils/_windows/mingw-w64/mingw-w64.py +++ b/blueprints/dev-utils/_windows/mingw-w64/mingw-w64.py @@ -1,51 +1,47 @@ import info class subinfo(info.infoclass): + def registerOptions(self): + if not CraftCore.compiler.isMinGW: + self.parent.package.categoryInfo.platforms = CraftCore.compiler.Platforms.NoPlatform + def setTargets(self): for ver, rev, rt in [("5.3.0", "0", "4"), ("5.4.0", "0", "5"), ("6.2.0", "0", "5"), ("7.1.0", "0", "5"), ("7.2.0", "1", "5"), ("7.3.0", "0", "5"), ("8.1.0", "0", "6"), ]: arch = "i686" if CraftCore.compiler.isX86() else "x86_64" exceptionType = "sjlj" if CraftCore.compiler.isX86() else "seh" self.targets[f"{ver}-{rev}"] = f"https://downloads.sourceforge.net/sourceforge/mingw-w64/{arch}-{ver}-release-posix-{exceptionType}-rt_v{rt}-rev{rev}.7z" self.targetDigestsX64["7.1.0-0"] = (['5391e8e733dcdab71e6ac71d6524e841be5ea980dc14f22a23af64e92af5dcd7'], CraftHash.HashAlgorithm.SHA256) self.targetDigestsX64["7.2.0-1"] = (['ef88d8691566b993778ed3ad651a3c75bd67896d1d8e220729fe24ec405ec21c'], CraftHash.HashAlgorithm.SHA256) self.targetDigestsX64["7.3.0-0"] = (['784d25b00e7cf27aa64abe2363b315400c27526bfce672fdee97137f71823d03'], CraftHash.HashAlgorithm.SHA256) self.targetDigestsX64["8.1.0-0"] = (['853970527b5de4a55ec8ca4d3fd732c00ae1c69974cc930c82604396d43e79f8'], CraftHash.HashAlgorithm.SHA256) self.targetDigests["8.1.0-0"] = (['d3a3b8136347a705c879f43d4cfab00e117eb003'], CraftHash.HashAlgorithm.SHA1) self.targetDigests["7.3.0-0"] = (['c1f80f43dd0fb625ee925b4fd01974140871fe09bb771d0684b306ba58ed47f3'], CraftHash.HashAlgorithm.SHA256) self.defaultTarget = "8.1.0-0" def setDependencies(self): self.runtimeDependencies["dev-utils/7zip"] = None self.runtimeDependencies["dev-utils/wget"] = None from Package.BinaryPackageBase import * -class PackageMinGW(BinaryPackageBase): +class Package(BinaryPackageBase): def __init__(self): BinaryPackageBase.__init__(self) def install(self): if not BinaryPackageBase.install(self): return False if CraftCore.compiler.isX86(): return utils.moveDir(os.path.join(self.installDir(), "mingw32"), os.path.join(self.installDir(), "mingw")) return True - - -from Package.Qt5CorePackageBase import * - - -class Package(Qt5CoreSdkPackageBase): - def __init__(self): - Qt5CoreSdkPackageBase.__init__(self, condition=CraftCore.compiler.isMinGW(), classA=PackageMinGW) diff --git a/blueprints/dev-utils/kshimgen/kshimgen.py b/blueprints/dev-utils/kshimgen/kshimgen.py index aae8d9ed3..5ce35c451 100644 --- a/blueprints/dev-utils/kshimgen/kshimgen.py +++ b/blueprints/dev-utils/kshimgen/kshimgen.py @@ -1,19 +1,22 @@ import info -from Package.BinaryPackageBase import * +from Package.CMakePackageBase import * class subinfo(info.infoclass): + def registerOptions(self): + self.options.dynamic.setDefault("buildType", "Release") + def setTargets(self): - sums = {"kshimgen-0.2.0-linux-64.tar.xz":"2325dd6b436d70933fde607b538e9fc594552ddc97877017b5a297e69bbde99b", - "kshimgen-0.2.0-macos-64.tar.xz": "6fe02653ccefe1aac652dde7b9546e8a1a34f9ce912b95ed8cbafbe6c6742f52", - "kshimgen-0.2.0-windows-32.7z": "e4d25e68bef07c0e31646016a34f6d8bfd0f00568043ac151f44145b4eb4bd4c", - "kshimgen-0.2.0-windows-64.7z": "9b3f7f03bb3f885184fd9ce16fc83e976e3f44307c6d98e71aca8bb5f399e8db"} + self.svnTargets["master"] = "https://invent.kde.org/vonreth/kshim.git" + for ver in ["0.2.0"]: - fileName = f"kshimgen-{ver}-{CraftCore.compiler.platform.name.lower()}-{CraftCore.compiler.bits}.{'7z' if CraftCore.compiler.isWindows else 'tar.xz'}" - self.targets[ver] = f"https://files.kde.org/craft/prebuilt/kshimgen/{fileName}" - self.targetDigests[ver] = ([sums[fileName]], CraftHash.HashAlgorithm.SHA256) + self.targets[ver] = f"https://files.kde.org/craft/sources/libs/kshimgn/kshimgen-v{ver}.tar.xz" + self.targetInstSrc[ver] = f"kshimgen-v{ver}" + self.targetDigests["0.1.0"] = (['1a46c599ca54e112fd37c39a60e5b97b6b20997e2114fe3cd422274c75ebcd22'], CraftHash.HashAlgorithm.SHA256) + self.targetDigests["0.2.0"] = (['b5f93d81d6937edb6608b87e0a87c9b7783aa7488c350683865beac3207d4312'], CraftHash.HashAlgorithm.SHA256) + self.patchLevel["0.2.0"] = 1 self.defaultTarget = '0.2.0' -class Package(BinaryPackageBase): +class Package(CMakePackageBase): def __init__(self, **args): - BinaryPackageBase.__init__(self) + CMakePackageBase.__init__(self) diff --git a/blueprints/virtual/base/base.py b/blueprints/virtual/base/base.py index b6af913d5..6b3b174cf 100644 --- a/blueprints/virtual/base/base.py +++ b/blueprints/virtual/base/base.py @@ -1,60 +1,59 @@ import info from Package.VirtualPackageBase import * class subinfo(info.infoclass): def setTargets(self): self.targets['0.2'] = "" self.defaultTarget = '0.2' def setDependencies(self): # The order is important self.buildDependencies["core/cacert"] = None if CraftCore.compiler.isWindows: self.buildDependencies["dev-utils/7zip"] = None self.buildDependencies["dev-utils/wget"] = None self.buildDependencies["dev-utils/git"] = None + self.buildDependencies["dev-utils/mingw-w64"] = None self.buildDependencies["dev-utils/kshimgen"] = None self.buildDependencies["dev-utils/cmake"] = None else: + self.buildDependencies["dev-utils/kshimgen"] = None self.buildDependencies["dev-utils/cmake"] = None self.buildDependencies["dev-utils/7zip"] = None self.buildDependencies["python-modules/pip-system"] = None self.buildDependencies["python-modules/virtualenv"] = None self.buildDependencies["python-modules/pip"] = None self.buildDependencies["dev-utils/python3"] = None self.buildDependencies["dev-utils/patch"] = None self.buildDependencies["dev-utils/sed"] = None self.buildDependencies["dev-utils/automake"] = None self.buildDependencies["dev-utils/libtool"] = None if CraftCore.compiler.isMacOS: self.buildDependencies["dev-utils/packagesdev"] = None self.buildDependencies["dev-utils/create-dmg"] = None - - if CraftCore.compiler.isMinGW(): - self.buildDependencies["dev-utils/mingw-w64"] = None if CraftCore.settings.get("Compile", "MakeProgram", "") == "jom": self.buildDependencies["dev-utils/jom"] = None if CraftCore.settings.getboolean("Compile", "UseNinja", False): self.buildDependencies["dev-utils/ninja"] = None # needed by CollectionPackagerBase if (CraftCore.settings.getboolean("QtSDK", "Enabled", False) and CraftCore.settings.getboolean("QtSDK","PackageQtSDK",True)): self.buildDependencies["dev-utils/dependencies"] = None self.buildDependencies["craft/craft-blueprints-kde"] = None self.buildDependencies["craft/craft-core"] = None self.runtimeDependencies["libs/runtime"] = None if CraftCore.settings.getboolean("General", "AllowAnsiColor", False): self.buildDependencies["python-modules/coloredlogs"] = None class Package(VirtualPackageBase): def __init__(self): VirtualPackageBase.__init__(self)