From 6a2c6ccf9b86c715d333ffde54e8747ce8c9c8e9 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Tue, 25 Nov 2025 11:53:52 -0700 Subject: [PATCH 1/4] externpro 25.06-42-gd778368 --- .devcontainer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer b/.devcontainer index 5a4c876a2cee..d778368c70b3 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit 5a4c876a2ceef74e039a9dc9aaa69c2aac9cbb3c +Subproject commit d778368c70b3d147f0487c844e260373f29334d1 From 948236cf95adb8fe781126ad61b9e5eae89ef897 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Tue, 25 Nov 2025 11:54:22 -0700 Subject: [PATCH 2/4] externpro github/workflows @25.06 --- .github/workflows/xpbuild.yml | 8 ++++---- .github/workflows/xprelease.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/xpbuild.yml b/.github/workflows/xpbuild.yml index fb5575822199..33ec5df0308c 100644 --- a/.github/workflows/xpbuild.yml +++ b/.github/workflows/xpbuild.yml @@ -7,24 +7,24 @@ on: workflow_dispatch: jobs: linux: - uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.1 + uses: externpro/externpro/.github/workflows/build-linux.yml@25.06 with: cmake-workflow-preset: LinuxRelease runon: ubuntu-latest secrets: inherit linux-arm64: - uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.1 + uses: externpro/externpro/.github/workflows/build-linux.yml@25.06 with: cmake-workflow-preset: LinuxRelease runon: ubuntu-24.04-arm secrets: inherit macos: - uses: externpro/externpro/.github/workflows/build-macos.yml@25.05.1 + uses: externpro/externpro/.github/workflows/build-macos.yml@25.06 with: cmake-workflow-preset: DarwinRelease secrets: inherit windows: - uses: externpro/externpro/.github/workflows/build-windows.yml@25.05.1 + uses: externpro/externpro/.github/workflows/build-windows.yml@25.06 with: cmake-workflow-preset: WindowsRelease secrets: inherit diff --git a/.github/workflows/xprelease.yml b/.github/workflows/xprelease.yml index f868a82e5322..146191466e26 100644 --- a/.github/workflows/xprelease.yml +++ b/.github/workflows/xprelease.yml @@ -9,7 +9,7 @@ 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.06 with: workflow_run_url: ${{ github.event.inputs.workflow_run_url }} artifact_pattern: "*.tar.xz" From 9c6f1261109451fb88beee3ff4cb2199042c8fb4 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Tue, 25 Nov 2025 11:54:55 -0700 Subject: [PATCH 3/4] CMakePresetsBase: add cacheVariables XP_BUILD_VERBOSE, buildPresets buildPresets matches updated .devcontainer/cmake/presets/CMakePresetsBase --- CMakePresetsBase.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/CMakePresetsBase.json b/CMakePresetsBase.json index 09653d8ae8b2..439a3ee32e98 100644 --- a/CMakePresetsBase.json +++ b/CMakePresetsBase.json @@ -4,7 +4,16 @@ { "name": "config-base", "hidden": true, - "binaryDir": "${sourceDir}/_bld-${presetName}" + "binaryDir": "${sourceDir}/_bld-${presetName}", + "cacheVariables": { + "XP_BUILD_VERBOSE": "ON" + } + } + ], + "buildPresets": [ + { + "name": "build-base", + "hidden": true } ] } From 7c147fc795d1272dbbe7f3a52e23ca8db6d65ef1 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Tue, 25 Nov 2025 12:11:08 -0700 Subject: [PATCH 4/4] cmake: Python 3.6...<3.13, xproinc enhanced --- tools/cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cmake b/tools/cmake index 855b365b3e5d..411b8dd57360 160000 --- a/tools/cmake +++ b/tools/cmake @@ -1 +1 @@ -Subproject commit 855b365b3e5d55fb2a06c26254a0a69c24431e5b +Subproject commit 411b8dd5736036176a5b51408e6a3c62cd82aab4