From 9a6360d968870abdc05420e68a1586a042701453 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Thu, 23 Nov 2023 11:50:41 +0200 Subject: [PATCH] aedi: rename lzma target to xz, and move it to tools tier 2 --- aedi/target/__init__.py | 2 +- aedi/target/library_tier3.py | 21 --------------------- aedi/target/tool_tier2.py | 21 +++++++++++++++++++++ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/aedi/target/__init__.py b/aedi/target/__init__.py index b87d2b4e..333035af 100644 --- a/aedi/target/__init__.py +++ b/aedi/target/__init__.py @@ -107,7 +107,6 @@ def targets(): HighwayTarget(), JpegTurboTarget(), LuaTarget(), - LzmaTarget(), Sdl2TtfTarget(), SfmlTarget(), TiffTarget(), @@ -133,6 +132,7 @@ def targets(): RizinTarget(), SeverZipTarget(), UnrarTarget(), + XzTarget(), ZipTarget(), # Special diff --git a/aedi/target/library_tier3.py b/aedi/target/library_tier3.py index 7878c1fc..d1d006ee 100644 --- a/aedi/target/library_tier3.py +++ b/aedi/target/library_tier3.py @@ -287,27 +287,6 @@ class LuaTarget(base.MakeTarget): self.install(state, state.options) -class LzmaTarget(base.CMakeStaticDependencyTarget): - def __init__(self, name='lzma'): - super().__init__(name) - - def prepare_source(self, state: BuildState): - state.download_source( - 'https://tukaani.org/xz/xz-5.2.5.tar.gz', - 'f6f4910fd033078738bd82bfba4f49219d03b17eb0794eb91efbae419f4aba10', - patches='lzma-add-cmake') - - def detect(self, state: BuildState) -> bool: - return state.has_source_file('src/liblzma/liblzma.pc.in') - - def post_build(self, state: BuildState): - super().post_build(state) - - self.write_pc_file(state, 'liblzma.pc', name='liblzma', - description='General purpose data compression library', - version='5.2.5', libs='-llzma') - - class Sdl2TtfTarget(base.CMakeStaticDependencyTarget): def __init__(self, name='sdl2_ttf'): super().__init__(name) diff --git a/aedi/target/tool_tier2.py b/aedi/target/tool_tier2.py index 79fce3eb..2e2cad02 100644 --- a/aedi/target/tool_tier2.py +++ b/aedi/target/tool_tier2.py @@ -222,6 +222,27 @@ class UnrarTarget(base.MakeTarget): return state.has_source_file('rar.hpp') +class XzTarget(base.CMakeStaticDependencyTarget): + def __init__(self, name='xz'): + super().__init__(name) + + def prepare_source(self, state: BuildState): + state.download_source( + 'https://tukaani.org/xz/xz-5.2.5.tar.gz', + 'f6f4910fd033078738bd82bfba4f49219d03b17eb0794eb91efbae419f4aba10', + patches='lzma-add-cmake') + + def detect(self, state: BuildState) -> bool: + return state.has_source_file('src/liblzma/liblzma.pc.in') + + def post_build(self, state: BuildState): + super().post_build(state) + + self.write_pc_file(state, 'liblzma.pc', name='liblzma', + description='General purpose data compression library', + version='5.2.5', libs='-llzma') + + class ZipTarget(base.SingleExeCTarget): def __init__(self, name='zip'): super().__init__(name)