From 3009a2a8f13a1faf7beb8a739d8bf0947caab463 Mon Sep 17 00:00:00 2001 From: "Markus Kitsinger (SwooshyCueb)" Date: Tue, 8 Apr 2025 19:11:42 -0500 Subject: [PATCH 1/3] [irods/irods#8330] Migrate build hook to system CMake --- ...rtium_continuous_integration_build_hook.py | 33 ++----------------- 1 file changed, 2 insertions(+), 31 deletions(-) diff --git a/irods_consortium_continuous_integration_build_hook.py b/irods_consortium_continuous_integration_build_hook.py index ec57a47..b58c723 100644 --- a/irods_consortium_continuous_integration_build_hook.py +++ b/irods_consortium_continuous_integration_build_hook.py @@ -11,38 +11,11 @@ import irods_python_ci_utilities - -def add_cmake_to_front_of_path(): - cmake_path = '/opt/irods-externals/cmake3.21.4-0/bin' - os.environ['PATH'] = os.pathsep.join([cmake_path, os.environ['PATH']]) - -def is_system_cmake_newer_than_externals_cmake(): - cmake_exe = shutil.which('cmake') - if cmake_exe is None: - return False - - try: - cmake_ver_out = subprocess.check_output(['cmake', '--version']).decode('utf-8') - cmake_ver_line = cmake_ver_out.splitlines()[0] - cmake_ver_str = cmake_ver_line.split()[2] - - from packaging import version - cmake_sys_ver = version.parse(cmake_ver_str) - cmake_ext_ver = version.parse('3.21.4') - return cmake_sys_ver > cmake_ext_ver - - except: - return False - def install_building_dependencies(externals_directory): - use_system_cmake = is_system_cmake_newer_than_externals_cmake() - externals_list = ['irods-externals-boost1.81.0-2', 'irods-externals-clang16.0.6-0', 'irods-externals-json3.10.4-0'] - if not use_system_cmake: - externals_list.append('irods-externals-cmake3.21.4-0') if externals_directory == 'None' or externals_directory is None: irods_python_ci_utilities.install_irods_core_dev_repository() irods_python_ci_utilities.install_os_packages(externals_list) @@ -53,15 +26,13 @@ def install_building_dependencies(externals_directory): for irods_externals in externals_list: externals.append(glob.glob(os.path.join(os_specific_directory, irods_externals + '*.{0}'.format(package_suffix)))[0]) irods_python_ci_utilities.install_os_packages_from_files(externals) - if not use_system_cmake: - add_cmake_to_front_of_path() install_os_specific_dependencies() def install_os_specific_dependencies_apt(): - irods_python_ci_utilities.install_os_packages(['make', 'python3-dev', 'libssl-dev', 'gcc']) + irods_python_ci_utilities.install_os_packages(['cmake', 'make', 'python3-dev', 'libssl-dev', 'gcc']) def install_os_specific_dependencies_yum(): - irods_python_ci_utilities.install_os_packages(['make', 'gcc', 'python3-devel', 'openssl-devel']) + irods_python_ci_utilities.install_os_packages(['cmake', 'make', 'gcc', 'python3-devel', 'openssl-devel']) def install_os_specific_dependencies(): dispatch_map = { From e2b17306bb7e6bdeab10865ead5b4bb034e35bbc Mon Sep 17 00:00:00 2001 From: "Markus Kitsinger (SwooshyCueb)" Date: Tue, 22 Apr 2025 14:30:06 -0500 Subject: [PATCH 2/3] [irods/irods#7726] Migrate build hook to system nlohmann-json --- irods_consortium_continuous_integration_build_hook.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/irods_consortium_continuous_integration_build_hook.py b/irods_consortium_continuous_integration_build_hook.py index b58c723..03ca013 100644 --- a/irods_consortium_continuous_integration_build_hook.py +++ b/irods_consortium_continuous_integration_build_hook.py @@ -14,8 +14,7 @@ def install_building_dependencies(externals_directory): externals_list = ['irods-externals-boost1.81.0-2', - 'irods-externals-clang16.0.6-0', - 'irods-externals-json3.10.4-0'] + 'irods-externals-clang16.0.6-0'] if externals_directory == 'None' or externals_directory is None: irods_python_ci_utilities.install_irods_core_dev_repository() irods_python_ci_utilities.install_os_packages(externals_list) From 44928bd08dc39978572171ba31e43dd17e1b85f1 Mon Sep 17 00:00:00 2001 From: "Markus Kitsinger (SwooshyCueb)" Date: Tue, 22 Apr 2025 14:30:48 -0500 Subject: [PATCH 3/3] [irods/irods#8332] Migrate to system-provided fmt --- CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fc2cbc6..8717d5e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,8 +48,7 @@ endif() find_package(OpenSSL REQUIRED COMPONENTS Crypto SSL) find_package(nlohmann_json "3.6.1" REQUIRED) -find_package(fmt "8.1.1" - HINTS "${IRODS_EXTERNALS_FULLPATH_FMT}") +find_package(fmt "8.1.1") find_package(Python 3 REQUIRED COMPONENTS Development) set(