From 78b50c3b055def271def63c8007c7b2d6d79b201 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Wed, 7 Jan 2026 11:27:55 -0700 Subject: [PATCH 1/3] externpro 25.07.1-7-g8f80b21 --- .devcontainer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer b/.devcontainer index 0b861805..8f80b21a 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit 0b861805c25585a935cc18533afb925f0b93f7da +Subproject commit 8f80b21ac3f2bec48356b232068e35aaba64fc06 From 2349e01211f90537f7dd7b5190df9737e62d9c72 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Wed, 7 Jan 2026 11:29:15 -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 169ff526..82c4b83a 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 14619146..dbac778e 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 51ba3508e3ce9e5c0a2a6c9ee2afcd643780091b Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Wed, 7 Jan 2026 11:46:23 -0700 Subject: [PATCH 3/3] cmake: xproinc enhancements and xpExternPackage() --- CMakeLists.txt | 18 ++++++++---------- src/CMakeLists.txt | 3 +++ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 320e9d94..192780cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,18 +1,16 @@ cmake_minimum_required(VERSION 3.31) set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES .devcontainer/cmake/xproinc.cmake) project(libstrophe) -include(GNUInstallDirs) -include(xpflags) -set(lib ${PROJECT_NAME}) +set(targetsFile ${PROJECT_NAME}-targets) 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) + xpExternPackage(NAMESPACE ${XP_NAMESPACE} + TARGETS_FILE ${targetsFile} LIBRARIES ${PROJECT_NAME} + BASE 0.9.1 XPDIFF "intro" DEPS libexpat openssl + WEB "http://strophe.im/libstrophe/" UPSTREAM "github.com/strophe/libstrophe" + DESC "A simple, lightweight C library for writing XMPP client" + LICENSE "[MIT or GPL-3.0](https://github.com/strophe/libstrophe/blob/0.9.1/LICENSE.txt 'dual licensed under MIT and GPLv3 licenses')" + ) endif() -set(targetsFile ${PROJECT_NAME}-targets) -xpPackageDevel(TARGETS_FILE ${targetsFile} DEPS libexpat openssl LIBRARIES ${lib}) enable_testing() set_property(GLOBAL PROPERTY USE_FOLDERS ON) # enables MSVC Solution Folders ######################################## diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 75208a1a..d9f92cfb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -56,4 +56,7 @@ install(TARGETS ${lib_name} EXPORT ${targetsFile} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) +if(DEFINED XP_NAMESPACE) + set(nameSpace NAMESPACE ${XP_NAMESPACE}::) +endif() install(EXPORT ${targetsFile} DESTINATION ${XP_INSTALL_CMAKEDIR} ${nameSpace})