From 0a447b3077d87f9a0c08fcc486a8a3f355b92c87 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Mon, 28 Jun 2021 10:50:35 +0300 Subject: [PATCH] aedi: remove obsolete target's initialize method --- aedi/builder.py | 2 -- aedi/target/base.py | 7 ------- aedi/target/main.py | 13 +++++-------- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/aedi/builder.py b/aedi/builder.py index 8326bcad..8dfa64dd 100644 --- a/aedi/builder.py +++ b/aedi/builder.py @@ -76,8 +76,6 @@ class Builder(object): state.jobs = arguments.jobs and arguments.jobs or \ subprocess.check_output(['sysctl', '-n', 'hw.ncpu']).decode('ascii').strip() - self._target.initialize(state) - def _populate_platforms(self, arguments): state = self._state diff --git a/aedi/target/base.py b/aedi/target/base.py index 3e8f966d..b34d906d 100644 --- a/aedi/target/base.py +++ b/aedi/target/base.py @@ -43,9 +43,6 @@ class Target: def prepare_source(self, state: BuildState): pass - def initialize(self, state: BuildState): - pass - def detect(self, state: BuildState) -> bool: return False @@ -296,10 +293,6 @@ class ConfigureMakeTarget(BuildTarget): super().__init__(name) self.make = MakeTarget(name) - def initialize(self, state: BuildState): - super().initialize(state) - self.make.initialize(state) - def configure(self, state: BuildState): super().configure(state) self.make.configure(state) diff --git a/aedi/target/main.py b/aedi/target/main.py index 2f359231..a890ad67 100644 --- a/aedi/target/main.py +++ b/aedi/target/main.py @@ -140,20 +140,17 @@ class LZDoom3Target(ZDoomBaseTarget): super().__init__(name) self.unsupported_architectures = ('arm64',) + opts = self.options + opts['DYN_FLUIDSYNTH'] = 'NO' + opts['DYN_MPG123'] = 'NO' + opts['DYN_SNDFILE'] = 'NO' + def prepare_source(self, state: BuildState): state.checkout_git('https://github.com/drfrag666/gzdoom.git', branch='g3.3mgw') def detect(self, state: BuildState) -> bool: return os.path.exists(state.source + 'ico_lzdoom.png') and os.path.exists(state.source + 'libraries/zmusic') - def initialize(self, state: BuildState): - super().initialize(state) - - opts = self.options - opts['DYN_FLUIDSYNTH'] = 'NO' - opts['DYN_MPG123'] = 'NO' - opts['DYN_SNDFILE'] = 'NO' - class RazeTarget(ZDoomVulkanBaseTarget): def __init__(self, name='raze'):