diff --git a/dev-utils/_msvc/icoutils/icoutils.py b/dev-utils/_msvc/icoutils/icoutils.py index 09e4cdcb..6bc6dffa 100644 --- a/dev-utils/_msvc/icoutils/icoutils.py +++ b/dev-utils/_msvc/icoutils/icoutils.py @@ -1,30 +1,22 @@ import info class subinfo(info.infoclass): def setTargets(self): - build = "56" - for ver in ["0.32.3"]: - self.targets[ ver ] = f"https://files.kde.org/craft/autotools/packages/icoutils-{ver}-{build}-windows-mingw_{CraftCore.compiler.bits}-gcc.7z" - self.targetDigestUrls[ ver ] = f"https://files.kde.org/craft/autotools/packages/icoutils-{ver}-{build}-windows-mingw_{CraftCore.compiler.bits}-gcc.7z.sha256" - self.targetInstallPath[ ver ] = "dev-utils/icoutils" - - self.description = "The icoutils are a set of command-line programs for extracting and converting images in Microsoft Windows(R) icon and cursor files." - self.webpage = "http://www.nongnu.org/icoutils/" - self.defaultTarget = "0.32.3" + self.addCachedAutotoolsBuild("dev-utils/_autotools/icoutils", targetInstallPath=os.path.join("dev-utils", "bin")) def setDependencies(self): self.runtimeDependencies["virtual/base"] = None from Package.BinaryPackageBase import * class Package(BinaryPackageBase): def __init__(self, **args): BinaryPackageBase.__init__(self) def install(self): if not super().install(): return False return (utils.createShim(os.path.join(self.imageDir(), "bin", "icotool.exe"), os.path.join(self.installDir(), "bin", "icotool.exe")) and utils.createShim(os.path.join(self.imageDir(), "bin", "wrestool.exe"), os.path.join(self.installDir(), "bin", "wrestool.exe")) ) diff --git a/dev-utils/_msvc/pkg-config/pkg-config.py b/dev-utils/_msvc/pkg-config/pkg-config.py index 1ea88e5f..cc883075 100644 --- a/dev-utils/_msvc/pkg-config/pkg-config.py +++ b/dev-utils/_msvc/pkg-config/pkg-config.py @@ -1,25 +1,19 @@ import info from Package.BinaryPackageBase import * class subinfo(info.infoclass): def setTargets(self): - build = "56" - for ver in ["0.29.2"]: - self.targets[ ver ] = f"https://files.kde.org/craft/autotools/packages/pkg-config-{ver}-{build}-windows-mingw_{CraftCore.compiler.bits}-gcc.7z" - self.targetDigestUrls[ ver ] = f"https://files.kde.org/craft/autotools/packages/pkg-config-{ver}-{build}-windows-mingw_{CraftCore.compiler.bits}-gcc.7z.sha256" - self.targetInstallPath[ ver ] = "dev-utils/pkg-config" - self.patchLevel["0.29.2"] = 1 - self.defaultTarget = "0.29.2" + self.addCachedAutotoolsBuild("dev-utils/_autotools/pkg-config", targetInstallPath=os.path.join("dev-utils", "bin")) def setDependencies(self): self.buildDependencies["virtual/bin-base"] = None class Package(BinaryPackageBase): def __init__(self): BinaryPackageBase.__init__(self) def install(self): if not super().install(): return False return utils.createShim(os.path.join(self.imageDir(), "bin", "pkg-config.exe"), os.path.join(self.installDir(), "bin", "pkg-config.exe")) diff --git a/libs/_msvc/version.ini b/libs/_msvc/version.ini index 8201af00..be688234 100644 --- a/libs/_msvc/version.ini +++ b/libs/_msvc/version.ini @@ -1,4 +1,4 @@ [General] -tarballs = 2018.03;2018.05 -defaulttarget = 2018.05 +tarballs = 2018.03;2018.05;2019.02 +defaulttarget = 2019.02 tarballUrl = https://files.kde.org/craft/autotools/${VERSION}/windows/mingw_${COMPILER_BITS}/gcc/Release/