From 31b507aa36fce959544a9383050be94a96700492 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Sat, 17 Jan 2026 11:28:46 -0700 Subject: [PATCH 1/4] externpro 25.07.3-21-g76e6508 --- .devcontainer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer b/.devcontainer index 98355cf..76e6508 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit 98355cff463ce53cb561447ffbfe3747d94b88c3 +Subproject commit 76e6508b523ed2db8066af4fb74f9c3c4e3b1fdc From 121792a1c9b71e271ee69b2a72302cd2caba7ded Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Sat, 17 Jan 2026 11:29:24 -0700 Subject: [PATCH 2/4] workflows: externpro@25.07.3 --- .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 169ff52..5811f8d 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.3 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.3 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.3 secrets: inherit diff --git a/.github/workflows/xprelease.yml b/.github/workflows/xprelease.yml index 1461914..86b6f88 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.3 with: workflow_run_url: ${{ github.event.inputs.workflow_run_url }} - artifact_pattern: "*.tar.xz" permissions: contents: write id-token: write From efcbc8ae6f4b31559ae8bcc1ddb9d78264129ec4 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Sat, 17 Jan 2026 11:31:55 -0700 Subject: [PATCH 3/4] cmake: xproinc enhancements --- CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9bd722d..7c8ad44 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,8 +4,6 @@ set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES .devcontainer/cmake/xproinc.cmake) project(LuaBridge) include(CMakeDependentOption) -include(GNUInstallDirs) -include(xpflags) option(LUABRIDGE_CXX17 "Use C++17 standard if supported by compiler" OFF) From 26de0ee44c6cbf015107fa0329e8beea0cd35b31 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Sat, 17 Jan 2026 11:38:30 -0700 Subject: [PATCH 4/4] cmake: xpExternPackage() replaces xpPackageDevel() --- Source/CMakeLists.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 6a6b812..6165efc 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -53,8 +53,13 @@ if(DEFINED XP_NAMESPACE) find_package(lua REQUIRED) target_link_libraries(LuaBridge INTERFACE ${LUA_LIBRARIES}) set(targetsFile LuaBridgeTargets) - set(XP_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake) - xpPackageDevel(TARGETS_FILE ${targetsFile} DEPS lua LIBRARIES ${XP_NAMESPACE}::LuaBridge) + xpExternPackage(NAMESPACE ${XP_NAMESPACE} + TARGETS_FILE ${targetsFile} LIBRARIES LuaBridge + BASE 2.10 XPDIFF "patch" DEPS lua + WEB "http://vinniefalco.github.io/LuaBridge/Manual.html 'LuaBridge Reference Manual'" UPSTREAM "github.com/vinniefalco/LuaBridge" + DESC "a lightweight, dependency-free library for binding Lua to C++" + LICENSE "[MIT](https://github.com/vinniefalco/LuaBridge/#official-repository 'MIT License')" + ) install(TARGETS LuaBridge EXPORT ${targetsFile}) install(EXPORT ${targetsFile} DESTINATION ${XP_INSTALL_CMAKEDIR} NAMESPACE ${XP_NAMESPACE}::) endif()