From 3200a73b052d4edb71e4c3af87e776da902b26cc Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Tue, 18 Nov 2025 17:51:19 -0700 Subject: [PATCH 1/8] git submodule add https://github.com/externpro/externpro .devcontainer --- .devcontainer | 1 + .gitmodules | 3 +++ 2 files changed, 4 insertions(+) create mode 160000 .devcontainer diff --git a/.devcontainer b/.devcontainer new file mode 160000 index 0000000..b271b77 --- /dev/null +++ b/.devcontainer @@ -0,0 +1 @@ +Subproject commit b271b77337fe6c0b6508babb04bc669c00611320 diff --git a/.gitmodules b/.gitmodules index 32ec896..6855a39 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "lossless"] path = lossless url = https://github.com/externpro/libjpeg.git +[submodule ".devcontainer"] + path = .devcontainer + url = https://github.com/externpro/externpro From d9768d13af6fc646cf8a947a67845d905e60dc4b Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Tue, 18 Nov 2025 17:53:15 -0700 Subject: [PATCH 2/8] docker-compose links --- docker-compose.sh | 1 + docker-compose.yml | 1 + 2 files changed, 2 insertions(+) create mode 120000 docker-compose.sh create mode 120000 docker-compose.yml diff --git a/docker-compose.sh b/docker-compose.sh new file mode 120000 index 0000000..85f182f --- /dev/null +++ b/docker-compose.sh @@ -0,0 +1 @@ +.devcontainer/compose.pro.sh \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 120000 index 0000000..46c1f89 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1 @@ +.devcontainer/compose.bld.yml \ No newline at end of file From bed1edc14df5c3fd163e9be162ab3ccb1d4512ff Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Tue, 18 Nov 2025 17:53:41 -0700 Subject: [PATCH 3/8] add CMakePresets cp .devcontainer/cmake/presets/CMakePresets* . --- CMakePresets.json | 8 ++++++++ CMakePresetsBase.json | 16 ++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 CMakePresets.json create mode 100644 CMakePresetsBase.json diff --git a/CMakePresets.json b/CMakePresets.json new file mode 100644 index 0000000..f82cfdd --- /dev/null +++ b/CMakePresets.json @@ -0,0 +1,8 @@ +{ + "version": 8, + "include": [ + ".devcontainer/cmake/presets/xpLinuxNinja.json", + ".devcontainer/cmake/presets/xpDarwinNinja.json", + ".devcontainer/cmake/presets/xpWindowsVs2022.json" + ] +} diff --git a/CMakePresetsBase.json b/CMakePresetsBase.json new file mode 100644 index 0000000..085cdc3 --- /dev/null +++ b/CMakePresetsBase.json @@ -0,0 +1,16 @@ +{ + "version": 8, + "configurePresets": [ + { + "name": "config-base", + "hidden": true, + "binaryDir": "${sourceDir}/_bld-${presetName}" + } + ], + "buildPresets": [ + { + "name": "build-base", + "hidden": true + } + ] +} From 402c0356d0a650a337aedbc60e60d6762eb1c7fb Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Tue, 18 Nov 2025 17:54:26 -0700 Subject: [PATCH 4/8] gitignore: externpro ignores --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1fc17fa --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.env +_bld*/ +docker-compose.override.yml From 1de10054383f57b0cf0083316450ed3382036442 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Tue, 18 Nov 2025 17:55:11 -0700 Subject: [PATCH 5/8] externpro github/workflows @25.06 cp .devcontainer/.github/wf-templates/xp*.yml .github/workflows --- .github/workflows/xpbuild.yml | 30 ++++++++++++++++++++++++++++++ .github/workflows/xprelease.yml | 20 ++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 .github/workflows/xpbuild.yml create mode 100644 .github/workflows/xprelease.yml diff --git a/.github/workflows/xpbuild.yml b/.github/workflows/xpbuild.yml new file mode 100644 index 0000000..169ff52 --- /dev/null +++ b/.github/workflows/xpbuild.yml @@ -0,0 +1,30 @@ +name: Build +on: + push: + branches: [ "dev" ] + pull_request: + branches: [ "dev" ] + workflow_dispatch: +jobs: + linux: + uses: externpro/externpro/.github/workflows/build-linux.yml@25.06 + with: + cmake-workflow-preset: Linux + runon: ubuntu-latest + secrets: inherit + linux-arm64: + uses: externpro/externpro/.github/workflows/build-linux.yml@25.06 + with: + cmake-workflow-preset: Linux + runon: ubuntu-24.04-arm + secrets: inherit + macos: + uses: externpro/externpro/.github/workflows/build-macos.yml@25.06 + with: + cmake-workflow-preset: Darwin + secrets: inherit + windows: + uses: externpro/externpro/.github/workflows/build-windows.yml@25.06 + with: + cmake-workflow-preset: Windows + secrets: inherit diff --git a/.github/workflows/xprelease.yml b/.github/workflows/xprelease.yml new file mode 100644 index 0000000..1461914 --- /dev/null +++ b/.github/workflows/xprelease.yml @@ -0,0 +1,20 @@ +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.06 + 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 92cbafa5cacd3cdb41772445e1f4af076c67e67c Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Tue, 18 Nov 2025 18:02:44 -0700 Subject: [PATCH 6/8] CMakePresetsBase: add cachedVariables XP_NAMESPACE --- CMakePresetsBase.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakePresetsBase.json b/CMakePresetsBase.json index 085cdc3..4489d79 100644 --- a/CMakePresetsBase.json +++ b/CMakePresetsBase.json @@ -4,7 +4,10 @@ { "name": "config-base", "hidden": true, - "binaryDir": "${sourceDir}/_bld-${presetName}" + "binaryDir": "${sourceDir}/_bld-${presetName}", + "cacheVariables": { + "XP_NAMESPACE": "xpro" + } } ], "buildPresets": [ From d6322037db1bb44e586f4d7fd5200f7233d8366a Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Tue, 18 Nov 2025 18:02:57 -0700 Subject: [PATCH 7/8] externpro dependency provider --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2a5aa75..8191844 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.31) +set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES .devcontainer/cmake/xproinc.cmake) project(jpegxp) include(GNUInstallDirs) include(xpflags) From da1477a8f332d08a0c1c0dcd6ab4f6e642874658 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Tue, 18 Nov 2025 18:03:14 -0700 Subject: [PATCH 8/8] externpro devel package --- CMakeLists.txt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8191844..c11a9d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -152,17 +152,20 @@ if(MSVC) target_compile_definitions(${lib_name} PRIVATE -D_CRT_SECURE_NO_WARNINGS) endif() ####################################### +set(lib ${lib_name}) +if(DEFINED XP_NAMESPACE) + set(nameSpace NAMESPACE ${XP_NAMESPACE}::) + string(PREPEND lib ${XP_NAMESPACE}::) +endif() +if(NOT DEFINED XP_INSTALL_CMAKEDIR) + set(XP_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake) +endif() set(targetsFile ${PROJECT_NAME}-targets) +xpPackageDevel(TARGETS_FILE ${targetsFile} LIBRARIES ${lib}) install(TARGETS ${lib_name} EXPORT ${targetsFile} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) install(FILES ${include_srcs} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}) -if(DEFINED XP_NAMESPACE) - set(nameSpace NAMESPACE ${XP_NAMESPACE}::) -endif() -if(NOT DEFINED XP_INSTALL_CMAKEDIR) - set(XP_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake) -endif() install(EXPORT ${targetsFile} DESTINATION ${XP_INSTALL_CMAKEDIR} ${nameSpace})