From 75328e2edf2df9882d85c30fdfc5a785845a28cc Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sun, 18 Apr 2021 15:27:30 +0300 Subject: [PATCH] version wip [skip ci] --- aedi/target/__init__.py | 7 ++--- aedi/target/dependency.py | 56 ++++++++++++++++++++++++++++++++++----- aedi/utility.py | 6 ++--- 3 files changed, 54 insertions(+), 15 deletions(-) diff --git a/aedi/target/__init__.py b/aedi/target/__init__.py index 08a3f6de..545cd8fa 100644 --- a/aedi/target/__init__.py +++ b/aedi/target/__init__.py @@ -34,12 +34,9 @@ class CheckVersionsTarget(Target): continue latest = target.remote_version() - outdated = current != latest + status = 'latest' if current == latest else f'update to {latest}' - if outdated: - print(f'{target.name}: out-of-date, {current} vs {latest}') - else: - print(target.name + ': up-to-date') + print(f'{target.name}: {current}, {status}') def targets(): diff --git a/aedi/target/dependency.py b/aedi/target/dependency.py index 42851964..0ced7d49 100644 --- a/aedi/target/dependency.py +++ b/aedi/target/dependency.py @@ -93,9 +93,16 @@ class DumbTarget(CMakeStaticDependencyTarget): opts['BUILD_ALLEGRO4'] = 'NO' opts['BUILD_EXAMPLES'] = 'NO' + def local_version(self) -> str: + return '2.0.3' + + def remote_version(self) -> str: + return get_latest_github_version('kode54/dumb') + def prepare_source(self, state: BuildState): + version = self.local_version() state.download_source( - 'https://github.com/kode54/dumb/archive/2.0.3.tar.gz', + f'https://github.com/kode54/dumb/archive/{version}.tar.gz', '99bfac926aeb8d476562303312d9f47fd05b43803050cd889b44da34a9b2a4f9') def detect(self, state: BuildState) -> bool: @@ -117,9 +124,16 @@ class FfiTarget(ConfigureMakeStaticDependencyTarget): def __init__(self, name='ffi'): super().__init__(name) + def local_version(self) -> str: + return '3.3' + + def remote_version(self) -> str: + return get_latest_github_version('libffi/libffi', strip_prefix='v') + def prepare_source(self, state: BuildState): + version = self.local_version() state.download_source( - 'https://github.com/libffi/libffi/releases/download/v3.3/libffi-3.3.tar.gz', + f'https://github.com/libffi/libffi/releases/download/v{version}/libffi-{version}.tar.gz', '72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056') def detect(self, state: BuildState) -> bool: @@ -137,9 +151,16 @@ class FlacTarget(ConfigureMakeStaticDependencyTarget): super().__init__(name) self.options['--enable-cpplibs'] = 'no' + def local_version(self) -> str: + return '1.3.3' + + def remote_version(self) -> str: + return get_latest_github_version('xiph/flac') + def prepare_source(self, state: BuildState): + version = self.local_version() state.download_source( - 'https://downloads.xiph.org/releases/flac/flac-1.3.3.tar.xz', + f'https://downloads.xiph.org/releases/flac/flac-{version}.tar.xz', '213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748') def detect(self, state: BuildState) -> bool: @@ -156,9 +177,16 @@ class FluidSynthTarget(CMakeStaticDependencyTarget): opts['enable-readline'] = 'NO' opts['enable-sdl2'] = 'NO' + def local_version(self) -> str: + return '2.2.0' + + def remote_version(self) -> str: + return get_latest_github_version('FluidSynth/fluidsynth', strip_prefix='v') + def prepare_source(self, state: BuildState): + version = self.local_version() state.download_source( - 'https://github.com/FluidSynth/fluidsynth/archive/v2.2.0.tar.gz', + f'https://github.com/FluidSynth/fluidsynth/archive/v{version}.tar.gz', '928fb16f307507485bd1d9b010dafba8c747bce5de2ba47ab1705944c87013b6') def detect(self, state: BuildState) -> bool: @@ -541,7 +569,7 @@ class OggTarget(ConfigureMakeStaticDependencyTarget): def local_version(self) -> str: return '1.3.4' - def remote_version(self) -> [str, None]: + def remote_version(self) -> str: return get_latest_github_version('xiph/ogg', strip_prefix='v') def prepare_source(self, state: BuildState): @@ -587,9 +615,16 @@ class OpusTarget(ConfigureMakeStaticDependencyTarget): super().__init__(name) self.options['--disable-extra-programs'] = None + def local_version(self) -> str: + return '1.3.1' + + def remote_version(self) -> str: + return get_latest_github_version('xiph/opus', strip_prefix='v') + def prepare_source(self, state: BuildState): + version = self.local_version() state.download_source( - 'https://archive.mozilla.org/pub/opus/opus-1.3.1.tar.gz', + f'https://archive.mozilla.org/pub/opus/opus-{version}.tar.gz', '65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d') def detect(self, state: BuildState) -> bool: @@ -853,9 +888,16 @@ class VorbisTarget(ConfigureMakeStaticDependencyTarget): def __init__(self, name='vorbis'): super().__init__(name) + def local_version(self) -> str: + return '1.3.7' + + def remote_version(self) -> str: + return get_latest_github_version('xiph/vorbis', strip_prefix='v') + def prepare_source(self, state: BuildState): + version = self.local_version() state.download_source( - 'https://downloads.xiph.org/releases/vorbis/libvorbis-1.3.7.tar.xz', + f'https://downloads.xiph.org/releases/vorbis/libvorbis-{version}.tar.xz', 'b33cc4934322bcbf6efcbacf49e3ca01aadbea4114ec9589d1b1e9d20f72954b') def detect(self, state: BuildState) -> bool: diff --git a/aedi/utility.py b/aedi/utility.py index 0aae7b48..f40ad810 100644 --- a/aedi/utility.py +++ b/aedi/utility.py @@ -82,12 +82,12 @@ def symlink_directory(src_path: str, dst_path: str, cleanup=True): def get_latest_github_version(repo: str, strip_prefix: str = None) -> str: - request_url = f'https://api.github.com/repos/{repo}/releases/latest' + request_url = f'https://api.github.com/repos/{repo}/tags' response = urllib.request.urlopen(request_url) data = response.read() - release = json.loads(data) - version = release['tag_name'] + tags = json.loads(data) + version = tags[0]['name'] if strip_prefix and version.startswith(strip_prefix): version = version[len(strip_prefix):]