Browse Source

Fix Windows deployment classification of AVRT.dll

master
evgeny 2 days ago
parent
commit
0b136ae2ab
  1. 2
      tools/chatgui/build.sh
  2. 3
      tools/chatgui/tests/test_runtime_deploy.sh

2
tools/chatgui/build.sh

@ -208,7 +208,7 @@ done
wtsapi32.dll|mpr.dll|ntdll.dll|avicap32.dll|msimg32.dll|wldap32.dll|gdiplus.dll|usp10.dll|\
dwrite.dll|winspool.drv|api-ms-win-*)
continue ;;
mf.dll|mfplat.dll|mfreadwrite.dll|mfuuid.dll|dxva2.dll|mmdevapi.dll|propsys.dll|ksuser.dll|msdmo.dll)
mf.dll|mfplat.dll|mfreadwrite.dll|mfuuid.dll|dxva2.dll|mmdevapi.dll|avrt.dll|propsys.dll|ksuser.dll|msdmo.dll)
continue ;;
esac
if [ ! -f "$BUILD_DIR/$dep" ]; then

3
tools/chatgui/tests/test_runtime_deploy.sh

@ -77,7 +77,7 @@ echo 'PASS: Qt6, Windows system DLLs (d3d9/SHCORE), matching platform/JPEG/WebP
# Multimedia plugin динамический: импорт exe сам по себе не гарантирует его поставку.
mkdir -p "$prefix/share/qt6/plugins/multimedia"
printf 'DLL Name: Qt6Gui.dll\n' > "$prefix/bin/Qt6Multimedia.dll"
printf 'DLL Name: Qt6Gui.dll\nDLL Name: AVRT.dll\n' > "$prefix/bin/Qt6Multimedia.dll"
printf 'DLL Name: Qt6Multimedia.dll\n' > "$prefix/bin/Qt6MultimediaWidgets.dll"
printf 'DLL Name: Qt6Multimedia.dll\nDLL Name: capture-helper.dll\nDLL Name: MFPlat.dll\n' > "$prefix/share/qt6/plugins/multimedia/ffmpegmediaplugin.dll"
printf 'DLL Name: KERNEL32.dll\n' > "$prefix/bin/capture-helper.dll"
@ -86,6 +86,7 @@ for name in Qt6Multimedia.dll Qt6MultimediaWidgets.dll multimedia/ffmpegmediaplu
assert_file "$case_dir/build/$name"
done
cmp "$case_dir/build/multimedia/ffmpegmediaplugin.dll" "$prefix/share/qt6/plugins/multimedia/ffmpegmediaplugin.dll"
if [ -f "$case_dir/build/AVRT.dll" ]; then echo 'FAIL: Windows system AVRT.dll deployed'; exit 1; fi
echo 'PASS: capture-enabled Qt6 deploys Multimedia, Widgets, FFmpeg plugin and plugin dependencies'
# Сбой подходящего инструмента не должен обходить обязательную проверку ручного комплекта.

Loading…
Cancel
Save