eden-emu/eden
24
3
Fork 15
Code Issues 138 Pull requests 56 Projects 1 Releases Packages Wiki Activity Actions

update spirv-headers, fix cpmutil scripts
Some checks failed
eden-license / license-header (pull_request) Failing after 26s
Details

Browse source 
Signed-off-by: crueter <crueter@eden-emu.dev>
This commit is contained in:
crueter 2025-10-04 14:11:54 -04:00
parent a415b41064
commit fb8f9e5698
Signed by: crueter
GPG key ID: 425ACD2D4830EBC6
4 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
externals/cpmfile.json vendored
View file

@ -125,8 +125,8 @@
"spirv-headers": { "spirv-headers": {
"package": "SPIRV-Headers", "package": "SPIRV-Headers",
"repo": "KhronosGroup/SPIRV-Headers", "repo": "KhronosGroup/SPIRV-Headers",
"sha": "4e209d3d7e", "sha": "01e0577914",
"hash": "f48bbe18341ed55ea0fe280dbbbc0a44bf222278de6e716e143ca1e95ca320b06d4d23d6583fbf8d03e1428f3dac8fa00e5b82ddcd6b425e6236d85af09550a4", "hash": "d0f905311faf7d743de686fdf241dc4cb0a4f08e2184f5a3b3b2946e680db3cd89eeb72954eafe6fa457f93550e27d516575c8709cb134d8aecc0b43064636ce",
"options": [ "options": [
"SPIRV_WERROR OFF" "SPIRV_WERROR OFF"
] ]

3
tools/cpm/common.sh
View file

@ -15,7 +15,8 @@ MAXDEPTH=3
# shellcheck disable=SC2038 # shellcheck disable=SC2038
# shellcheck disable=SC2016 # shellcheck disable=SC2016
[ -z "$PACKAGES" ] && PACKAGES=$(find "$DIRS" -maxdepth "$MAXDEPTH" -name cpmfile.json | xargs jq -s 'reduce .[] as $item ({}; . * $item)') # shellcheck disable=SC2086
[ -z "$PACKAGES" ] && PACKAGES=$(find $DIRS -maxdepth "$MAXDEPTH" -name cpmfile.json | xargs jq -s 'reduce .[] as $item ({}; . * $item)')
# For your project you'll want to change the PACKAGES call to include whatever locations you may use (externals, src, etc.) # For your project you'll want to change the PACKAGES call to include whatever locations you may use (externals, src, etc.)
# Always include . # Always include .

7
tools/cpm/format.sh
View file

@ -3,8 +3,11 @@
# SPDX-FileCopyrightText: 2025 crueter # SPDX-FileCopyrightText: 2025 crueter
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
# like common.sh, change for your directories # shellcheck disable=SC1091
FILES=$(find "$DIRS" -maxdepth "$MAXDEPTH" -name cpmfile.json) . tools/cpm/common.sh
# shellcheck disable=SC2086
FILES=$(find $DIRS -maxdepth "$MAXDEPTH" -name cpmfile.json)
for file in $FILES; do for file in $FILES; do
jq --indent 4 < "$file" > "$file".new jq --indent 4 < "$file" > "$file".new

6
tools/cpm/which.sh
View file

@ -4,9 +4,11 @@
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
# check which file a package is in # check which file a package is in
# shellcheck disable=SC1091
. tools/cpm/common.sh
# like common.sh, change for your directories # shellcheck disable=SC2086
JSON=$(find "$DIRS" -maxdepth "$MAXDEPTH" -name cpmfile.json -exec grep -l "$1" {} \;) JSON=$(find $DIRS -maxdepth "$MAXDEPTH" -name cpmfile.json -exec grep -l "$1" {} \;)
[ -z "$JSON" ] && echo "!! No cpmfile definition for $1" [ -z "$JSON" ] && echo "!! No cpmfile definition for $1"