Merge pull request #1092 from wingtk/valid-archive-name

Fix some projects don't have a valid archive filename

gvsbuild/projects/graphene.py

@@ -27,6 +27,7 @@ def __init__(self):
  version="1.10.8",
  repository="ebassi/graphene",
  archive_url="https://github.com/ebassi/graphene/archive/refs/tags/{version}.tar.gz",
+ archive_filename="graphene-{version}.tar.gz",
  hash="922dc109d2dc5dc56617a29bd716c79dd84db31721a8493a13a5f79109a4a4ed",
  dependencies=["ninja", "meson", "pkgconf", "glib"],
  )

gvsbuild/projects/leveldb.py

@@ -25,7 +25,7 @@ def __init__(self):
  "leveldb",
  version="1.20",
  archive_url="https://github.com/google/leveldb/archive/v{version}.tar.gz",
- archive_file_name="leveldb-{version}.tar.gz",
+ archive_filename="leveldb-{version}.tar.gz",
  hash="f5abe8b5b209c2f36560b75f32ce61412f39a2922f7045ae764a2c23335b6664",
  )
 

gvsbuild/projects/libcbor.py

@@ -26,8 +26,8 @@ def __init__(self):
  "libcbor",
  version="0.10.2",
  archive_url="https://github.com/PJK/libcbor/archive/refs/tags/v{version}.tar.gz",
- hash="e75f712215d7b7e5c89ef322a09b701f7159f028b8b48978865725f00f79875b",
  archive_filename="libcbor-{version}.tar.gz",
+ hash="e75f712215d7b7e5c89ef322a09b701f7159f028b8b48978865725f00f79875b",
  dependencies=["cmake", "ninja"],
  )
 

gvsbuild/projects/libepoxy.py

@@ -26,8 +26,8 @@ def __init__(self):
  "libepoxy",
  version="1.5.10",
  archive_url="https://github.com/anholt/libepoxy/archive/refs/tags/{version}.tar.gz",
- hash="a7ced37f4102b745ac86d6a70a9da399cc139ff168ba6b8002b4d8d43c900c15",
  archive_filename="libepoxy-{version}.tar.gz",
+ hash="a7ced37f4102b745ac86d6a70a9da399cc139ff168ba6b8002b4d8d43c900c15",
  dependencies=["ninja", "meson"],
  )
 

gvsbuild/projects/libuv.py

@@ -25,7 +25,7 @@ def __init__(self):
  self,
  "libuv",
  version="1.46.0",
