From ff446cd48dcdaf631f85f3dafc2420ab261bc6d4 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Tue, 6 Jan 2026 18:20:36 -0700 Subject: [PATCH 1/3] externpro 25.07.1-1-gf4644bd --- .devcontainer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer b/.devcontainer index e72d85a627..f4644bd18b 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit e72d85a62700eb26748d896466fa2dfa715affc6 +Subproject commit f4644bd18bda1e9ec4769e8b5cbe634c33284954 From 368452d357cc6ac3457ec5e1fb6f6becc4c4dbd4 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Tue, 6 Jan 2026 18:21:25 -0700 Subject: [PATCH 2/3] workflows: externpro @25.07.1 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 169ff5269c..82c4b83af4 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.06 - with: - cmake-workflow-preset: Linux - runon: ubuntu-latest - secrets: inherit - linux-arm64: - uses: externpro/externpro/.github/workflows/build-linux.yml@25.06 - 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.1 secrets: inherit macos: - uses: externpro/externpro/.github/workflows/build-macos.yml@25.06 - with: - cmake-workflow-preset: Darwin + uses: externpro/externpro/.github/workflows/build-macos.yml@25.07.1 secrets: inherit windows: - uses: externpro/externpro/.github/workflows/build-windows.yml@25.06 - with: - cmake-workflow-preset: Windows + uses: externpro/externpro/.github/workflows/build-windows.yml@25.07.1 secrets: inherit diff --git a/.github/workflows/xprelease.yml b/.github/workflows/xprelease.yml index 146191466e..dbac778ee4 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.06 + uses: externpro/externpro/.github/workflows/release-from-build.yml@25.07.1 with: workflow_run_url: ${{ github.event.inputs.workflow_run_url }} - artifact_pattern: "*.tar.xz" permissions: contents: write id-token: write From 5def42b2de29b972785dd0c8200e8d22b2d5b3d0 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Tue, 6 Jan 2026 18:37:16 -0700 Subject: [PATCH 3/3] cmake: xpExternPackage() replaces xpPackageDevel(), add ALIAS --- CMakeLists.txt | 24 +++++++++++++----------- expat/CMakeLists.txt | 3 +++ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e3eb8fce6..9138d7e882 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,16 +1,18 @@ cmake_minimum_required(VERSION 3.31) set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES .devcontainer/cmake/xproinc.cmake) project(libexpat) -include(GNUInstallDirs) -include(xpflags) -set(lib expat) -if(DEFINED XP_NAMESPACE) - set(nameSpace NAMESPACE ${XP_NAMESPACE}::) - string(PREPEND lib "${XP_NAMESPACE}::") -endif() -if(NOT DEFINED XP_INSTALL_CMAKEDIR) - set(XP_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake) -endif() +string(JOIN "\n" ALIASES + "if(NOT TARGET EXPAT::EXPAT)" + " add_library(EXPAT::EXPAT ALIAS ${XP_NAMESPACE}::expat)" + "endif()" + "" + ) set(targetsFile ${PROJECT_NAME}-targets) -xpPackageDevel(TARGETS_FILE ${targetsFile} LIBRARIES ${lib}) +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) diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt index 61da275715..e6a0a7bfc9 100644 --- a/expat/CMakeLists.txt +++ b/expat/CMakeLists.txt @@ -140,6 +140,9 @@ 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 ${XP_INSTALL_CMAKEDIR} ${nameSpace}) set(prefix ${CMAKE_INSTALL_PREFIX})