From f7c379aabcc9f0e832188aac026956a95e719f9f Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Mon, 9 Jun 2025 20:33:43 -0600 Subject: [PATCH 01/10] externpro 25.03-12-ge6ea091 --- .devcontainer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer b/.devcontainer index 8e3a095..e6ea091 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit 8e3a09572bb23136a6fdbbd80cfcc6e2947b081c +Subproject commit e6ea0913cc8f4b9e5b8a7a3f50e8413bcc5aa937 From db2cac93398fee84810f6853857599c1eb2b4d1b Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Mon, 9 Jun 2025 20:34:15 -0600 Subject: [PATCH 02/10] update docker-compose links --- docker-compose.sh | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.sh b/docker-compose.sh index 57f36db..85f182f 120000 --- a/docker-compose.sh +++ b/docker-compose.sh @@ -1 +1 @@ -.devcontainer/compose.bld.sh \ No newline at end of file +.devcontainer/compose.pro.sh \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 7e6cc2e..46c1f89 120000 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1 +1 @@ -.devcontainer/compose.pro.yml \ No newline at end of file +.devcontainer/compose.bld.yml \ No newline at end of file From f6a445e955d70178262b41ded0c5e4e1c3292054 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Fri, 18 Jul 2025 15:29:30 -0600 Subject: [PATCH 03/10] externpro 25.04 https://github.com/externpro/externpro/releases/tag/25.04 --- .devcontainer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer b/.devcontainer index e6ea091..de12dc2 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit e6ea0913cc8f4b9e5b8a7a3f50e8413bcc5aa937 +Subproject commit de12dc208298d0090a6e9efadf9eafd6018a549c From 894b927551bfa30e958a284028e22a82b6038570 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Fri, 18 Jul 2025 15:30:25 -0600 Subject: [PATCH 04/10] cmake 3.31 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 95e94a8..db9f09a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.28) +cmake_minimum_required(VERSION 3.31) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/.devcontainer/cmake) include(preproject) project(patch VERSION 2.7) From 2950da8cbd81faf83fa51ebf058a864d0456d3cf Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Fri, 18 Jul 2025 15:31:44 -0600 Subject: [PATCH 05/10] externpro/.github/workflows @25.04 --- .github/workflows/build.yml | 25 +++++++++++++++++++++++++ .github/workflows/release.yml | 16 ++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..3b34b65 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,25 @@ +name: Build +on: + push: + branches: [ "dev" ] + pull_request: + branches: [ "dev" ] + workflow_dispatch: +jobs: + linux: + uses: externpro/externpro/.github/workflows/build-linux.yml@25.04 + with: + cmake-workflow-preset: LinuxRelease + runon: ubuntu-latest + secrets: inherit + linux-arm64: + uses: externpro/externpro/.github/workflows/build-linux.yml@25.04 + with: + cmake-workflow-preset: LinuxRelease + runon: ubuntu-24.04-arm + secrets: inherit + windows: + uses: externpro/externpro/.github/workflows/build-windows.yml@25.04 + with: + cmake-workflow-preset: WindowsRelease + secrets: inherit diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..6fa033b --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,16 @@ +name: Release +on: + workflow_dispatch: + inputs: + workflow_run_url: + description: 'URL of the workflow run containing artifacts to upload (e.g., https://github.com/owner/repo/actions/runs/123456789)' + required: true + type: string +jobs: + # Upload build artifacts as release assets + release-from-build: + uses: externpro/externpro/.github/workflows/release-from-build.yml@25.04 + with: + workflow_run_url: ${{ github.event.inputs.workflow_run_url }} + artifact_pattern: "*.tar.xz" + secrets: inherit From e30362fa6fe5df196eae7eae0c3f08e09cd99ef0 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Fri, 18 Jul 2025 15:35:30 -0600 Subject: [PATCH 06/10] cmake: buildpro_REV in .devcontainer/cmake/xptoplevel now --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index db9f09a..d02576e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.31) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/.devcontainer/cmake) include(preproject) project(patch VERSION 2.7) -set(buildpro_REV 24.03) include(flags) include(GNUInstallDirs) set(XP_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake) From baf2216d3c31e7b3a8e82f90819c3801a184b42a Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Fri, 18 Jul 2025 15:36:20 -0600 Subject: [PATCH 07/10] CMakePresets: xpLinuxNinja and xpWindowsVs2022 cmake-presets ending with Release were made obsolete --- CMakePresets.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index 08d18a9..5a06690 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -1,7 +1,7 @@ { "version": 8, "include": [ - ".devcontainer/cmake/presets/xpLinuxNinjaRelease.json", - ".devcontainer/cmake/presets/xpWindowsVs2019Release.json" + ".devcontainer/cmake/presets/xpLinuxNinja.json", + ".devcontainer/cmake/presets/xpWindowsVs2022.json" ] } From e39f0bf9e6bafe57729ccd6f730351ef73f11798 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Fri, 18 Jul 2025 20:11:38 -0600 Subject: [PATCH 08/10] download patch-2.7.6-bin.zip on Windows from github.com/externpro/patch resolves https://github.com/externpro/patch/issues/1 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d02576e..d158e98 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,8 +11,8 @@ if(WIN32 AND NOT UNIX) set(VER 2.7.6) ExternalProject_Add(${PROJECT_NAME} DOWNLOAD_EXTRACT_TIMESTAMP true - URL https://github.com/smanders/externpro/releases/download/20.10.1/patch-${VER}-bin.zip - URL_MD5 e0d4690179d85c1cf543f52856a63db9 + URL https://github.com/externpro/patch/releases/download/v2.7/patch-${VER}-bin.zip + URL_SHA256 eb848c8b0a51f51ed9407b832a975f1d47578825c7e7c3f23e79f23e88b9693b CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy_if_different /patch.exe /bin/patcz.exe BUILD_COMMAND ${CMAKE_COMMAND} -E copy_if_different From 3177da8694214e6d9c840aa6a4c8bd79fc1d116a Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Fri, 18 Jul 2025 20:16:38 -0600 Subject: [PATCH 09/10] ExternalProject_Add SHA256 correction resolves https://github.com/externpro/patch/issues/1 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d158e98..3b17984 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ if(WIN32 AND NOT UNIX) ExternalProject_Add(${PROJECT_NAME} DOWNLOAD_EXTRACT_TIMESTAMP true URL https://github.com/externpro/patch/releases/download/v2.7/patch-${VER}-bin.zip - URL_SHA256 eb848c8b0a51f51ed9407b832a975f1d47578825c7e7c3f23e79f23e88b9693b + SHA256 eb848c8b0a51f51ed9407b832a975f1d47578825c7e7c3f23e79f23e88b9693b CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy_if_different /patch.exe /bin/patcz.exe BUILD_COMMAND ${CMAKE_COMMAND} -E copy_if_different From 8dad6b0ae2d1844eeaca1d9502e71aa988142bba Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Fri, 18 Jul 2025 20:23:14 -0600 Subject: [PATCH 10/10] ExternalProject_Add SHA256 correction, take 2 docs https://cmake.org/cmake/help/v3.31/module/ExternalProject.html#url resolves https://github.com/externpro/patch/issues/1 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b17984..b023663 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ if(WIN32 AND NOT UNIX) ExternalProject_Add(${PROJECT_NAME} DOWNLOAD_EXTRACT_TIMESTAMP true URL https://github.com/externpro/patch/releases/download/v2.7/patch-${VER}-bin.zip - SHA256 eb848c8b0a51f51ed9407b832a975f1d47578825c7e7c3f23e79f23e88b9693b + URL_HASH SHA256=eb848c8b0a51f51ed9407b832a975f1d47578825c7e7c3f23e79f23e88b9693b CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy_if_different /patch.exe /bin/patcz.exe BUILD_COMMAND ${CMAKE_COMMAND} -E copy_if_different