From 73d1a56a675765013e4033c32fbf069f0500ec49 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Wed, 19 Aug 2026 13:20:01 -0600 Subject: [PATCH 1/5] cmakeup: CMake updates, remove XP_NAMESPACE - Update minimum CMake version from 3.31 to 4.3 - Remove XP_NAMESPACE and xproinc.cmake inclusion (now part of CMakePresets) - Package name and Target Namespace now match - Make xpExternPackage conditional 'if(COMMAND' and move to end of CMakeLists.txt - Add CMAKE_EXPERIMENTAL_GENERATE_SBOM in presets --- CMakeLists.txt | 22 ++++++++++++---------- CMakePresetsBase.json | 2 +- expat/CMakeLists.txt | 4 ---- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9138d7e882..1e06340f21 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,18 +1,20 @@ -cmake_minimum_required(VERSION 3.31) -set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES .devcontainer/cmake/xproinc.cmake) +cmake_minimum_required(VERSION 4.3) project(libexpat) string(JOIN "\n" ALIASES "if(NOT TARGET EXPAT::EXPAT)" - " add_library(EXPAT::EXPAT ALIAS ${XP_NAMESPACE}::expat)" + " add_library(EXPAT::EXPAT ALIAS ${CMAKE_PROJECT_NAME}::expat)" "endif()" "" ) set(targetsFile ${PROJECT_NAME}-targets) -xpExternPackage(NAMESPACE ${XP_NAMESPACE} - TARGETS_FILE ${targetsFile} LIBRARIES expat - BASE R_2_2_5 XPDIFF "patch" - WEB "https://libexpat.github.io" UPSTREAM "github.com/libexpat/libexpat" - DESC "a stream-oriented XML parser library written in C" - LICENSE "[MIT](https://github.com/libexpat/libexpat/blob/R_2_2_5/expat/COPYING 'MIT License')" - ) add_subdirectory(expat) +if(COMMAND xpExternPackage) + xpExternPackage(TARGETS_FILE ${targetsFile} + LIBRARIES expat DEFAULT_TARGETS expat + BASE R_2_2_5 XPDIFF "patch" + WEB "https://libexpat.github.io" UPSTREAM "github.com/libexpat/libexpat" + DESC "a stream-oriented XML parser library written in C" + LICENSE "[MIT](https://github.com/libexpat/libexpat/blob/R_2_2_5/expat/COPYING 'MIT License')" + ) + expat_install(EXPORT ${targetsFile} DESTINATION ${CMAKE_INSTALL_CMAKEDIR} NAMESPACE ${CMAKE_PROJECT_NAME}::) +endif() diff --git a/CMakePresetsBase.json b/CMakePresetsBase.json index acc5c660ac..5154ef03e6 100644 --- a/CMakePresetsBase.json +++ b/CMakePresetsBase.json @@ -9,7 +9,7 @@ "BUILD_doc": "OFF", "BUILD_shared": "OFF", "XP_OPT_INSTALL": "OFF", - "XP_NAMESPACE": "xpro" + "CMAKE_EXPERIMENTAL_GENERATE_SBOM": "ca494ed3-b261-4205-a01f-603c95e4cae0" } } ], diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt index d5477925c9..94b2f9247f 100644 --- a/expat/CMakeLists.txt +++ b/expat/CMakeLists.txt @@ -140,10 +140,6 @@ endmacro() expat_install(TARGETS expat EXPORT ${targetsFile} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -if(DEFINED XP_NAMESPACE) - set(nameSpace NAMESPACE ${XP_NAMESPACE}::) -endif() -expat_install(EXPORT ${targetsFile} DESTINATION ${CMAKE_INSTALL_CMAKEDIR} ${nameSpace}) set(prefix ${CMAKE_INSTALL_PREFIX}) set(exec_prefix "\${prefix}/bin") From 3c21a7138bf782717dce7d1b7537745728fdd76f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 19 Aug 2026 19:22:47 +0000 Subject: [PATCH 2/5] externpro 26.01.5-8-g8617efa --- .devcontainer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer b/.devcontainer index 3f2918a3ce..8617efadf5 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit 3f2918a3ce56776c77f8a27db92381599f18ae59 +Subproject commit 8617efadf546a9add2fc4ae17a6781bff7b48df5 From 63fe5308db8489f60447332b560a8a42f4ae30d1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 19 Aug 2026 19:22:47 +0000 Subject: [PATCH 3/5] sync GitHub Actions workflows --- .github/workflows/xpbuild.yml | 12 ++++++++---- .github/workflows/xprelease.yml | 2 +- .github/workflows/xptag.yml | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/xpbuild.yml b/.github/workflows/xpbuild.yml index 76b2701dea..25962792df 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.5 + 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.5 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.5 secrets: inherit + with: {} diff --git a/.github/workflows/xprelease.yml b/.github/workflows/xprelease.yml index a2eb28224c..5181b8f718 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.5 with: workflow_run_url: ${{ github.event.inputs.workflow_run_url }} permissions: diff --git a/.github/workflows/xptag.yml b/.github/workflows/xptag.yml index b5ce9503a2..1f6b0193f2 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.5 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 }} From 6564fdac4acabeeb4c83b80d8d26337244ace1e2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 19 Aug 2026 19:22:47 +0000 Subject: [PATCH 4/5] update .github/release-tag.json --- .github/release-tag.json | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .github/release-tag.json diff --git a/.github/release-tag.json b/.github/release-tag.json new file mode 100644 index 0000000000..7210a90cf9 --- /dev/null +++ b/.github/release-tag.json @@ -0,0 +1,4 @@ +{ + "message": "xpro version 2.2.5.4 tag", + "tag": "xpv2.2.5.4" +} From a84212b5ea595c6e924cc399dd312d34d293041a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 19 Aug 2026 19:22:47 +0000 Subject: [PATCH 5/5] externpro 26.01.5-8-g8617efa updates --- .github/release-tag.yml | 2 -- CMakePresets.json | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 .github/release-tag.yml diff --git a/.github/release-tag.yml b/.github/release-tag.yml deleted file mode 100644 index d03ce04b71..0000000000 --- a/.github/release-tag.yml +++ /dev/null @@ -1,2 +0,0 @@ -tag: xpv2.2.5.3 -message: "xpro version 2.2.5.3 tag" diff --git a/CMakePresets.json b/CMakePresets.json index f82cfdd2cf..28efa3978f 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" ] }