externpro · smanders · Sep 15, 2025 · Sep 15, 2025 · Sep 15, 2025 · Sep 15, 2025
diff --git a/.devcontainer b/.devcontainer
diff --git a/.github/workflows/build.yml → .github/workflows/xpbuild.yml b/.github/workflows/build.yml → .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 → .github/workflows/xprelease.yml b/.github/workflows/release.yml → .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
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,29 +1,29 @@
 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
     )
 
 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()
diff --git 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"
   ]
 }
+30 −0		.github/wf-templates/xpbuild.yml
+20 −0		.github/wf-templates/xprelease.yml
+67 −14		.github/workflows/README.md
+23 −11		.github/workflows/build-linux.yml
+61 −0		.github/workflows/build-macos.yml
+17 −8		.github/workflows/build-windows.yml
+67 −6		.github/workflows/release-from-build.yml
+3 −2		README.md
+40 −0		cmake/Findexdlpro.cmake
+0 −78		cmake/Findexternpro.cmake
+4 −42		cmake/Findscript.cmake.in
+72 −65		cmake/README.md
+1 −1		cmake/cpack/README.md
+6 −3		cmake/deps.cmake
+2 −2		cmake/deps.dot
+ −		cmake/deps.png
+24 −19		cmake/macpro.cmake
+0 −7		cmake/preproject.cmake
+1 −0		cmake/presets/CMakePresets.json
+67 −0		cmake/presets/xpDarwinMakefilesRelease.json
+176 −0		cmake/presets/xpDarwinNinja.json
+0 −50		cmake/presets/xpWindowsVs2019Package.json
+176 −74		cmake/pros.cmake
+128 −0		cmake/pros.md
+6 −4		cmake/sync.cmake
+1 −0		cmake/sync.sh.in
+1,095 −29		cmake/xpcfg.cmake
+0 −0		cmake/xpflags.cmake
+0 −49		cmake/xpflatbuffers.cmake
+97 −49		cmake/xpfunmac.cmake
+0 −24		cmake/xpnode.cmake
+24 −0		cmake/xproinc.cmake
+1 −5		cmake/xptoplevel.cmake
+19 −0		cmake/xpweb.cmake
+1 −1		compose.bld.yml
+1 −1		compose.gpu.yml
+6 −0		compose.xdl.sh
+31 −7		denv.sh
+1 −0		devcontainer.json
+3 −2		graph/graph.dot
+ −		graph/graph.png
+1 −1		local.dockerfile