From 0874d1c39dedf51439d25194e14b2a54d8b23638 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Fri, 2 Jan 2026 14:43:17 -0700 Subject: [PATCH 1/6] externpro 25.07 https://github.com/externpro/externpro/releases/tag/25.07 --- .devcontainer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer b/.devcontainer index cce8c7c..ad67bce 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit cce8c7c390158d4bb1f33449ec1afd04bd20a073 +Subproject commit ad67bce5fb63e89f6f8c0fbffda1c1baccaaca26 From d0ad49e813700df05adddfc6e3e1a1cff595da7a Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Fri, 2 Jan 2026 14:45:37 -0700 Subject: [PATCH 2/6] CMakePresetsBase: remove XP_INSTALL_CMAKEDIR from cacheVariables now part of xpExternPackage() cmake function --- CMakePresetsBase.json | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakePresetsBase.json b/CMakePresetsBase.json index 5aa0fca..565061f 100644 --- a/CMakePresetsBase.json +++ b/CMakePresetsBase.json @@ -6,7 +6,6 @@ "hidden": true, "binaryDir": "${sourceDir}/_bld-${presetName}", "cacheVariables": { - "XP_INSTALL_CMAKEDIR": "share/cmake", "XP_NAMESPACE": "xpro" } } From b0a5db75dd2c465177aef786cb91666846b533d6 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Fri, 2 Jan 2026 14:46:10 -0700 Subject: [PATCH 3/6] CMakePresetsBase: add buildPresets for externpro compatibility --- CMakePresetsBase.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMakePresetsBase.json b/CMakePresetsBase.json index 565061f..4489d79 100644 --- a/CMakePresetsBase.json +++ b/CMakePresetsBase.json @@ -9,5 +9,11 @@ "XP_NAMESPACE": "xpro" } } + ], + "buildPresets": [ + { + "name": "build-base", + "hidden": true + } ] } From 3fdf5ffa031283cb98327a1f37d342cb1e8928d5 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Fri, 2 Jan 2026 14:47:28 -0700 Subject: [PATCH 4/6] workflows: externpro @25.07 cp .devcontainer/.github/wf-templates/xp*.yml .github/workflows --- .github/workflows/xpbuild.yml | 26 ++++++++++---------------- .github/workflows/xprelease.yml | 3 +-- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/.github/workflows/xpbuild.yml b/.github/workflows/xpbuild.yml index 151d481..7be8f1e 100644 --- a/.github/workflows/xpbuild.yml +++ b/.github/workflows/xpbuild.yml @@ -1,4 +1,7 @@ name: Build +permissions: + contents: read + pull-requests: write on: push: branches: [ "dev" ] @@ -7,24 +10,15 @@ on: workflow_dispatch: jobs: linux: - uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.1 - with: - cmake-workflow-preset: Linux - runon: ubuntu-latest - secrets: inherit - linux-arm64: - uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.1 - with: - cmake-workflow-preset: Linux - runon: ubuntu-24.04-arm + permissions: + contents: read + pull-requests: write + packages: write + uses: externpro/externpro/.github/workflows/build-linux.yml@25.07 secrets: inherit macos: - uses: externpro/externpro/.github/workflows/build-macos.yml@25.05.1 - with: - cmake-workflow-preset: Darwin + uses: externpro/externpro/.github/workflows/build-macos.yml@25.07 secrets: inherit windows: - uses: externpro/externpro/.github/workflows/build-windows.yml@25.05.1 - with: - cmake-workflow-preset: Windows + uses: externpro/externpro/.github/workflows/build-windows.yml@25.07 secrets: inherit diff --git a/.github/workflows/xprelease.yml b/.github/workflows/xprelease.yml index f868a82..e7fbd63 100644 --- a/.github/workflows/xprelease.yml +++ b/.github/workflows/xprelease.yml @@ -9,10 +9,9 @@ on: jobs: # Upload build artifacts as release assets release-from-build: - uses: externpro/externpro/.github/workflows/release-from-build.yml@25.05.1 + uses: externpro/externpro/.github/workflows/release-from-build.yml@25.07 with: workflow_run_url: ${{ github.event.inputs.workflow_run_url }} - artifact_pattern: "*.tar.xz" permissions: contents: write id-token: write From 06bc79449efd9f8adfe6de0587e5877c8570c4ab Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Fri, 2 Jan 2026 15:07:19 -0700 Subject: [PATCH 5/6] cmake: xproinc (externpro dependency provider) enhancements project() VERSION set to 1.0.8 to match BASE upstream tag --- CMakeLists.txt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 304bf43..0b5aae8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,6 @@ cmake_minimum_required(VERSION 3.31) -set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/.devcontainer/cmake) -set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES xproinc) -project(bzip2 VERSION 1.0.8.2 LANGUAGES C) -include(flags) -include(GNUInstallDirs) +set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES .devcontainer/cmake/xproinc.cmake) +project(bzip2 VERSION 1.0.8 LANGUAGES C) set(lib_name bz2) ######################################## add_definitions(-D_FILE_OFFEST_BITS=64) From faaddb9b9a59d58c7c1f3e2c283f091de9d5ce9f Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Fri, 2 Jan 2026 15:09:24 -0700 Subject: [PATCH 6/6] cmake: xpExternPackage() replaces xpPackageDevel() --- CMakeLists.txt | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b5aae8..e3a767c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,13 +40,6 @@ add_test(NAME bzip2_check ) ######################################## set(targetsFile ${PROJECT_NAME}-targets) -set(exe bzip2) -set(lib ${lib_name}) -if(DEFINED XP_NAMESPACE) - string(PREPEND exe "${XP_NAMESPACE}::") - string(PREPEND lib "${XP_NAMESPACE}::") -endif() -xpPackageDevel(TARGETS_FILE ${targetsFile} LIBRARIES ${lib} EXE ${exe}) install(TARGETS ${lib_name} EXPORT ${targetsFile} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} @@ -62,9 +55,18 @@ install(PROGRAMS $ DESTINATION ${CMAKE_INSTALL_BINDIR} CONFIG install(PROGRAMS $ DESTINATION ${CMAKE_INSTALL_BINDIR} CONFIGURATIONS Release RENAME bzcat${CMAKE_EXECUTABLE_SUFFIX}) install(FILES bzlib.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}) if(DEFINED XP_NAMESPACE) - set(nameSpace NAMESPACE ${XP_NAMESPACE}::) -endif() -if(NOT DEFINED XP_INSTALL_CMAKEDIR) - set(XP_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake) + string(JOIN "\n" ALIASES + "if(NOT TARGET BZip2::BZip2)" + " add_library(BZip2::BZip2 ALIAS ${XP_NAMESPACE}::${lib_name})" + "endif()" + "" + ) + xpExternPackage(NAMESPACE ${XP_NAMESPACE} + TARGETS_FILE ${targetsFile} LIBRARIES ${lib_name} EXE bzip2 + BASE ${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION} XPDIFF "intro" + WEB "https://sourceware.org/bzip2/" UPSTREAM "github.com/opencor/bzip2" + DESC "lossless block-sorting data compression library" + LICENSE "[bzip2-1.0.6](https://spdx.org/licenses/bzip2-1.0.6.html 'BSD-like, modified zlib license')" + ) + install(EXPORT ${targetsFile} DESTINATION ${XP_INSTALL_CMAKEDIR} NAMESPACE ${XP_NAMESPACE}::) endif() -install(EXPORT ${targetsFile} DESTINATION ${XP_INSTALL_CMAKEDIR} ${nameSpace})