Add more check to correctly get all dependency package on build
This commit is contained in:
1 parent
ca28349a07
commit
e2be326250
2 files changed
+26
-6
No files matched your search
+10
-6
@@ -4,6 +4,7 @@ import tempfile
|
|||||||
import importlib.util
|
import importlib.util
|
||||||
|
|
||||||
from blender.version import BlenderVersion
|
from blender.version import BlenderVersion
|
||||||
|
from blender.misc import get_linux_deps_file
|
||||||
|
|
||||||
# "Wayland Protocols" has no "Library" in its name but is still a
|
# "Wayland Protocols" has no "Library" in its name but is still a
|
||||||
# build-critical dependency, so it's matched by name too.
|
# build-critical dependency, so it's matched by name too.
|
||||||
@@ -13,7 +14,7 @@ _EXTRA_PACKAGE_NAMES = {'wayland protocols'}
|
|||||||
class BlenderDependency:
|
class BlenderDependency:
|
||||||
def __init__(self, blender: BlenderVersion):
|
def __init__(self, blender: BlenderVersion):
|
||||||
self._blender_version = blender
|
self._blender_version = blender
|
||||||
self._url = rf'https://projects.blender.org/api/v1/repos/blender/blender/raw/build_files/build_environment/install_linux_packages.py?ref=v{self._blender_version.tag_name()}'
|
self._url = get_linux_deps_file(self._blender_version.tag_name())
|
||||||
self.module = self._get_source_file()
|
self.module = self._get_source_file()
|
||||||
|
|
||||||
self.packages = list()
|
self.packages = list()
|
||||||
@@ -54,11 +55,14 @@ class BlenderDependency:
|
|||||||
|
|
||||||
def _get_complete_list(self):
|
def _get_complete_list(self):
|
||||||
"""All packages required to build Blender (PACKAGES_BASICS_BUILD) as Debian/Ubuntu apt names."""
|
"""All packages required to build Blender (PACKAGES_BASICS_BUILD) as Debian/Ubuntu apt names."""
|
||||||
if hasattr(self.module, 'PACKAGES_BASICS_BUILD'):
|
packages = 'PACKAGES_BASICS_BUILD'
|
||||||
for package in self._flatten(self.module.PACKAGES_BASICS_BUILD):
|
if hasattr(self.module, 'PACKAGES_BUILD'):
|
||||||
name = package.distro_package_names.get(self.module.DISTRO_ID_DEBIAN)
|
packages = 'PACKAGES_BUILD'
|
||||||
if isinstance(name, str):
|
|
||||||
self.packages_complete.append(name)
|
for package in self._flatten(getattr(self.module, packages)):
|
||||||
|
name = package.distro_package_names.get(self.module.DISTRO_ID_DEBIAN)
|
||||||
|
if isinstance(name, str):
|
||||||
|
self.packages_complete.append(name)
|
||||||
|
|
||||||
def _flatten(self, packages):
|
def _flatten(self, packages):
|
||||||
"""Yield every leaf Package, descending into is_group sub_packages."""
|
"""Yield every leaf Package, descending into is_group sub_packages."""
|
||||||
|
|||||||
@@ -92,6 +92,22 @@ def get_all_tags_from_docker():
|
|||||||
print(release)
|
print(release)
|
||||||
|
|
||||||
|
|
||||||
|
def get_linux_deps_file(tag_name: str) -> str | None:
|
||||||
|
"""Find the `install_linux_packages.py` about the blender version tested."""
|
||||||
|
base = r'https://projects.blender.org/api/v1/repos/blender/blender/raw'
|
||||||
|
links = [
|
||||||
|
rf'{base}/build_files/build_environment/install_linux_packages.py?ref=v{tag_name}',
|
||||||
|
rf'{base}/build_files/linux/install_linux_packages.py?ref=v{tag_name}'
|
||||||
|
]
|
||||||
|
|
||||||
|
for url in links:
|
||||||
|
r = requests.get(url)
|
||||||
|
if r.status_code == 200:
|
||||||
|
return url
|
||||||
|
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
print('Clean docker')
|
print('Clean docker')
|
||||||
clean_all_dockers()
|
clean_all_dockers()
|
||||||
|
|||||||
Reference in new issue
Block a user