[vlc-commits] [Git][videolan/vlc][3.0.x] 2 commits: package/win32: do not add .pdb files in the NSIS package

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC


Commits:
6c2749a2 by Steve Lhomme at 2024-12-05T08:42:36+00:00
package/win32: do not add .pdb files in the NSIS package

Fixes #28885

(cherry picked from commit cfa511f3178735ca0d8873a1c26a0e360a3d2c63)

- - - - -
1700e287 by Steve Lhomme at 2024-12-05T08:42:36+00:00
package/win32: fix MSI installation text on Windows arm64

When installing files the messages are like:
Copying new files: File: [1], Directory: [9], Size: [6]

It only happens on Windows arm64, but we can apply this to all targets
to have a consistent experience.

Found the fix in https://stackoverflow.com/a/44182276

Fixes #28887

(cherry picked from commit c9f967f5d6fc76ddcac032fe35aefe3128101c9f)

- - - - -


2 changed files:

- extras/package/win32/NSIS/helpers/install.nsh
- extras/package/win32/msi/product.wxs


Changes:

=====================================
extras/package/win32/NSIS/helpers/install.nsh
=====================================
@@ -31,7 +31,7 @@
 
 !macro InstallFolder FOLDER
   SetOutPath "$INSTDIR\${FOLDER}"
-  File /r "${FOLDER}\*.*"
+  File /r /x "${FOLDER}\*.pdb" "${FOLDER}\*.*"
   SetOutPath "$INSTDIR"
   Push "${FOLDER}"
   Call InstallFolderInternal
@@ -39,7 +39,7 @@
 
 !macro InstallFolderOptional FOLDER
   SetOutPath "$INSTDIR\${FOLDER}"
-  File /nonfatal /r "${FOLDER}\*.*"
+  File /nonfatal /r /x "${FOLDER}\*.pdb" "${FOLDER}\*.*"
   SetOutPath "$INSTDIR"
   Push "${FOLDER}"
   Call InstallFolderInternal


=====================================
extras/package/win32/msi/product.wxs
=====================================
@@ -334,6 +334,7 @@
         </Feature>
 
         <UIRef Id="WixUI_Advanced" />
+        <UIRef Id="WixUI_ErrorProgressText" />
 
         <InstallExecuteSequence>
             <!-- <RemoveExistingProducts After="InstallValidate" /> -->



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/3afe12167a72af766740b8277d878167e9366508...1700e28723cb48ce70ef63d775c19cdcb138313e

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/3afe12167a72af766740b8277d878167e9366508...1700e28723cb48ce70ef63d775c19cdcb138313e
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance