From 25f8b5489e198de876b70de9e006f8aef9b0e47e Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Tue, 6 Jan 2026 20:14:07 -0700 Subject: [PATCH 1/4] externpro 25.07.1-3-gc5f5fb7 --- .devcontainer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer b/.devcontainer index 9392dab6..c5f5fb7b 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit 9392dab66088da3b820424480218fc88492927c7 +Subproject commit c5f5fb7b3527c217c60e6f4e872b34a47dbecb53 From 61098b4487c0059e237c1785a0b8a8d612bb32db Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Tue, 6 Jan 2026 20:15:27 -0700 Subject: [PATCH 2/4] 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 b9166a83..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.05.2 - with: - cmake-workflow-preset: LinuxRelease - runon: ubuntu-latest - secrets: inherit - linux-arm64: - uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.2 - with: - cmake-workflow-preset: LinuxRelease - 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.05.2 - with: - cmake-workflow-preset: DarwinRelease + uses: externpro/externpro/.github/workflows/build-macos.yml@25.07.1 secrets: inherit windows: - uses: externpro/externpro/.github/workflows/build-windows.yml@25.05.2 - with: - cmake-workflow-preset: WindowsRelease + 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 273199e9..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.05.2 + 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 3c2812ac02dd132b81441c6e958fda5dedc540fd Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Tue, 6 Jan 2026 20:16:14 -0700 Subject: [PATCH 3/4] workflows/xpbuild: cmake-workflow-preset Release --- .github/workflows/xpbuild.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/xpbuild.yml b/.github/workflows/xpbuild.yml index 82c4b83a..70e7cbb5 100644 --- a/.github/workflows/xpbuild.yml +++ b/.github/workflows/xpbuild.yml @@ -16,9 +16,15 @@ jobs: packages: write uses: externpro/externpro/.github/workflows/build-linux.yml@25.07.1 secrets: inherit + with: + cmake-workflow-preset: LinuxRelease macos: uses: externpro/externpro/.github/workflows/build-macos.yml@25.07.1 secrets: inherit + with: + cmake-workflow-preset: DarwinRelease windows: uses: externpro/externpro/.github/workflows/build-windows.yml@25.07.1 secrets: inherit + with: + cmake-workflow-preset: WindowsRelease From d224ef51617333246faae5dda1fcd41bb0622213 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Tue, 6 Jan 2026 20:35:48 -0700 Subject: [PATCH 4/4] cmake: xproinc enhancements and xpExternPackage() --- CMakeLists.txt | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a302002b..e238f07c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,10 +10,8 @@ OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON) # Where to look for cmake modules list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules") -INCLUDE(GNUInstallDirs) INCLUDE(YasmMacros) INCLUDE(VersionGen) -INCLUDE(xpflags) OPTION(ENABLE_NLS "Enable message translations" OFF) @@ -39,16 +37,14 @@ INCLUDE_DIRECTORIES(AFTER ${CMAKE_BINARY_DIR} ${yasm_SOURCE_DIR}) INCLUDE(ConfigureChecks.cmake) OPTION(XP_INSTALL_YASM_EXE_ONLY "Only install the yasm executable" OFF) -if(NOT DEFINED XP_INSTALL_CMAKEDIR) - set(XP_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake) -endif() SET(targetsFile ${PROJECT_NAME}-targets) -set(exe ${PROJECT_NAME}) -if(DEFINED XP_NAMESPACE) - set(nameSpace NAMESPACE ${XP_NAMESPACE}::) - string(PREPEND exe "${XP_NAMESPACE}::") -endif() -xpPackageDevel(TARGETS_FILE ${targetsFile} EXE ${exe}) +xpExternPackage(NAMESPACE ${XP_NAMESPACE} + TARGETS_FILE ${targetsFile} EXE ${PROJECT_NAME} + BASE v1.3.0 XPDIFF "patch" + WEB "http://yasm.tortall.net/" UPSTREAM "github.com/yasm/yasm" + DESC "assembler and disassembler for the Intel x86 architecture" + LICENSE "[BSD-2-Clause](https://github.com/yasm/yasm/blob/v1.3.0/COPYING 'BSD 2-Clause Simplified License')" + ) ADD_SUBDIRECTORY(tools) ADD_SUBDIRECTORY(libyasm) @@ -56,7 +52,10 @@ ADD_SUBDIRECTORY(modules) ADD_SUBDIRECTORY(frontends) if(XP_INSTALL_YASM_EXE_ONLY) -INSTALL(EXPORT ${targetsFile} DESTINATION ${XP_INSTALL_CMAKEDIR} ${nameSpace}) + if(DEFINED XP_NAMESPACE) + set(nameSpace NAMESPACE ${XP_NAMESPACE}::) + endif() + INSTALL(EXPORT ${targetsFile} DESTINATION ${XP_INSTALL_CMAKEDIR} ${nameSpace}) endif() if(NOT XP_INSTALL_YASM_EXE_ONLY)