From fc144665f3bc99c523763ecf862e203bd5638549 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Sat, 19 Jul 2025 10:35:40 -0600 Subject: [PATCH 1/7] 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 46a9efb..de12dc2 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit 46a9efbbaf372f9e1cf0feabd9fbddfc8fcd5be1 +Subproject commit de12dc208298d0090a6e9efadf9eafd6018a549c From 15558cad6f3a23fc08933f33b60b35245ec5b324 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Sat, 19 Jul 2025 11:01:33 -0600 Subject: [PATCH 2/7] 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 e82607cafdd5663e92fca875a0826c01cb9232fe Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Sat, 19 Jul 2025 11:06:23 -0600 Subject: [PATCH 3/7] cmake: build for arm64 support, remove JetPack --- CMakeLists.txt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1827266..0090e2a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,12 +33,15 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows") elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") set(bin "bin/") set(ext tar.xz) - set(arch x64) - set(sha ${SHA256_Linux}) -endif() -if(DEFINED ENV{XPX} AND "$ENV{XPX}" STREQUAL "JetPack") - set(arch arm64) - set(sha ${SHA256_arm64}) + if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|amd64|AMD64)$") + set(arch x64) + set(sha ${SHA256_Linux}) + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64|ARM64)$") + set(arch arm64) + set(sha ${SHA256_arm64}) + else() + message(FATAL_ERROR "Unsupported architecture: ${CMAKE_SYSTEM_PROCESSOR}") + endif() endif() set(url https://nodejs.org/dist/v${ver}/node-v${ver}-${os}-${arch}.${ext}) set(fcName ${PROJECT_NAME}_fc) From 95474ddabfa3578c90eeb19a12555549096ee3ea Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Sat, 19 Jul 2025 11:06:34 -0600 Subject: [PATCH 4/7] cmake 3.31 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0090e2a..2033ee3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.31.7) +cmake_minimum_required(VERSION 3.31) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/.devcontainer/cmake) include(preproject) project(nodexp VERSION 14.17.6.1) From 93773c5833e0a592ee90b625ce470065792d9859 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Sat, 19 Jul 2025 11:06:48 -0600 Subject: [PATCH 5/7] cmake: webpro_REV no longer req'd --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2033ee3..750c29c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,6 @@ set(SHA256_win64 b83e9ce542fda7fc519cec6eb24a2575a84862ea4227dedc171a8e0b5b614ac set(SHA256_arm64 9c4f3a651e03cd9b5bddd33a80e8be6a6eb15e518513e410bb0852a658699156) set(SHA256_hders 9429d544af0507c92f309fb1a0b7c2082b52846bdff3cd8aa039ada0461c95b9) set(SHA256_ndlib e456fef578acd36eb661055445b4a06c81c47b2cfe0066619e7faa135137d4f6) -set(webpro_REV NONE) include(flags) include(FetchContent) cmake_policy(SET CMP0168 OLD) # don't want to see download progress From 1e8f70a0976968e4ce4c76d779e147d34217ec16 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Sat, 19 Jul 2025 11:08:04 -0600 Subject: [PATCH 6/7] CMakePresets: drop JetPack, change Vs2019 to Vs2022 --- CMakePresets.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index 7380f12..5a06690 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -2,7 +2,6 @@ "version": 8, "include": [ ".devcontainer/cmake/presets/xpLinuxNinja.json", - ".devcontainer/cmake/presets/xpJetPackNinja.json", - ".devcontainer/cmake/presets/xpWindowsVs2019.json" + ".devcontainer/cmake/presets/xpWindowsVs2022.json" ] } From 128be93526a4356ec4633a1e793ecbcd31dba94d Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Sat, 19 Jul 2025 11:09:53 -0600 Subject: [PATCH 7/7] add .gitattributes --- .gitattributes | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..6b484ee --- /dev/null +++ b/.gitattributes @@ -0,0 +1,78 @@ +CMakeLists.txt text eol=lf +Dockerfile text eol=lf +.gitattributes text eol=lf +*.c text eol=lf +*.cfg text eol=lf +*.cls text eol=lf +*.cmake text eol=lf +*.conf text eol=lf +*.cpp text eol=lf +*.cs text eol=lf +*.css text eol=lf +*.csv text eol=lf +*.cu text eol=lf +*.cuh text eol=lf +*.cuhpp text eol=lf +*.cuhpp linguist-detectable +*.cuhpp linguist-language=C++ +*.dae text eol=lf +*.dockerfile text eol=lf +*.dot text eol=lf +*.eps text eol=lf +*.fbs text eol=lf +*.h text eol=lf +*.h.in text eol=lf +*.hpp text eol=lf +*.hpp.in text eol=lf +*.hrc text eol=lf +*.html text eol=lf +*.js text eol=lf +*.json text eol=lf +*.less text eol=lf +*.lua text eof=lf +*.md text eol=lf +*.pjd text eol=lf +*.proto text eol=lf +*.rc text eol=lf +*.rch text eol=lf +*.scss text eol=lf +*.sh text eol=lf +*.svg text eol=lf +*.tex text eol=lf +*.ts text eol=lf +*.txt text eol=lf +*.type text eol=lf +*.xml text eol=lf +*.xpm text eol=lf +*.xsd text eol=lf +*.yml text eol=lf +.*rc text eol=lf +#################### +*.csproj.in text eol=crlf +*.filters text eol=crlf +*.m text eol=crlf +*.resx text eol=crlf +*.rst text eol=crlf +*.sln text eol=crlf +*.sql text eol=crlf +*.vcproj text eol=crlf +*.vcxproj text eol=crlf +#################### +*.bin binary +*.bmp binary +*.db binary +*.doc binary +*.eap binary +*.gif binary +*.ico binary +*.jpeg binary +*.jpg binary +*.mp3 binary +*.ntf binary +*.pdf binary +*.png binary +*.rtf binary +*.vsd binary +*.xcf binary +*.xlsx binary +*.zip binary