diff --git a/.devcontainer b/.devcontainer index 8a5e4df7220..37c6f250416 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit 8a5e4df7220b4870ba0ff81ee9e2b319b2855977 +Subproject commit 37c6f25041606bc49737abe4228d316daccd386e diff --git a/.github/release-tag.json b/.github/release-tag.json new file mode 100644 index 00000000000..491c8e8e2df --- /dev/null +++ b/.github/release-tag.json @@ -0,0 +1,4 @@ +{ + "message": "xpro version 1.14.6.8 tag", + "tag": "xpv1.14.6.8" +} diff --git a/.github/release-tag.yml b/.github/release-tag.yml deleted file mode 100644 index 9fe27f53820..00000000000 --- a/.github/release-tag.yml +++ /dev/null @@ -1,2 +0,0 @@ -tag: xpv1.14.6.7 -message: "xpro version 1.14.6.7 tag" diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index ec08add4f82..26eb3e98468 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -2,7 +2,7 @@ # https://github.com/codespell-project/codespell # https://github.com/codespell-project/actions-codespell name: codespell -on: [push, pull_request] +on: [workflow_dispatch] permissions: contents: read jobs: diff --git a/.github/workflows/xpbuild.yml b/.github/workflows/xpbuild.yml index 76b2701dea0..846ffc1d654 100644 --- a/.github/workflows/xpbuild.yml +++ b/.github/workflows/xpbuild.yml @@ -14,11 +14,15 @@ jobs: contents: read pull-requests: write packages: write - uses: externpro/externpro/.github/workflows/build-linux.yml@25.07.6 - secrets: inherit + uses: externpro/externpro/.github/workflows/build-linux.yml@26.01.1 + secrets: + automation_token: ${{ secrets.GHCR_TOKEN }} + with: {} macos: - uses: externpro/externpro/.github/workflows/build-macos.yml@25.07.6 + uses: externpro/externpro/.github/workflows/build-macos.yml@26.01.1 secrets: inherit + with: {} windows: - uses: externpro/externpro/.github/workflows/build-windows.yml@25.07.6 + uses: externpro/externpro/.github/workflows/build-windows.yml@26.01.1 secrets: inherit + with: {} diff --git a/.github/workflows/xpinit.yml b/.github/workflows/xpinit.yml new file mode 100644 index 00000000000..4893a2bde4a --- /dev/null +++ b/.github/workflows/xpinit.yml @@ -0,0 +1,12 @@ +name: xpInit externpro +permissions: + contents: write + pull-requests: write + packages: write +on: + workflow_dispatch: +jobs: + init: + uses: externpro/externpro/.github/workflows/init-externpro.yml@main + secrets: + automation_token: ${{ secrets.XPRO_TOKEN }} diff --git a/.github/workflows/xprelease.yml b/.github/workflows/xprelease.yml index a2eb28224ca..ec3022d2a21 100644 --- a/.github/workflows/xprelease.yml +++ b/.github/workflows/xprelease.yml @@ -34,7 +34,7 @@ jobs: # Upload build artifacts as release assets release-from-build: if: github.event_name == 'workflow_dispatch' - uses: externpro/externpro/.github/workflows/release-from-build.yml@25.07.6 + uses: externpro/externpro/.github/workflows/release-from-build.yml@26.01.1 with: workflow_run_url: ${{ github.event.inputs.workflow_run_url }} permissions: diff --git a/.github/workflows/xptag.yml b/.github/workflows/xptag.yml index b5ce9503a2a..29462130eed 100644 --- a/.github/workflows/xptag.yml +++ b/.github/workflows/xptag.yml @@ -8,9 +8,9 @@ on: jobs: tag: if: ${{ github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'xpro' && contains(github.event.pull_request.labels.*.name, 'release:tag') }} - uses: externpro/externpro/.github/workflows/tag-release.yml@25.07.6 + uses: externpro/externpro/.github/workflows/tag-release.yml@26.01.1 with: merge_sha: ${{ github.event.pull_request.merge_commit_sha }} pr_number: ${{ github.event.pull_request.number }} secrets: - workflow_write_token: ${{ secrets.XPUPDATE_TOKEN }} + automation_token: ${{ secrets.XPRO_TOKEN }} diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake index 2f4deff89cb..506a3fa3eb3 100644 --- a/CMakeInstallation.cmake +++ b/CMakeInstallation.cmake @@ -86,6 +86,7 @@ configure_package_config_file ( if (NOT HDF5_EXTERNALLY_CONFIGURED) install ( FILES ${HDF5_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config.cmake + RENAME ${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config-orig.cmake DESTINATION ${HDF5_INSTALL_CMAKE_DIR} COMPONENT configinstall ) diff --git a/CMakeLists.txt b/CMakeLists.txt index 38d982cb91b..ed5b8e76a1a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,4 @@ -cmake_minimum_required (VERSION 3.31) -set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES .devcontainer/cmake/xproinc.cmake) +cmake_minimum_required (VERSION 4.3) project (HDF5 C) if(HDF5_BUILD_CPP_LIB) enable_language(CXX) @@ -1235,13 +1234,13 @@ if (EXISTS "${HDF5_SOURCE_DIR}/HDF5Examples" AND IS_DIRECTORY "${HDF5_SOURCE_DIR endif () endif () -if(DEFINED XP_NAMESPACE AND COMMAND xpExternPackage) +if(COMMAND xpExternPackage) set(hdf5BaseTag hdf5_${H5_VERS_MAJOR}.${H5_VERS_MINOR}.${H5_VERS_RELEASE}) set(hdf5Libs hdf5 hdf5_hl hdf5_cpp hdf5_hl_cpp) list(TRANSFORM hdf5Libs APPEND -static) - xpExternPackage(REPO_NAME hdf5 NAMESPACE ${XP_NAMESPACE} ALIAS_NAMESPACE hdf5 + xpExternPackage(REPO_NAME hdf5 NO_EXPORT TARGETS_FILE hdf5-targets LIBRARIES ${hdf5Libs} - BASE ${hdf5BaseTag} XPDIFF "patch" DEPS zlib + BASE ${hdf5BaseTag} XPDIFF "patch" WEB "https://www.hdfgroup.org/solutions/hdf5/" UPSTREAM "github.com/HDFGroup/hdf5" DESC "Utilize the HDF5 high performance data software library and file format to manage, process, and store your heterogeneous data. HDF5 is built for fast I/O processing and storage." LICENSE "[BSD-3-Clause](https://github.com/HDFGroup/hdf5/blob/develop/LICENSE 'BSD 3-Clause New or Revised License')" diff --git a/CMakePresets.json b/CMakePresets.json index f82cfdd2cf6..28efa3978f8 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -3,6 +3,7 @@ "include": [ ".devcontainer/cmake/presets/xpLinuxNinja.json", ".devcontainer/cmake/presets/xpDarwinNinja.json", - ".devcontainer/cmake/presets/xpWindowsVs2022.json" + ".devcontainer/cmake/presets/xpMswVs2022.json", + ".devcontainer/cmake/presets/xpMswVs2026.json" ] } diff --git a/CMakePresetsBase.json b/CMakePresetsBase.json index 1f9d17ab873..dbfce8be908 100644 --- a/CMakePresetsBase.json +++ b/CMakePresetsBase.json @@ -7,7 +7,7 @@ "binaryDir": "${sourceDir}/_bld-${presetName}", "cacheVariables": { "BUILD_SHARED_LIBS": "OFF", - "HDF_PACKAGE_NAMESPACE": "xpro::", + "HDF_PACKAGE_NAMESPACE": "hdf5::", "HDF5_BUILD_CPP_LIB": "ON", "HDF5_BUILD_HL_LIB": "ON", "HDF5_BUILD_TOOLS": "OFF", @@ -16,8 +16,7 @@ "HDF5_ENABLE_Z_LIB_SUPPORT": "ON", "HDF5_INSTALL_DATA_DIR": "share", "HDF5_INSTALL_INCLUDE_DIR": "include/hdf5", - "HDF5_NO_PACKAGES": "ON", - "XP_NAMESPACE": "xpro" + "HDF5_NO_PACKAGES": "ON" } } ], diff --git a/xprodeps.md b/xprodeps.md index dc8c784208b..77e7260fa01 100644 --- a/xprodeps.md +++ b/xprodeps.md @@ -3,7 +3,7 @@ |project|license [^_l]|description [dependencies]|version|source|diff [^_d]| |-------|-------------|--------------------------|-------|------|----------| |[hdf5](https://www.hdfgroup.org/solutions/hdf5/)|[BSD-3-Clause](https://github.com/HDFGroup/hdf5/blob/develop/LICENSE 'BSD 3-Clause New or Revised License')|Utilize the HDF5 high performance data software library and file format to manage, process, and store your heterogeneous data. HDF5 is built for fast I/O processing and storage. [deps: _zlib_]| |[upstream](https://github.com/HDFGroup/hdf5 'github.com/HDFGroup/hdf5')| [patch]| -|[zlib](https://zlib.net 'zlib website')|[permissive](https://zlib.net/zlib_license.html 'zlib/libpng license, see https://en.wikipedia.org/wiki/Zlib_License')|compression library|[xpv1.3.1.4](https://github.com/externpro/zlib/releases/tag/xpv1.3.1.4 'release')|[repo](https://github.com/externpro/zlib 'github.com/externpro/zlib') [upstream](https://github.com/madler/zlib 'github.com/madler/zlib')|[diff](https://github.com/externpro/zlib/compare/v1.3.1...xpv1.3.1.4 'github.com/externpro/zlib/compare/v1.3.1...xpv1.3.1.4') [patch]| +|[zlib](https://zlib.net/ 'zlib website')|[Zlib](https://zlib.net/zlib_license.html 'zlib/libpng license, see https://en.wikipedia.org/wiki/Zlib_License')|a general-purpose lossless data-compression library|[xpv1.3.2.1](https://github.com/externpro/zlib/releases/tag/xpv1.3.2.1 'release')|[repo](https://github.com/externpro/zlib 'github.com/externpro/zlib') [upstream](https://github.com/madler/zlib 'github.com/madler/zlib')|[diff](https://github.com/externpro/zlib/compare/v1.3.2...xpv1.3.2.1 'github.com/externpro/zlib/compare/v1.3.2...xpv1.3.2.1') [patch]| ![deps](xprodeps.svg 'dependencies')