[vlc-commits] [Git][videolan/vlc][master] 6 commits: meson: use cmake format to configure .nsi files

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
71b80cb7 by Steve Lhomme at 2026-10-10T12:59:26+02:00
meson: use cmake format to configure .nsi files

meson doesn't replace the strings with a \ in front otherwise.

- - - - -
f1e37b0d by Steve Lhomme at 2026-10-10T13:00:18+02:00
package/win32: add space to escape autotools values

meson doesn't escape the strings properly if they are glued together [^1].

[^1]: https://github.com/mesonbuild/meson/issues/16245

- - - - -
7c75bad6 by Steve Lhomme at 2026-10-10T13:00:22+02:00
package/win32: use the product name for the launch on exit

- - - - -
e6786195 by Steve Lhomme at 2026-10-10T13:00:22+02:00
package/win32: do not register skins if not build

- - - - -
935d44af by Steve Lhomme at 2026-10-10T13:00:22+02:00
package/win32: do not try to install locale folder if disabled

- - - - -
925460a2 by Steve Lhomme at 2026-10-10T13:00:22+02:00
package/win32: use the regular comment character for NSIS with meson

The autotools replacement is not flexible and luckily '#' is accepted.
But it's better to use the same one already used in the file.

- - - - -


3 changed files:

- extras/package/win32/NSIS/meson.build
- extras/package/win32/NSIS/vlc.win32.nsi.in
- extras/package/win32/msi/product.wxs


Changes:

=====================================
extras/package/win32/NSIS/meson.build
=====================================
@@ -5,13 +5,14 @@ makensis = find_program('makensis', required: nsis_required)
 
 nsi_conf = configuration_data()
 nsi_conf.merge_from(cdata)
-nsi_conf.set('BUILD_LUA_TRUE', lua_dep.found() and get_option('lua').allowed() ? '' : '#')
-nsi_conf.set('BUILD_SKINS_TRUE', skins2_feasible ? '' : '#')
-nsi_conf.set('HAVE_WIN64_TRUE',  have_win64 ? '' : '#')
-nsi_conf.set('HAVE_WIN64_FALSE', have_win64 ? '#' : '')
-nsi_conf.set('HAVE_ARM64_TRUE',  host_machine.cpu_family() == 'aarch64' or host_machine.cpu() == 'arm64' ? '' : '#')
-nsi_conf.set('HAVE_ARM64_FALSE', host_machine.cpu_family() == 'aarch64' or host_machine.cpu() == 'arm64' ? '#' : '')
+nsi_conf.set('BUILD_LUA_TRUE', lua_dep.found() and get_option('lua').allowed() ? '' : ';')
+nsi_conf.set('BUILD_SKINS_TRUE', skins2_feasible ? '' : ';')
+nsi_conf.set('HAVE_WIN64_TRUE',  have_win64 ? '' : ';')
+nsi_conf.set('HAVE_WIN64_FALSE', have_win64 ? ';' : '')
+nsi_conf.set('HAVE_ARM64_TRUE',  host_machine.cpu_family() == 'aarch64' or host_machine.cpu() == 'arm64' ? '' : ';')
+nsi_conf.set('HAVE_ARM64_FALSE', host_machine.cpu_family() == 'aarch64' or host_machine.cpu() == 'arm64' ? ';' : '')
 nsi_conf.set('PROGRAMFILES', have_win64 ? 'PROGRAMFILES64' : 'PROGRAMFILES')
+nsi_conf.set('HAVE_NLS_TRUE', nsi_conf.get('ENABLE_NLS', 0) == 1 ? '' : ';')
 
 nsProcess_cargs = ['-D_UNICODE=1', '-DUNICODE=1']
 if not have_win64
@@ -57,6 +58,7 @@ vlc_nsi = configure_file(
   input: 'vlc.win32.nsi.in',
   output: 'vlc.win32.nsi',
   configuration: nsi_conf,
+  format: 'cmake@',
   install: true,
   install_dir: '.',
 )
@@ -65,6 +67,7 @@ spad_nsi = configure_file(
   input: 'spad.nsi.in',
   output: 'spad.nsi',
   configuration: nsi_conf,
+  format: 'cmake@',
   install: true,
   install_dir: '.',
 )


=====================================
extras/package/win32/NSIS/vlc.win32.nsi.in
=====================================
@@ -45,8 +45,8 @@ Var 32bitPath
 
 Name "${PRODUCT_NAME}"
 @HAVE_WIN64_FALSE@                   OutFile ..\vlc-${VERSION}-win32.exe
- at HAVE_WIN64_TRUE@@HAVE_ARM64_FALSE@  OutFile ..\vlc-${VERSION}-win64.exe
- at HAVE_WIN64_TRUE@@HAVE_ARM64_TRUE@   OutFile ..\vlc-${VERSION}-winarm64.exe
+ at HAVE_WIN64_TRUE@ @HAVE_ARM64_FALSE@ OutFile ..\vlc-${VERSION}-win64.exe
+ at HAVE_WIN64_TRUE@ @HAVE_ARM64_TRUE@  OutFile ..\vlc-${VERSION}-winarm64.exe
 InstallDir "$@PROGRAMFILES@\${PRODUCT_PUBLISHER}\VLC"
 !ifdef NSIS_LZMA_COMPRESS_WHOLE
 SetCompressor lzma
@@ -317,7 +317,7 @@ skip_uninstall32_cleanup:
 
   ; Subfolders
   !insertmacro InstallFolder plugins
-  !insertmacro InstallFolderOptional locale
+ at HAVE_NLS_TRUE@ !insertmacro InstallFolderOptional locale
   !insertmacro InstallFolder hrtfs
 @BUILD_SKINS_TRUE@   !insertmacro InstallFolder skins
 @BUILD_LUA_TRUE@     !insertmacro InstallFolder lua
@@ -345,7 +345,7 @@ skip_uninstall32_cleanup:
   WriteRegStr HKCR Applications\vlc.exe\shell\Open "" "$(ContextMenuEntry_PlayWith)"
   WriteRegStr HKCR Applications\vlc.exe\shell\Open\command "" '"$INSTDIR\vlc.exe" --started-from-file "%1"'
   !insertmacro MacroAllExtensions RegisterExtensionMacro
-  !insertmacro MacroSkinExtensions RegisterSkinExtensionMacro
+ at BUILD_SKINS_TRUE@   !insertmacro MacroSkinExtensions RegisterSkinExtensionMacro
 
   ; Add VLC to "App Paths" to run VLC from ShellExecute/ShellExecuteEx/run dialog without giving a full path
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\App Paths\vlc.exe" "" "$INSTDIR\vlc.exe"


=====================================
extras/package/win32/msi/product.wxs
=====================================
@@ -360,7 +360,7 @@
                       Impersonate   = "yes"
                       Return        = "asyncNoWait" />
         <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT"
-          Value="Launch VLC media player when setup exits." />
+          Value="Launch $(var.ProductName) when setup exits." />
         <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOX" Value="1" />
 
         <UI>



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/936ed5b2bb350e0f4e1ed803d3133dbadf6c301e...925460a269aeddfc0216e483983423764ee26cf8

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/936ed5b2bb350e0f4e1ed803d3133dbadf6c301e...925460a269aeddfc0216e483983423764ee26cf8
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