- archive_file_name="libuv-v{version}.tar.gz",
+ archive_filename="libuv-v{version}.tar.gz",
  archive_url="https://github.com/libuv/libuv/archive/v{version}.tar.gz",
  hash="7aa66be3413ae10605e1f5c9ae934504ffe317ef68ea16fdaa83e23905c681bd",
  dependencies=[

gvsbuild/projects/libvpx.py

@@ -28,7 +28,7 @@ def __init__(self):
  "libvpx",
  version="1.13.1",
  archive_url="https://github.com/webmproject/libvpx/archive/v{version}.tar.gz",
- archive_file_name="libvpx-v{version}.tar.gz",
+ archive_filename="libvpx-v{version}.tar.gz",
  hash="00dae80465567272abd077f59355f95ac91d7809a2d3006f9ace2637dd429d14",
  dependencies=["nasm", "msys2", "libyuv", "perl"],
  patches=[

gvsbuild/projects/lz4.py

@@ -25,7 +25,7 @@ def __init__(self):
  "lz4",
  version="1.9.4",
  archive_url="https://github.com/lz4/lz4/archive/v{version}.tar.gz",
- archive_file_name="lz4-{version}.tar.gz",
+ archive_filename="lz4-{version}.tar.gz",
  hash="0b0e3aa07c8c063ddf40b082bdf7e37a1562bda40a0ff5272957f3e987e0e54b",
  )
 

gvsbuild/projects/openh264.py

@@ -26,7 +26,7 @@ def __init__(self):
  "openh264",
  version="2.3.1",
  archive_url="https://github.com/cisco/openh264/archive/refs/tags/v{version}.tar.gz",
- archive_file_name="openh264-{version}.tar.gz",
+ archive_filename="openh264-{version}.tar.gz",
  hash="453afa66dacb560bc5fd0468aabee90c483741571bca820a39a1c07f0362dc32",
  dependencies=[
  "ninja",

gvsbuild/projects/win_iconv.py

@@ -26,7 +26,7 @@ def __init__(self):
  "win-iconv",
  version="0.0.8",
  archive_url="https://github.com/win-iconv/win-iconv/archive/v{version}.tar.gz",
- archive_file_name="win-iconv-{version}.tar.gz",
+ archive_filename="win-iconv-{version}.tar.gz",
  hash="23adea990a8303c6e69e32a64a30171efcb1b73824a1c2da1bbf576b0ae7c520",
  dependencies=[
  "cmake",

gvsbuild/tools.py

@@ -31,7 +31,7 @@ def __init__(self):
  version="1.72.1",
  repository="rust-lang/rust",
  archive_url="https://win.rustup.rs/x86_64",
- archive_file_name="rustup-init.exe",
+ archive_filename="rustup-init.exe",
  exe_name="cargo.exe",
  )
 
@@ -95,7 +95,7 @@ def __init__(self):
  "meson",
  version="1.2.2",
  archive_url="https://github.com/mesonbuild/meson/archive/refs/tags/{version}.tar.gz",
- archive_file_name="meson-{version}.tar.gz",
+ archive_filename="meson-{version}.tar.gz",
  hash="1caa0ef6082e311bdca9836e7907f548b8c3f041a42ed41f0ff916b83ac7dddd",
  dir_part="meson-{version}",
  exe_name="meson.py",
@@ -163,7 +163,7 @@ def __init__(self):
  "ninja",
  version="1.11.1",
  archive_url="https://github.com/ninja-build/ninja/releases/download/v{version}/ninja-win.zip",
- archive_file_name="ninja-win-{version}.zip",
+ archive_filename="ninja-win-{version}.zip",
  hash="524b344a1a9a55005eaf868d991e090ab8ce07fa109f1820d40e74642e289abc",
  dir_part="ninja-{version}",
  exe_name="ninja.exe",

gvsbuild/utils/base_project.py

@@ -93,7 +93,7 @@ def __init__(self, name, **kwargs):
  self.dependencies = []
  self.patches = []
  self.archive_url = None
- self.archive_file_name = None
+ self.archive_filename = None
  self.tarbomb = False
  self.type = None
  self.version = None
@@ -107,7 +107,7 @@ def __init__(self, name, **kwargs):
  self.extra_env = {}
  self.tag = None
  self.repo_url = None
- self.archive_file_name = None
+ self.archive_filename = None
 
  for k in kwargs:
  setattr(self, k, kwargs[k])
@@ -130,8 +130,8 @@ def __init__(self, name, **kwargs):
 
  if self.archive_url:
  self.archive_url = self.archive_url.format(**version_params)
- if self.archive_file_name:
- self.archive_file_name = self.archive_file_name.format(**version_params)
+ if self.archive_filename:
+ self.archive_filename = self.archive_filename.format(**version_params)
 
  # register version params for use from derived classes
  self.version_params = version_params

gvsbuild/utils/builder.py

@@ -448,8 +448,8 @@ def __check_vs(self, opts):
  def preprocess(self):
  for proj in Project.list_projects():
  if proj.archive_url:
- if proj.archive_file_name:
- archive = proj.archive_file_name
+ if proj.archive_filename:
+ archive = proj.archive_filename
  else:
  url = proj.archive_url
  archive = url[url.rfind("/") + 1 :]