From b2dfc668bd467e1e8a565ec2ed927b800bea1937 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Fri, 23 Sep 2022 14:58:01 +0300 Subject: [PATCH] aedi: move pbzx target to tier 2 --- aedi/target/__init__.py | 2 +- aedi/target/tool_tier1.py | 15 --------------- aedi/target/tool_tier2.py | 15 +++++++++++++++ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/aedi/target/__init__.py b/aedi/target/__init__.py index d0848b86..00cb1e60 100644 --- a/aedi/target/__init__.py +++ b/aedi/target/__init__.py @@ -116,12 +116,12 @@ def targets(): NasmTarget(), NinjaTarget(), P7ZipTarget(), - PbzxTarget(), PkgConfigTarget(), UnrarTarget(), YasmTarget(), # Tools without binaries stored in the repo, can be outdated + PbzxTarget(), ZipTarget(), # Special diff --git a/aedi/target/tool_tier1.py b/aedi/target/tool_tier1.py index bc3c742a..42d1d838 100644 --- a/aedi/target/tool_tier1.py +++ b/aedi/target/tool_tier1.py @@ -147,21 +147,6 @@ class P7ZipTarget(CMakeTarget): self.copy_to_bin(state, '7za') -class PbzxTarget(SingleExeCTarget): - def __init__(self, name='pbzx'): - super().__init__(name) - self.options = ('pbzx.c', '-lxar', '-llzma') - - def prepare_source(self, state: BuildState): - state.download_source( - 'https://github.com/nrosenstein-stuff/pbzx/archive/refs/tags/v1.0.2.tar.gz', - '33db3cf9dc70ae704e1bbfba52c984f4c6dbfd0cc4449fa16408910e22b4fd90', - 'pbzx-xar-content') - - def detect(self, state: BuildState) -> bool: - return state.has_source_file('pbzx.c') - - class PkgConfigTarget(ConfigureMakeDependencyTarget): def __init__(self, name='pkg-config'): super().__init__(name) diff --git a/aedi/target/tool_tier2.py b/aedi/target/tool_tier2.py index 6cb210e9..50e1a075 100644 --- a/aedi/target/tool_tier2.py +++ b/aedi/target/tool_tier2.py @@ -19,6 +19,21 @@ from .base import * +class PbzxTarget(SingleExeCTarget): + def __init__(self, name='pbzx'): + super().__init__(name) + self.options = ('pbzx.c', '-lxar', '-llzma') + + def prepare_source(self, state: BuildState): + state.download_source( + 'https://github.com/nrosenstein-stuff/pbzx/archive/refs/tags/v1.0.2.tar.gz', + '33db3cf9dc70ae704e1bbfba52c984f4c6dbfd0cc4449fa16408910e22b4fd90', + 'pbzx-xar-content') + + def detect(self, state: BuildState) -> bool: + return state.has_source_file('pbzx.c') + + class ZipTarget(SingleExeCTarget): def __init__(self, name='zip'): super().__init__(name)