Skip to content

Commit defd07c

Browse files
authored
Merge pull request #8 from externpro/manifestUpdate
manifest update
2 parents fcd935f + 5626fad commit defd07c

File tree

5 files changed

+25
-17
lines changed

5 files changed

+25
-17
lines changed

.devcontainer

Submodule .devcontainer updated 68 files

.github/workflows/xpbuild.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
name: Build
2+
permissions:
3+
contents: read
4+
pull-requests: write
25
on:
36
push:
47
branches: [ "dev" ]
@@ -7,24 +10,21 @@ on:
710
workflow_dispatch:
811
jobs:
912
linux:
10-
uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.1
13+
permissions:
14+
contents: read
15+
pull-requests: write
16+
packages: write
17+
uses: externpro/externpro/.github/workflows/build-linux.yml@25.07.3
1118
with:
1219
cmake-workflow-preset: LinuxRelease
13-
runon: ubuntu-latest
14-
secrets: inherit
15-
linux-arm64:
16-
uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.1
17-
with:
18-
cmake-workflow-preset: LinuxRelease
19-
runon: ubuntu-24.04-arm
2020
secrets: inherit
2121
macos:
22-
uses: externpro/externpro/.github/workflows/build-macos.yml@25.05.1
22+
uses: externpro/externpro/.github/workflows/build-macos.yml@25.07.3
2323
with:
2424
cmake-workflow-preset: DarwinRelease
2525
secrets: inherit
2626
windows:
27-
uses: externpro/externpro/.github/workflows/build-windows.yml@25.05.1
27+
uses: externpro/externpro/.github/workflows/build-windows.yml@25.07.3
2828
with:
2929
cmake-workflow-preset: WindowsRelease
3030
secrets: inherit

.github/workflows/xprelease.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@ on:
99
jobs:
1010
# Upload build artifacts as release assets
1111
release-from-build:
12-
uses: externpro/externpro/.github/workflows/release-from-build.yml@25.05.1
12+
uses: externpro/externpro/.github/workflows/release-from-build.yml@25.07.3
1313
with:
1414
workflow_run_url: ${{ github.event.inputs.workflow_run_url }}
15-
artifact_pattern: "*.tar.xz"
1615
permissions:
1716
contents: write
1817
id-token: write

CMakeLists.txt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
cmake_minimum_required(VERSION 3.31)
22
set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES .devcontainer/cmake/xproinc.cmake)
33
project(patch VERSION 2.7.6)
4-
include(xpflags)
5-
include(GNUInstallDirs)
6-
set(XP_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake)
74
include(ExternalProject)
85
set_property(DIRECTORY PROPERTY "EP_BASE" ${CMAKE_BINARY_DIR}/epbase)
96
if(WIN32 AND NOT UNIX)
@@ -44,6 +41,12 @@ else()
4441
""
4542
)
4643
endif()
47-
xpPackageDevel(EXE_PATH ${patchExe})
44+
xpExternPackage(
45+
EXE_PATH ${patchExe}
46+
BASE v0 XPDIFF "bin(msw), native(unix)"
47+
WEB "https://savannah.gnu.org/projects/patch/" UPSTREAM "git.savannah.gnu.org/cgit/patch.git"
48+
DESC "takes a patch file containing a difference listing produced by the diff program and applies those differences to one or more original files, producing patched versions"
49+
LICENSE "[GPL-3.0](https://savannah.gnu.org/projects/patch/ 'GNU General Public License v3 or later')"
50+
)
4851
ExternalProject_Get_Property(${PROJECT_NAME} INSTALL_DIR)
4952
install(DIRECTORY ${INSTALL_DIR}/ DESTINATION . USE_SOURCE_PERMISSIONS)

CMakePresetsBase.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,11 @@
66
"hidden": true,
77
"binaryDir": "${sourceDir}/_bld-${presetName}"
88
}
9+
],
10+
"buildPresets": [
11+
{
12+
"name": "build-base",
13+
"hidden": true
14+
}
915
]
1016
}

0 commit comments

Comments
 (0)