manifest update

.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.1
     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.1
     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.1
     secrets: inherit

.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.1
     with:
       workflow_run_url: ${{ github.event.inputs.workflow_run_url }}
-      artifact_pattern: "*.tar.xz"
     permissions:
       contents: write
       id-token: write

CMakeLists.txt

@@ -1,16 +1,18 @@
 cmake_minimum_required(VERSION 3.31)
 set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES .devcontainer/cmake/xproinc.cmake)
 project(libexpat)
-include(GNUInstallDirs)
-include(xpflags)
-set(lib expat)
-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()
+string(JOIN "\n" ALIASES
+  "if(NOT TARGET EXPAT::EXPAT)"
+  "  add_library(EXPAT::EXPAT ALIAS ${XP_NAMESPACE}::expat)"
+  "endif()"
+  ""
+  )
 set(targetsFile ${PROJECT_NAME}-targets)
-xpPackageDevel(TARGETS_FILE ${targetsFile} LIBRARIES ${lib})
+xpExternPackage(NAMESPACE ${XP_NAMESPACE}
+  TARGETS_FILE ${targetsFile} LIBRARIES expat
+  BASE R_2_2_5 XPDIFF "patch"
+  WEB "https://libexpat.github.io" UPSTREAM "github.com/libexpat/libexpat"
+  DESC "a stream-oriented XML parser library written in C"
+  LICENSE "[MIT](https://github.com/libexpat/libexpat/blob/R_2_2_5/expat/COPYING 'MIT License')"
+  )
 add_subdirectory(expat)

expat/CMakeLists.txt

@@ -140,6 +140,9 @@ endmacro()
 expat_install(TARGETS expat EXPORT ${targetsFile} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
                       LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
                       ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+if(DEFINED XP_NAMESPACE)
+  set(nameSpace NAMESPACE ${XP_NAMESPACE}::)
+endif()
 expat_install(EXPORT ${targetsFile} DESTINATION ${XP_INSTALL_CMAKEDIR} ${nameSpace})
 
 set(prefix ${CMAKE_INSTALL_PREFIX})