From 3962bc230d931fc2407e2ac31a93d2ed1fa009c1 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Mon, 15 Sep 2025 16:33:55 -0600 Subject: [PATCH 1/4] externpro 25.05.1-53-g50291e3 --- .devcontainer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer b/.devcontainer index de12dc2..50291e3 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit de12dc208298d0090a6e9efadf9eafd6018a549c +Subproject commit 50291e3bff6dc3d1658e9ae59195d3d9a2b696b4 From 1d9936a10c60443f057d677df512e8468b8c0007 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Mon, 15 Sep 2025 16:35:30 -0600 Subject: [PATCH 2/4] externpro github/workflows @25.05.1 cp .devcontainer/.github/wf-templates/xp*.yml .github/workflows --- .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 b120831..151d481 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.2 + uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.1 with: cmake-workflow-preset: Linux runon: ubuntu-latest secrets: inherit linux-arm64: - uses: externpro/externpro/.github/workflows/build-linux.yml@25.04.2 + uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.1 with: cmake-workflow-preset: Linux runon: ubuntu-24.04-arm secrets: inherit + macos: + uses: externpro/externpro/.github/workflows/build-macos.yml@25.05.1 + with: + cmake-workflow-preset: Darwin + secrets: inherit windows: - uses: externpro/externpro/.github/workflows/build-windows.yml@25.04.2 + uses: externpro/externpro/.github/workflows/build-windows.yml@25.05.1 with: cmake-workflow-preset: Windows 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 598ccec..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.2 + 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 2c3248825ae1d6e00e99018a6205696a7955e4f1 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Mon, 15 Sep 2025 16:37:53 -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 4b352694396b6af0ca24cb053bc6e6f666af5069 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Mon, 15 Sep 2025 17:39:25 -0600 Subject: [PATCH 4/4] cmake toplevel updates * externpro as dependency provider (xproinc) * project() VERSION set to three digit 'upstream' version * no longer using 4th digit (tweak version) for externpro-specific version * externpro devel packages get version from 'git describe --tags' * set and use targetsFile variable for naming consistency * externpro flags.cmake renamed to xpflags.cmake --- CMakeLists.txt | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index db9f365..7cf726d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,7 @@ cmake_minimum_required(VERSION 3.31) -list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/.devcontainer/cmake) -include(preproject) +set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES .devcontainer/cmake/xproinc.cmake) project(SQLite3 - VERSION 3.37.2.3 + VERSION 3.37.2 LANGUAGES C ) @@ -10,20 +9,21 @@ include(GNUInstallDirs) #------------------------------------------------------------------------------ # externpro -include(flags) +include(xpflags) +set(targetsFile ${PROJECT_NAME}Config) if(NOT DEFINED XP_NAMESPACE) set(XP_NAMESPACE SQLite) set(debugPostfix DEBUG_POSTFIX d) set(XP_INSTALL_CMAKEDIR cmake) else() set(XP_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake) + string(JOIN "\n" EXT1 + "set(THREAD_PREFER_PTHREAD_FLAG ON)" + "find_package(Threads REQUIRED) # depends on Threads::Threads" + "" + ) + xpPackageDevel(LIBRARIES ${XP_NAMESPACE}::${PROJECT_NAME} TARGETS_FILE ${targetsFile}) endif() -string(JOIN "\n" EXT1 - "set(THREAD_PREFER_PTHREAD_FLAG ON)" - "find_package(Threads REQUIRED) # depends on Threads::Threads" - "" - ) -xpPackageDevel(LIBRARIES ${XP_NAMESPACE}::${PROJECT_NAME} TARGETS_FILE ${PROJECT_NAME}Config) #------------------------------------------------------------------------------ # build options and optional modules: @@ -109,12 +109,12 @@ endif() #------------------------------------------------------------------------------ configure_file(sqlite3_config.h.in ${CMAKE_BINARY_DIR}/sqlite3_config.h) -install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Config +install(TARGETS ${PROJECT_NAME} EXPORT ${targetsFile} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) -install(EXPORT ${PROJECT_NAME}Config +install(EXPORT ${targetsFile} NAMESPACE ${XP_NAMESPACE}:: DESTINATION ${XP_INSTALL_CMAKEDIR} ) @@ -146,7 +146,7 @@ if(BUILD_SHELL) set(${flag} "${${flag}}" CACHE STRING "msvc flags" FORCE) endforeach() endif() - install(TARGETS shell_app EXPORT ${PROJECT_NAME}Config + install(TARGETS shell_app EXPORT ${targetsFile} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} CONFIGURATIONS Release ) endif()