[vlc-commits] [Git][videolan/vlc][master] 5 commits: package/win32: remove TODO

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
b82f5ed3 by Steve Lhomme at 2026-10-18T02:34:41+00:00
package/win32: remove TODO

wix/msi support was added in d03149478b43b2d396f5a1a6c136aecde3e3cf48

- - - - -
d2706a28 by Steve Lhomme at 2026-10-18T02:34:41+00:00
package/win32: add meson support for package_win32_7zip/package_win32_debug_7zip

These targets need to be called after meson install, like the NSIS and MSI packages.

- - - - -
ce9faf60 by Steve Lhomme at 2026-10-18T02:34:41+00:00
package/win32: generate 7z stripped package with meson

unstripped is not supported yet as meson doesn't install the .pdb
files as it only understands this for MSVC.

- - - - -
47b31b7a by Steve Lhomme at 2026-10-18T02:34:41+00:00
package/win32: generate the exe/msi hashes for unsigned meson builds

- - - - -
7ee44ffc by Steve Lhomme at 2026-10-18T02:34:41+00:00
package/win32: add msi install target in meson

- - - - -


2 changed files:

- extras/package/win32/build.sh
- extras/package/win32/meson.build


Changes:

=====================================
extras/package/win32/build.sh
=====================================
@@ -663,22 +663,20 @@ if [ -n "$BUILD_MESON" ]; then
     MINSTALLFLAGS="--strip --no-rebuild $MINSTALLFLAGS"
 
     if [ "$INSTALLER" = "n" ]; then
-        VLC_GIT_TAG="$(git describe --tags --long --match '?.*.*' --always)"
-
         meson install -C ${BUILD_PATH}/$SHORTARCH-meson ${MINSTALLFLAGS}
+        ninja -C ${BUILD_PATH}/$SHORTARCH-meson package-win32-7zip
+
         if [ -z "$WINSTORE" ]; then
             # generate .exe installer
             ninja -C ${BUILD_PATH}/$SHORTARCH-meson package-win32-exe
             # generate .msi installer
             ninja -C ${BUILD_PATH}/$SHORTARCH-meson package-msi
         fi
-
-        rm -rf ${BUILD_PATH}/$SHORTARCH-meson/vlc-$SHORTARCH-$VLC_GIT_TAG-debug.7z
-        cd ${BUILD_PATH}/$SHORTARCH-meson && \
-            7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on vlc-$SHORTARCH-$VLC_GIT_TAG-debug.7z vlc-$SHORTARCH
     elif [ "$INSTALLER" = "r" ]; then
         meson dist -C ${BUILD_PATH}/$SHORTARCH-meson -j$JOBS --no-tests
         meson install -C ${BUILD_PATH}/$SHORTARCH-meson ${MINSTALLFLAGS}
+        ninja -C ${BUILD_PATH}/$SHORTARCH-meson package-win32-7zip
+
         if [ -z "$WINSTORE" ]; then
             # generate .exe installer
             ninja -C ${BUILD_PATH}/$SHORTARCH-meson package-win32-exe
@@ -687,12 +685,19 @@ if [ -n "$BUILD_MESON" ]; then
         fi
     elif [ "$INSTALLER" = "u" ]; then
         meson install -C ${BUILD_PATH}/$SHORTARCH-meson ${MINSTALLFLAGS}
+        ninja -C ${BUILD_PATH}/$SHORTARCH-meson package-win32-7zip
+
         if [ -z "$WINSTORE" ]; then
             # generate .exe installer
             ninja -C ${BUILD_PATH}/$SHORTARCH-meson package-win32-exe
             # generate .msi installer
             ninja -C ${BUILD_PATH}/$SHORTARCH-meson package-msi
+            sha512sum vlc-*-*.exe
+            sha512sum vlc-*-*.msi
         fi
+    elif [ "$INSTALLER" = "m" ]; then
+        meson install -C ${BUILD_PATH}/$SHORTARCH-meson ${MINSTALLFLAGS}
+        ninja -C ${BUILD_PATH}/$SHORTARCH-meson package-msi
     elif [ -n "$INSTALL_PATH" ]; then
         meson install -C ${BUILD_PATH}/$SHORTARCH-meson ${MINSTALLFLAGS}
     fi


=====================================
extras/package/win32/meson.build
=====================================
@@ -1,5 +1,3 @@
-# TODO handle msi packaging
-
 install_data('../../../AUTHORS',   rename : 'AUTHORS.txt', install_dir : '.')
 install_data('../../../COPYING',   rename : 'COPYING.txt', install_dir : '.')
 install_data('../../../NEWS',      rename : 'NEWS.txt',    install_dir : '.')
@@ -32,3 +30,27 @@ if get_option('wix').disable_auto_if(
     host_system != 'windows' or have_win_store).allowed()
     subdir('msi')
 endif
+
+sevenz = find_program('7z', required: false)
+if sevenz.found()
+    sevenz_opts = ['-t7z', '-m0=lzma', '-mx=9', '-mfb=64', '-md=32m', '-ms=on']
+    release_7z = 'vlc-' + vlc_version + '-' + winstaller_suffix + '.7z'
+    debug_7z   = 'vlc-' + vlc_version + '-' + winstaller_suffix + '-debug.7z'
+
+    # generate a 7z from the "installed" and stripped folder
+    package_win32_7zip = custom_target(
+        output: release_7z, # real name but located in root build folder
+        command: [sevenz, 'a', sevenz_opts, release_7z, prefix_path],
+        console: true,
+    )
+    alias_target('package-win32-7zip', package_win32_7zip)
+
+    # generate a 7z from the "installed" folder with debug symbols
+    package_win32_debug_7zip = custom_target(
+        output: debug_7z, # real name but located in root build folder
+        command: [sevenz, 'a', sevenz_opts, debug_7z, prefix_path],
+        console: true,
+    )
+    # disabled for now as meson doesn't understand we are building with .pdb files
+    # alias_target('package-win32-debug-7zip', package_win32_debug_7zip)
+endif



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/c4e7f2201a42fa886ee3748f8acad6f639161afd...7ee44ffc93821fee267b5d35fa2b1719bb790880

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/c4e7f2201a42fa886ee3748f8acad6f639161afd...7ee44ffc93821fee267b5d35fa2b1719bb790880
You're receiving this email because of your account on code.videolan.org. Manage all notifications: https://code.videolan.org/-/profile/notifications | Help: https://code.videolan.org/help