externpro · smanders · Jan 10, 2026 · Jan 10, 2026 · Jan 10, 2026 · Jan 10, 2026
diff --git a/.devcontainer b/.devcontainer
diff --git a/.github/workflows/xpbuild.yml b/.github/workflows/xpbuild.yml
@@ -1,4 +1,7 @@
 name: Build
+permissions:
+  contents: read
+  pull-requests: write
 on:
   push:
     branches: [ "dev" ]
@@ -7,24 +10,15 @@ on:
   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
+    permissions:
+      contents: read
+      pull-requests: write
+      packages: write
+    uses: externpro/externpro/.github/workflows/build-linux.yml@25.07.2
     secrets: inherit
   macos:
-    uses: externpro/externpro/.github/workflows/build-macos.yml@25.06
-    with:
-      cmake-workflow-preset: Darwin
+    uses: externpro/externpro/.github/workflows/build-macos.yml@25.07.2
     secrets: inherit
   windows:
-    uses: externpro/externpro/.github/workflows/build-windows.yml@25.06
-    with:
-      cmake-workflow-preset: Windows
+    uses: externpro/externpro/.github/workflows/build-windows.yml@25.07.2
     secrets: inherit
diff --git a/.github/workflows/xprelease.yml b/.github/workflows/xprelease.yml
@@ -9,10 +9,9 @@ on:
 jobs:
   # Upload build artifacts as release assets
   release-from-build:
-    uses: externpro/externpro/.github/workflows/release-from-build.yml@25.06
+    uses: externpro/externpro/.github/workflows/release-from-build.yml@25.07.2
     with:
       workflow_run_url: ${{ github.event.inputs.workflow_run_url }}
-      artifact_pattern: "*.tar.xz"
     permissions:
       contents: write
       id-token: write

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -34,25 +34,30 @@ INCLUDE(GNUInstallDirs)
 INCLUDE(IdeSplitSources)
 INCLUDE(FeatureSummary)
 INCLUDE(EnableWarnings)
-include(xpflags)
+
 set(targetsFile ${PROJECT_NAME}-targets)
-if(NOT DEFINED XP_INSTALL_CMAKEDIR)
-  set(XP_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake)
-endif()
 if(DEFINED XP_NAMESPACE)
-  set(XP_OPT_INSTALL FALSE)
-  set(nameSpace NAMESPACE ${XP_NAMESPACE}::)
-  set(USE_CMAKE_ICONV ON)
   string(JOIN "\n" EXT1
     "if(APPLE)"
     "  find_package(Iconv REQUIRED)"
     "endif()"
     ""
     )
-  xpPackageDevel(TARGETS_FILE ${targetsFile} DEPS libssh2 LIBRARIES ${XP_NAMESPACE}::git2)
+  xpExternPackage(NAMESPACE ${XP_NAMESPACE}
+    TARGETS_FILE ${targetsFile} LIBRARIES git2
+    BASE v${CMAKE_PROJECT_VERSION} XPDIFF "patch" DEPS libssh2
+    WEB "https://libgit2.github.com/" UPSTREAM "github.com/libgit2/libgit2"
+    DESC "portable, pure C implementation of the Git core methods"
+    LICENSE "[GPL-2.0 WITH le](https://github.com/libgit2/libgit2/blob/master/README.md#license 'GPL2 with linking exception')"
+		)
+  set(CMAKE_OPT_INSTALL FALSE)
+  set(USE_CMAKE_ICONV ON)
+  set(CMAKE_INSTALL_CMAKEDIR ${XP_INSTALL_CMAKEDIR})
+  set(nameSpace NAMESPACE ${XP_NAMESPACE}::)
 else()
-  set(XP_OPT_INSTALL TRUE)
+  set(CMAKE_OPT_INSTALL TRUE)
   set(USE_CMAKE_ICONV OFF)
+  set(CMAKE_INSTALL_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
 endif()
 
 # Build options

diff --git a/cmake/PkgBuildConfig.cmake b/cmake/PkgBuildConfig.cmake
@@ -72,7 +72,7 @@ function(pkg_build_config)
     endif()
     file(APPEND "${PKGCONFIG_FILE}" "Cflags: -I\${includedir} ${PKGCONFIG_CFLAGS}\n")
 
-    if(XP_OPT_INSTALL)
+    if(CMAKE_OPT_INSTALL)
     # Install .pc file
     install(FILES "${PKGCONFIG_FILE}" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
     endif()

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -454,4 +454,4 @@ INSTALL(TARGETS git2 EXPORT ${targetsFile}
 )
 INSTALL(DIRECTORY ${libgit2_SOURCE_DIR}/include/git2 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 INSTALL(FILES ${libgit2_SOURCE_DIR}/include/git2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-install(EXPORT ${targetsFile} DESTINATION ${XP_INSTALL_CMAKEDIR} ${nameSpace})
+install(EXPORT ${targetsFile} DESTINATION ${CMAKE_INSTALL_CMAKEDIR} ${nameSpace})
+106 −0		.github/actions/cmake-build/action.yml
+10 −16		.github/wf-templates/xpbuild.yml
+1 −2		.github/wf-templates/xprelease.yml
+52 −8		.github/workflows/README.md
+59 −70		.github/workflows/build-linux.yml
+7 −45		.github/workflows/build-macos.yml
+7 −53		.github/workflows/build-windows.yml
+72 −119		.github/workflows/release-from-build.yml
+3 −3		README.md
+0 −40		cmake/Findexdlpro.cmake
+63 −63		cmake/README.md
+1 −1		cmake/cpack/README.md
+62 −14		cmake/deps.cmake
+3 −2		cmake/deps.dot
+ −		cmake/deps.png
+499 −0		cmake/deps.svg
+0 −0		cmake/legacy/Findscript.cmake.in
+0 −0		cmake/legacy/cmsappendsuffix.cmake
+0 −0		cmake/legacy/cmsconfigurefile.cmake
+0 −0		cmake/legacy/cmscopyfilemd5.cmake
+0 −0		cmake/legacy/cmscopyfiles.cmake
+0 −0		cmake/legacy/cmscopymanuals.cmake
+0 −0		cmake/legacy/cmsdownload.cmake
+0 −0		cmake/legacy/launchWorkflow.cmake
+0 −0		cmake/legacy/macpro.cmake
+0 −1		cmake/legacy/sync.cmake
+0 −0		cmake/legacy/sync.sh.in
+928 −0		cmake/legacy/xpfunmac.cmake
+0 −0		cmake/legacy/xpopts.cmake.in
+0 −0		cmake/legacy/xpsolpkg.cmake
+0 −67		cmake/presets/xpDarwinMakefilesRelease.json
+0 −67		cmake/presets/xpLinuxMakefilesRelease.json
+121 −206		cmake/pros.cmake
+0 −7		cmake/usexp.cmake.in
+0 −22		cmake/usexpdev.cmake.in
+0 −0		cmake/web/NodePath.cmake
+0 −0		cmake/web/version.js.in
+0 −0		cmake/web/version.ts.in
+0 −0		cmake/web/versionjs.cmake
+0 −0		cmake/web/xpweb.cmake
+343 −1,050		cmake/xpfunmac.cmake
+6 −0		cmake/xproinc.cmake
+0 −1		cmake/xptoplevel.cmake
+6 −5		cmake/xpuse.cmake.in
+0 −1		compose.bld.sh
+0 −1		compose.ci.sh
+1 −1		compose.gpu.sh
+1 −2		compose.pro.sh
+0 −6		compose.xdl.sh
+7 −73		denv.sh
+66 −32		funcs.sh
+15 −10		graph/graph.dot
+ −		graph/graph.png
+1 −1		local.dockerfile
+90 −0		tools.sh