externpro 26.01.2-16-g17d3437 sync

.github/release-tag.json

@@ -0,0 +1,4 @@
+{
+  "message": "xpro version 1.18.9 tag",
+  "tag": "xpv1.18.9"
+}

.github/workflows/xpbuild.yml

@@ -14,17 +14,18 @@ jobs:
       contents: read
       pull-requests: write
       packages: write
-    uses: externpro/externpro/.github/workflows/build-linux.yml@25.07.6
+    uses: externpro/externpro/.github/workflows/build-linux.yml@26.01.2
+    secrets:
+      automation_token: ${{ secrets.GHCR_TOKEN }}
     with:
-      cmake-workflow-preset: LinuxRelease
-    secrets: inherit
+      cmake_workflow_preset_suffix: Release
   macos:
-    uses: externpro/externpro/.github/workflows/build-macos.yml@25.07.6
-    with:
-      cmake-workflow-preset: DarwinRelease
+    uses: externpro/externpro/.github/workflows/build-macos.yml@26.01.2
     secrets: inherit
-  windows:
-    uses: externpro/externpro/.github/workflows/build-windows.yml@25.07.6
     with:
-      cmake-workflow-preset: WindowsRelease
+      cmake_workflow_preset_suffix: Release
+  windows:
+    uses: externpro/externpro/.github/workflows/build-windows.yml@26.01.2
     secrets: inherit
+    with:
+      cmake_workflow_preset_suffix: Release

.github/workflows/xprelease.yml

@@ -34,7 +34,7 @@ jobs:
   # Upload build artifacts as release assets
   release-from-build:
     if: github.event_name == 'workflow_dispatch'
-    uses: externpro/externpro/.github/workflows/release-from-build.yml@25.07.6
+    uses: externpro/externpro/.github/workflows/release-from-build.yml@26.01.2
     with:
       workflow_run_url: ${{ github.event.inputs.workflow_run_url }}
     permissions:

.github/workflows/xptag.yml

@@ -8,9 +8,9 @@ on:
 jobs:
   tag:
     if: ${{ github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'xpro' && contains(github.event.pull_request.labels.*.name, 'release:tag') }}
-    uses: externpro/externpro/.github/workflows/tag-release.yml@25.07.6
+    uses: externpro/externpro/.github/workflows/tag-release.yml@26.01.2
     with:
       merge_sha: ${{ github.event.pull_request.merge_commit_sha }}
       pr_number: ${{ github.event.pull_request.number }}
     secrets:
-      workflow_write_token: ${{ secrets.XPUPDATE_TOKEN }}
+      automation_token: ${{ secrets.XPRO_TOKEN }}

.gitignore

@@ -1,3 +1,4 @@
 .env
 _bld*/
 docker-compose.override.yml
+# externpro

CMakeLists.txt

@@ -1,10 +1,6 @@
-cmake_minimum_required(VERSION 3.31)
-set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES .devcontainer/cmake/xproinc.cmake)
+cmake_minimum_required(VERSION 4.3)
 project(libiconv VERSION 1.18)
-if(DEFINED XP_NAMESPACE)
-  set(nameSpace ${XP_NAMESPACE}::)
-endif()
-set(libName ${nameSpace}${PROJECT_NAME})
+set(libName ${PROJECT_NAME}::${PROJECT_NAME})
 if(WIN32)
   install(FILES iconv.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
   install(FILES x64/ReleaseStatic/libiconvStatic.lib DESTINATION ${CMAKE_INSTALL_LIBDIR})
@@ -43,9 +39,9 @@ else()
     ""
     )
 endif()
-if(DEFINED XP_NAMESPACE)
-  xpExternPackage(NAMESPACE ${XP_NAMESPACE}
-    LIBRARIES ${PROJECT_NAME} BASE v0 XPDIFF "bin"
+if(COMMAND xpExternPackage)
+  xpExternPackage(LIBRARIES ${PROJECT_NAME}
+    BASE v0 XPDIFF "bin"
     WEB "https://www.gnu.org/software/libiconv/" UPSTREAM "github.com/pffang/libiconv-for-Windows/releases/tag/1.18-eed6782"
     DESC "character set conversion library"
     LICENSE "[LGPL-2.1-or-later](https://savannah.gnu.org/projects/libiconv/ 'GNU Lesser General Public License v2.1 or later')"

CMakePresets.json

@@ -3,6 +3,7 @@
   "include": [
     ".devcontainer/cmake/presets/xpLinuxNinja.json",
     ".devcontainer/cmake/presets/xpDarwinNinja.json",
-    ".devcontainer/cmake/presets/xpWindowsVs2022.json"
+    ".devcontainer/cmake/presets/xpMswVs2022.json",
+    ".devcontainer/cmake/presets/xpMswVs2026.json"
   ]
 }

CMakePresetsBase.json

@@ -4,10 +4,7 @@
     {
       "name": "config-base",
       "hidden": true,
-      "binaryDir": "${sourceDir}/_bld-${presetName}",
-      "cacheVariables": {
-        "XP_NAMESPACE": "xpro"
-      }
+      "binaryDir": "${sourceDir}/_bld-${presetName}"
     }
   ],
   "buildPresets": [