diff --git a/.gitignore b/.gitignore index 317e6dc..c6456fa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ build.log .idea/ *.pyc +.venv/ diff --git a/build_functions/build_openssl.py b/build_functions/build_openssl.py index fbc3069..72186cf 100644 --- a/build_functions/build_openssl.py +++ b/build_functions/build_openssl.py @@ -5,14 +5,7 @@ import os import zipfile from pathlib import Path - -# we need requests to download perl package but I don't want to install a venv just for that -# with this trick we can use requests that comes bundled with pip -try: - import requests -except ImportError: - import pip._vendor.requests as requests - +import requests from build_functions.build_utils import run_in_shell, print_banner, file_and_console_log from common.azure import write_package_version_batch from common.directory_helpers import pushd, get_local_prefix diff --git a/build_functions/build_openusd.py b/build_functions/build_openusd.py index c29a750..37105be 100644 --- a/build_functions/build_openusd.py +++ b/build_functions/build_openusd.py @@ -9,6 +9,7 @@ from common.azure import write_package_version_batch from common.cmake import cmake_build_install import common.settings from common.git_helpers import clone_git_tag +from common.settings import temporarily_set_shared from package.package_info import get_package_info def build_openusd(prefix: Path | str, sbom: dict): @@ -18,29 +19,36 @@ def build_openusd(prefix: Path | str, sbom: dict): package_info = get_package_info("openusd") package_info.add_to_sbom(sbom) + # I mistook boost for a direct dependency but it turned out to be an indirect one. + # Various other, optional, dependencies such as OpenImageIO use it. + # We don't have them in here yet but I keep boost to prepare for that + boost_install_path = package_info.dependency_path("boost") + hdf5_install_path = package_info.dependency_path("hdf5") onetbb_install_path = package_info.dependency_path("onetbb") opensubdiv_install_path = package_info.dependency_path("opensubdiv") zlib_install_path = package_info.dependency_path("zlib") + # OpenUSD definately doesn't want to be build static. Only errors. DLL it is then. + with temporarily_set_shared(): + cmake_args = [ + ("PXR_ENABLE_PYTHON_SUPPORT:BOOL", "ON"), + ("PXR_ENABLE_HDF5_SUPPORT:BOOL", "ON"), + ("PXR_BUILD_EXAMPLES:BOOL", "ON"), + ("PXR_BUILD_TESTS:BOOL", "OFF"), + ("PXR_BUILD_TUTORIALS:BOOL", "ON"), + ("PXR_BUILD_HTML_DOCUMENTATION:BOOL", "OFF"), - cmake_args = [ - # We're gonna need Python but I had trouble compiling the bindings. - # Disabled for the first tests - ("PXR_ENABLE_PYTHON_SUPPORT:BOOL", "OFF"), - - ("PXR_BUILD_EXAMPLES:BOOL", "OFF"), - ("PXR_BUILD_TESTS:BOOL", "OFF"), - ("PXR_BUILD_TUTORIALS:BOOL", "ON"), - - ("PXR_BUILD_HTML_DOCUMENTATION:BOOL", "OFF"), - ("TBB_DIR:PATH", str(onetbb_install_path / "lib" / "cmake" / "TBB")), - ("OpenSubdiv_DIR:PATH", str(opensubdiv_install_path / "lib" / "cmake" / "OpenSubdiv")), - ("ZLIB_ROOT:PATH", str(zlib_install_path)), - ("ZLIB_USE_STATIC_LIBS:BOOL", "ON"), # doesn't appear to do its job - ("ZLIB_LIBRARY_RELEASE:FILEPATH", str(zlib_install_path / "lib" / common.settings.zlib_static_lib_name)), - ("ZLIB_LIBRARY_DEBUG:FILEPATH", str(zlib_install_path / "lib" / common.settings.zlib_static_lib_name)) - ] - src_dir = clone_git_tag(package_info, recursive=False) - install_dir = cmake_build_install(src_dir, package_info, cmake_args=cmake_args) - write_package_version_batch(package_info.version) - return install_dir + ("hdf5_DIR:PATH", str(hdf5_install_path / "cmake")), + ("Boost_ROOT:PATH", str(boost_install_path)), + ("Boost_DIR:PATH", str(boost_install_path / "lib" / "cmake" / "Boost-1.88.0")), + ("TBB_DIR:PATH", str(onetbb_install_path / "lib" / "cmake" / "TBB")), + ("OpenSubdiv_DIR:PATH", str(opensubdiv_install_path / "lib" / "cmake" / "OpenSubdiv")), + ("ZLIB_ROOT:PATH", str(zlib_install_path)), + ("ZLIB_USE_STATIC_LIBS:BOOL", "ON"), # doesn't appear to do its job + ("ZLIB_LIBRARY_RELEASE:FILEPATH", str(zlib_install_path / "lib" / common.settings.zlib_static_lib_name)), + ("ZLIB_LIBRARY_DEBUG:FILEPATH", str(zlib_install_path / "lib" / common.settings.zlib_static_lib_name)) + ] + src_dir = clone_git_tag(package_info, recursive=False) + install_dir = cmake_build_install(src_dir, package_info, cmake_args=cmake_args) + write_package_version_batch(package_info.version) + return install_dir diff --git a/packages.json b/packages.json index 922cefc..7efe395 100644 --- a/packages.json +++ b/packages.json @@ -201,6 +201,7 @@ "version": "25.5.1", "depends": [ "boost", + "hdf5", "onetbb", "opensubdiv", "zlib" diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..315c319 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,4 @@ +pyside6 +jinja2 +pyopengl +requests