diff --git a/blueprints/dev-utils/_mac/macdylibbundler/macdylibbundler.py b/blueprints/dev-utils/_mac/macdylibbundler/macdylibbundler.py deleted file mode 100644 index f98c3d6f4..000000000 --- a/blueprints/dev-utils/_mac/macdylibbundler/macdylibbundler.py +++ /dev/null @@ -1,27 +0,0 @@ -import info -from Package.MakeFilePackageBase import * - -class subinfo(info.infoclass): - def setTargets(self): - self.svnTargets["master"] = "https://github.com/auriamg/macdylibbundler.git" - self.targetInstallPath["master"] = "dev-utils" - self.description = "Utility to ease bundling libraries into executables for OSX" - self.webpage = "https://github.com/auriamg/macdylibbundler/" - self.defaultTarget = 'master' - - def setDependencies(self): - self.runtimeDependencies["virtual/base"] = "default" - -class Package(MakeFilePackageBase): - def __init__(self, **args): - MakeFilePackageBase.__init__(self) - self.subinfo.options.useShadowBuild = False - - def fetch(self): - if isinstance(self, GitSource): - if os.path.isdir(self.sourceDir()): - utils.system(["git", "clean", "-xdf"], cwd=self.sourceDir()) - return super().fetch() - - def install(self): - return utils.copyFile(os.path.join(self.sourceDir(), "dylibbundler"), os.path.join(self.installDir(), "bin", "dylibbundler"), linkOnly=False) diff --git a/blueprints/virtual/base/base.py b/blueprints/virtual/base/base.py index 99b8ed565..4d2394119 100644 --- a/blueprints/virtual/base/base.py +++ b/blueprints/virtual/base/base.py @@ -1,54 +1,53 @@ 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/shimgen"] = None self.buildDependencies["dev-utils/cmake"] = None else: self.buildDependencies["dev-utils/cmake"] = None self.buildDependencies["dev-utils/7zip"] = 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/macdylibbundler"] = 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 if CraftCore.settings.getboolean("Compile", "UseCCache", False): self.buildDependencies["dev-utils/ccache"] = 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 class Package(VirtualPackageBase): def __init__(self): VirtualPackageBase.__init__(self)