Skip to content

Commit 43f51b9

Browse files
committed
CI Windows: generic bundling DLLs in bin/
Do not consider screen-capture-recorder-x64.dll as a specific case - the bundling is exactly the same as for the exe files. Also, screen-capture-recorder-x64.dll may either not be present or another DLLs needing bundling present as well.
1 parent bf99d54 commit 43f51b9

2 files changed

Lines changed: 4 additions & 7 deletions

File tree

.github/workflows/windows.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ jobs:
120120
run: |
121121
export DESTDIR=build/UltraGrid-$VERSION-win64
122122
make install
123-
for exe in "$DESTDIR"/*.exe; do
124-
data/scripts/get_dll_depends.sh "$exe" |
123+
for bin in $(find "$DESTDIR" \( -name "*.dll" -o -name "*.exe" \)); do
124+
data/scripts/get_dll_depends.sh "${bin?}" |
125125
while read -r n; do cp "$n" "$DESTDIR"; done
126126
done
127127
if command -v windeployqt-qt6 >/dev/null; then
@@ -130,10 +130,7 @@ jobs:
130130
windeployqt "$DESTDIR/uv-qt.exe"
131131
fi
132132
cp -r data/Windows/* "$DESTDIR"
133-
data/scripts/get_dll_depends.sh\
134-
"$DESTDIR/screen-capture-recorder-x64.dll" |
135-
while read -r n; do cp "$n" "$DESTDIR"; done
136-
133+
137134
if [ -f "$DESTDIR"/libomt.dll ]; then
138135
cp /usr/local/bin/libvmx.dll "$DESTDIR"
139136
fi

data/scripts/get_dll_depends.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ INITIAL=$1 # save root element to skip the program itself
4444

4545
while test $# -gt 0; do
4646
# skip already processed item
47-
if [ -n "${DLL_DONE[$1]}" ]; then
47+
if [ -n "${DLL_DONE[${1?}]}" ]; then
4848
shift
4949
continue
5050
fi

0 commit comments

Comments
 (0)