From cfaa794e3fcf8c344ec641d253afe16109711f97 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Thu, 18 Sep 2025 17:24:21 -0600 Subject: [PATCH 1/4] externpro 25.05.1-63-gf159fd7 --- .devcontainer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer b/.devcontainer index de12dc2..f159fd7 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit de12dc208298d0090a6e9efadf9eafd6018a549c +Subproject commit f159fd751d458175dfa5e2ee2651ee53e7508933 From 1b82724b5ae705e3e0421a20ebae27e3c521e14a Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Thu, 18 Sep 2025 17:32:09 -0600 Subject: [PATCH 2/4] externpro github/workflows @25.05.1 git mv .github/workflows/build.yml .github/workflows/xpbuild.yml git mv .github/workflows/release.yml .github/workflows/xprelease.yml cp .devcontainer/.github/wf-templates/xp*.yml .github/workflows cmake-workflow-preset for each platform/os set to Release --- .github/workflows/{build.yml => xpbuild.yml} | 11 ++++++++--- .github/workflows/{release.yml => xprelease.yml} | 6 +++++- 2 files changed, 13 insertions(+), 4 deletions(-) rename .github/workflows/{build.yml => xpbuild.yml} (77%) rename .github/workflows/{release.yml => xprelease.yml} (83%) diff --git a/.github/workflows/build.yml b/.github/workflows/xpbuild.yml similarity index 77% rename from .github/workflows/build.yml rename to .github/workflows/xpbuild.yml index 3b34b65..fb55758 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/xpbuild.yml @@ -7,19 +7,24 @@ on: workflow_dispatch: jobs: linux: - uses: externpro/externpro/.github/workflows/build-linux.yml@25.04 + uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.1 with: cmake-workflow-preset: LinuxRelease runon: ubuntu-latest secrets: inherit linux-arm64: - uses: externpro/externpro/.github/workflows/build-linux.yml@25.04 + uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.1 with: cmake-workflow-preset: LinuxRelease runon: ubuntu-24.04-arm secrets: inherit + macos: + uses: externpro/externpro/.github/workflows/build-macos.yml@25.05.1 + with: + cmake-workflow-preset: DarwinRelease + secrets: inherit windows: - uses: externpro/externpro/.github/workflows/build-windows.yml@25.04 + uses: externpro/externpro/.github/workflows/build-windows.yml@25.05.1 with: cmake-workflow-preset: WindowsRelease secrets: inherit diff --git a/.github/workflows/release.yml b/.github/workflows/xprelease.yml similarity index 83% rename from .github/workflows/release.yml rename to .github/workflows/xprelease.yml index 6fa033b..f868a82 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/xprelease.yml @@ -9,8 +9,12 @@ on: jobs: # Upload build artifacts as release assets release-from-build: - uses: externpro/externpro/.github/workflows/release-from-build.yml@25.04 + uses: externpro/externpro/.github/workflows/release-from-build.yml@25.05.1 with: workflow_run_url: ${{ github.event.inputs.workflow_run_url }} artifact_pattern: "*.tar.xz" + permissions: + contents: write + id-token: write + attestations: write secrets: inherit From 04924c17135c4adab65f02c0c342c36536f8018b Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Thu, 18 Sep 2025 17:33:05 -0600 Subject: [PATCH 3/4] CMakePresets: include xpDarwinNinja (for macOS) cp .devcontainer/cmake/presets/CMakePresets.json . --- CMakePresets.json | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakePresets.json b/CMakePresets.json index 5a06690..f82cfdd 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -2,6 +2,7 @@ "version": 8, "include": [ ".devcontainer/cmake/presets/xpLinuxNinja.json", + ".devcontainer/cmake/presets/xpDarwinNinja.json", ".devcontainer/cmake/presets/xpWindowsVs2022.json" ] } From ed6c2408089c7c251b22b895e2f9d8908ed8b943 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Thu, 18 Sep 2025 17:36:36 -0600 Subject: [PATCH 4/4] cmake toplevel updates * externpro as dependency provider (xproinc) * project VERSION matches official/upstream version * no longer using 4th digit for externpro-specific version * externpro devel package gets version from 'git describe --tags' * externpro flags.cmake renamed to xpflags.cmake --- CMakeLists.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 84ba1cc..b252442 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,7 @@ cmake_minimum_required(VERSION 3.31) -set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/.devcontainer/cmake) -include(preproject) -project(nasm VERSION 2.14.02.1) -include(flags) +set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES .devcontainer/cmake/xproinc.cmake) +project(nasm VERSION 2.14.02) +include(xpflags) include(GNUInstallDirs) set(XP_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake) include(ExternalProject)