Pass in various compression tool path prefixes via taskflow variables

Author: Bill-hbrhbr

integration-tests/.pytest.ini

@@ -10,7 +10,10 @@ env =
     D:CLP_BUILD_DIR=../build
     D:CLP_CORE_BINS_DIR=../build/core
     D:CLP_DEPS_CORE_DIR=../build/deps/core
+    D:CLP_LIBLZMA_ROOT=../build/deps/core/LibLZMA-install
+    D:CLP_LZ4_ROOT=../build/deps/core/lz4-install
     D:CLP_PACKAGE_DIR=../build/clp-package
+    D:CLP_ZSTD_ROOT=../build/deps/core/zstd-install
 log_cli = True
 log_cli_date_format = %Y-%m-%d %H:%M:%S,%f
 log_cli_format = %(name)s %(asctime)s [%(levelname)s] %(message)s

integration-tests/tests/fixtures/integration_test_config.py

@@ -20,7 +20,10 @@ def integration_test_config() -> IntegrationTestConfig:
         clp_core_bins_dir=Path(get_env_var("CLP_CORE_BINS_DIR")).expanduser().resolve()
     )
     deps_config = DepsConfig(
-        clp_deps_core_dir=Path(get_env_var("CLP_DEPS_CORE_DIR")).expanduser().resolve()
+        clp_deps_core_dir=Path(get_env_var("CLP_DEPS_CORE_DIR")).expanduser().resolve(),
+        clp_liblzma_root=Path(get_env_var("CLP_LIBLZMA_ROOT")).expanduser().resolve(),
+        clp_lz4_root=Path(get_env_var("CLP_LZ4_ROOT")).expanduser().resolve(),
+        clp_zstd_root=Path(get_env_var("CLP_ZSTD_ROOT")).expanduser().resolve(),
     )
     package_config = PackageConfig(
         clp_package_dir=Path(get_env_var("CLP_PACKAGE_DIR")).expanduser().resolve()

integration-tests/tests/utils/config.py

@@ -49,29 +49,38 @@ def clp_s_binary_path(self) -> Path:
 
 @dataclass(frozen=True)
 class DepsConfig:
-    """The configuration for dependencies used by clp."""
+    """The configuration for dependencies used by CLP package and binaries."""
 
-    #:
+    #: Install directory for all core CLP dependencies.
     clp_deps_core_dir: Path
+    #: Install prefix of LibLZMA used by CLP.
+    clp_liblzma_root: Path
+    #: Install prefix of lz4 used by CLP.
+    clp_lz4_root: Path
+    #: Install prefix of zstd used by CLP.
+    clp_zstd_root: Path
 
     def __post_init__(self) -> None:
-        """Validates that the core dependency directory exists."""
+        """Validates that dependency directories exist."""
         validate_dir_exists_and_is_absolute(self.clp_deps_core_dir)
+        validate_dir_exists_and_is_absolute(self.clp_liblzma_root)
+        validate_dir_exists_and_is_absolute(self.clp_lz4_root)
+        validate_dir_exists_and_is_absolute(self.clp_zstd_root)
 
     @property
     def lz4_binary_path(self) -> Path:
         """:return: The absolute path to the lz4 compression tool."""
-        return self.clp_deps_core_dir / "lz4-install" / "bin" / "lz4"
-
-    @property
-    def zstd_binary_path(self) -> Path:
-        """:return: The absolute path to the zstd compression tool."""
-        return self.clp_deps_core_dir / "zstd-install" / "bin" / "zstd"
+        return self.clp_lz4_root / "bin" / "lz4"
 
     @property
     def xz_binary_path(self) -> Path:
         """:return: The absolute path to the LibLZMA xz compression tool."""
-        return self.clp_deps_core_dir / "LibLZMA-static-install" / "bin" / "xz"
+        return self.clp_liblzma_root / "bin" / "xz"
+
+    @property
+    def zstd_binary_path(self) -> Path:
+        """:return: The absolute path to the zstd compression tool."""
+        return self.clp_zstd_root / "bin" / "zstd"
 
 
 @dataclass(frozen=True)

taskfiles/deps/main.yaml

@@ -21,6 +21,14 @@ vars:
   G_BOOST_LIB_NAME: "Boost"
   G_FMT_LIB_NAME: "fmt"
   G_GSL_LIB_NAME: "Microsoft.GSL"
+  G_LIBLZMA_LIB_NAME: "LibLZMA"
+  G_LZ4_LIB_NAME: "lz4"
+  G_ZSTD_LIB_NAME: "zstd"
+
+  # Library install prefixes
+  G_LZ4_INSTALL_PREFIX: "{{.G_DEPS_CORE_DIR}}/{{.G_LZ4_LIB_NAME}}-install"
+  G_ZSTD_INSTALL_PREFIX: "{{.G_DEPS_CORE_DIR}}/{{.G_ZSTD_LIB_NAME}}-install"
+  G_LIBLZMA_STATIC_INSTALL_PREFIX: "{{.G_DEPS_CORE_DIR}}/{{.G_LIBLZMA_LIB_NAME}}-static-install"
 
   # Antlr
   G_ANTLR_VERSION: "4.13.2"
@@ -296,7 +304,8 @@ tasks:
             - "-DBUILD_SHARED_LIBS={{ if .BUILD_SHARED_LIBS }}ON{{ else }}OFF{{ end }}"
             - >-
               {{ join " " .COMMON_CMAKE_GEN_ARGS }}
-          LIB_NAME: "LibLZMA-{{ if .BUILD_SHARED_LIBS }}shared{{ else }}static{{ end }}"
+          LIB_NAME: >-
+            {{.G_LIBLZMA_LIB_NAME}}-{{ if .BUILD_SHARED_LIBS }}shared{{ else }}static{{ end }}
           TARBALL_SHA256: "{{.TARBALL_SHA256}}"
           TARBALL_URL: "{{.TARBALL_URL}}"
 
@@ -331,7 +340,8 @@ tasks:
             - "-DCMAKE_BUILD_TYPE=Release"
             - "-DCMAKE_INSTALL_MESSAGE=LAZY"
           CMAKE_SOURCE_DIR: "build/cmake"
-          LIB_NAME: "lz4"
+          INSTALL_PREFIX: "{{.G_LZ4_INSTALL_PREFIX}}"
+          LIB_NAME: "{{.G_LZ4_LIB_NAME}}"
           TARBALL_SHA256: "537512904744b35e232912055ccf8ec66d768639ff3abe5788d90d792ec5f48b"
           TARBALL_URL: "https://github.com/lz4/lz4/releases/download/v1.10.0/lz4-1.10.0.tar.gz"
 
@@ -557,6 +567,7 @@ tasks:
             - "-DZSTD_BUILD_STATIC=ON"
             - "-DZSTD_BUILD_TESTS=OFF"
           CMAKE_SOURCE_DIR: "build/cmake"
-          LIB_NAME: "zstd"
+          INSTALL_PREFIX: "{{.G_ZSTD_INSTALL_PREFIX}}"
+          LIB_NAME: "{{.G_ZSTD_LIB_NAME}}"
           TARBALL_SHA256: "eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3"
           TARBALL_URL: "https://github.com/facebook/zstd/releases/download/v1.5.7/zstd-1.5.7.tar.gz"

taskfiles/tests/integration.yaml

@@ -24,5 +24,8 @@ tasks:
       CLP_BUILD_DIR: "{{.G_BUILD_DIR}}"
       CLP_CORE_BINS_DIR: "{{.G_CORE_COMPONENT_BUILD_DIR}}"
       CLP_DEPS_CORE_DIR: "{{.G_DEPS_CORE_DIR}}"
+      CLP_LIBLZMA_ROOT: "{{.G_LIBLZMA_STATIC_INSTALL_PREFIX}}"
+      CLP_LZ4_ROOT: "{{.G_LZ4_INSTALL_PREFIX}}"
       CLP_PACKAGE_DIR: "{{.G_PACKAGE_BUILD_DIR}}"
+      CLP_ZSTD_ROOT: "{{.G_ZSTD_INSTALL_PREFIX}}"
     cmd: "uv run python -m pytest -m core"