diff --git a/NEWS.md b/NEWS.md index 4ab39afc3..c03e8a9b4 100644 --- a/NEWS.md +++ b/NEWS.md @@ -9,6 +9,11 @@ * mkvmerge: AVI reader: added support for reading the video aspect ratio from the video properties header (`vprp` chunk) if present and setting the display dimensions accordingly. Implements #2993. +* Windows installer: the `bluray_dump` command-line utility will be installed + into the `tools` sub-directory. `bluray_dump` can read & dump certain file + types used on Blu-rays: `.mpls` playlists, `.clpi` clip information + databases, `.bdmv` index files, `bdmt_….xml` disc library databases and + `tnmt_….xml` track & chapter name databases. # Version 52.0.0 "Secret For The Mad" 2021-01-04 diff --git a/packaging/windows/installer/mkvtoolnix.nsi b/packaging/windows/installer/mkvtoolnix.nsi index 208c5bbf5..f8660a498 100644 --- a/packaging/windows/installer/mkvtoolnix.nsi +++ b/packaging/windows/installer/mkvtoolnix.nsi @@ -160,6 +160,7 @@ Section "Program files" SEC01 File /r "../examples" File /r "../locale" File /r "../share" + File /r "../tools" ; Both if Qt is linked shared and if Dr. MinGW is used: File /nonfatal "../*.dll" @@ -423,6 +424,7 @@ Section Uninstall RMDir /r "$INSTDIR\locale" RMDir /r "$INSTDIR\plugins" RMDir /r "$INSTDIR\share" + RMDir /r "$INSTDIR\tools" RMDir "$INSTDIR" DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" diff --git a/packaging/windows/populate_installer_dir.sh b/packaging/windows/populate_installer_dir.sh index 42e0dd9bc..83acae90c 100755 --- a/packaging/windows/populate_installer_dir.sh +++ b/packaging/windows/populate_installer_dir.sh @@ -31,7 +31,7 @@ function strip_files { print -n -- "Stripping files…" cd ${tgt_dir} - ${host}-strip *.exe **/*.dll + ${host}-strip **/*.exe **/*.dll print -- " done" } @@ -131,6 +131,9 @@ function copy_files { cp src/*.exe src/mkvtoolnix-gui/*.exe packaging/windows/installer/*.url ${tgt_dir}/ cp share/icons/windows/mkvtoolnix-gui.ico ${tgt_dir}/installer/ + mkdir ${tgt_dir}/tools + cp src/tools/bluray_dump.exe ${tgt_dir}/tools/ + cp ${mxe_usr_dir}/share/misc/magic.mgc ${tgt_dir}/share/misc/ cp share/sounds/* ${tgt_dir}/data/sounds/ touch ${tgt_dir}/data/portable-app