Skip to content

manifest update #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smanders merged 5 commits into from
Jan 16, 2026
Merged

manifest update #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
21ae3ab
externpro 25.07.3-9-gaca2ba8
smanders Jan 15, 2026
0d8036d
workflows: externpro@25.07.3
smanders Jan 15, 2026
ef0a82b
CMakePresets: updates from externpro cmake/presets
smanders Jan 15, 2026
bddda49
CMakePresetsBase: add XP_NAMESPACE to cacheVariables
smanders Jan 15, 2026
8729198
cmake: xproinc enhancements and xpExternPackage()
smanders Jan 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer
Open in desktop
Submodule .devcontainer updated 69 files
+185 −0 .github/actions/cmake-build/action.yml
+10 −16 .github/wf-templates/xpbuild.yml
+1 −2 .github/wf-templates/xprelease.yml
+61 −17 .github/workflows/README.md
+67 −60 .github/workflows/build-linux.yml
+7 −35 .github/workflows/build-macos.yml
+7 −43 .github/workflows/build-windows.yml
+75 −122 .github/workflows/release-from-build.yml
+232 −0 .windsurf/workflows/manifestUpdate.md
+3 −3 README.md
+0 −40 cmake/Findexdlpro.cmake
+0 −78 cmake/Findwebpro.cmake
+79 −68 cmake/README.md
+0 −17 cmake/cmswxconfig.cmake
+1 −1 cmake/cpack/README.md
+78 −13 cmake/deps.cmake
+9 −9 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
+1 −2 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
+6 −0 cmake/presets/CMakePresetsBase.json
+0 −67 cmake/presets/xpDarwinMakefilesRelease.json
+23 −0 cmake/presets/xpDarwinNinja.json
+23 −0 cmake/presets/xpLinuxNinja.json
+29 −16 cmake/presets/xpLinuxNinjaTargets.json
+23 −0 cmake/presets/xpWindowsVs2022.json
+313 −377 cmake/pros.cmake
+38 −60 cmake/pros.md
+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
+82 −139 cmake/web/xpweb.cmake
+0 −30 cmake/xpboost.cmake
+192 −14 cmake/xpcfg.cmake
+349 −1,075 cmake/xpfunmac.cmake
+6 −0 cmake/xproinc.cmake
+1 −2 cmake/xptoplevel.cmake
+6 −5 cmake/xpuse.cmake.in
+0 −1 compose.bld.sh
+0 −1 compose.bld.yml
+0 −1 compose.ci.sh
+1 −1 compose.gpu.sh
+0 −1 compose.gpu.yml
+1 −2 compose.pro.sh
+0 −6 compose.xdl.sh
+7 −90 denv.sh
+66 −32 funcs.sh
+44 −0 git_hooks_pre-commit
+15 −10 graph/graph.dot
+ − graph/graph.png
+1 −6 local.dockerfile
+90 −0 tools.sh
+84 −0 xp.svg
13 changes: 3 additions & 10 deletions .github/workflows/xpbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,17 @@ on:
workflow_dispatch:
jobs:
linux:
uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.1
uses: externpro/externpro/.github/workflows/build-linux.yml@25.07.3
with:
cmake-workflow-preset: LinuxRelease
runon: ubuntu-latest
secrets: inherit
linux-arm64:
uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.1
with:
cmake-workflow-preset: LinuxRelease
runon: ubuntu-24.04-arm
secrets: inherit
macos:
uses: externpro/externpro/.github/workflows/build-macos.yml@25.05.1
uses: externpro/externpro/.github/workflows/build-macos.yml@25.07.3
with:
cmake-workflow-preset: DarwinRelease
secrets: inherit
windows:
uses: externpro/externpro/.github/workflows/build-windows.yml@25.05.1
uses: externpro/externpro/.github/workflows/build-windows.yml@25.07.3
with:
cmake-workflow-preset: WindowsRelease
secrets: inherit
3 changes: 1 addition & 2 deletions .github/workflows/xprelease.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.05.1
uses: externpro/externpro/.github/workflows/release-from-build.yml@25.07.3
with:
workflow_run_url: ${{ github.event.inputs.workflow_run_url }}
artifact_pattern: "*.tar.xz"
permissions:
contents: write
id-token: write
Expand Down
18 changes: 12 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
cmake_minimum_required(VERSION 3.31)
set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES .devcontainer/cmake/xproinc.cmake)
project(libiconv VERSION 1.18)
include(GNUInstallDirs)
include(xpflags)
set(XP_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake)
set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME devel)
set(libName xpro::${PROJECT_NAME})
if(DEFINED XP_NAMESPACE)
set(nameSpace ${XP_NAMESPACE}::)
endif()
set(libName ${nameSpace}${PROJECT_NAME})
if(WIN32)
install(FILES iconv.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
install(FILES x64/ReleaseStatic/libiconvStatic.lib DESTINATION ${CMAKE_INSTALL_LIBDIR})
Expand Down Expand Up @@ -44,4 +43,11 @@ else()
""
)
endif()
xpPackageDevel()
if(DEFINED XP_NAMESPACE)
xpExternPackage(NAMESPACE ${XP_NAMESPACE}
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](https://savannah.gnu.org/projects/libiconv/ 'LGPL version 2.1')"
)
endif()
11 changes: 10 additions & 1 deletion CMakePresetsBase.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,16 @@
{
"name": "config-base",
"hidden": true,
"binaryDir": "${sourceDir}/_bld-${presetName}"
"binaryDir": "${sourceDir}/_bld-${presetName}",
"cacheVariables": {
"XP_NAMESPACE": "xpro"
}
}
],
"buildPresets": [
{
"name": "build-base",
"hidden": true
}
]
}