Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
30611a9f by Steve Lhomme at 2025-09-13T06:05:29+00:00
package/win32: generate the .exe and .msi installer in release builds
So we don't have to generate package-win-strip again and possibly
have different binary signatures.
The .msi package generation is tricky and requires many calls. It's easier
to let the makefile do it.
- - - - -
2 changed files:
- extras/package/win32/build.sh
- extras/package/win32/package.mak
Changes:
=====================================
extras/package/win32/build.sh
=====================================
@@ -626,8 +626,10 @@ else
elif [ "$INSTALLER" = "r" ]; then
make package-win32
elif [ "$INSTALLER" = "u" ]; then
- make package-win32-release
+ make -j$JOBS package-win32-release package-win32-exe package-msi
sha512sum vlc-*-release.7z
+ sha512sum vlc-*-*.exe
+ sha512sum vlc-*-*.msi
elif [ "$INSTALLER" = "m" ]; then
make package-msi
elif [ -n "$INSTALL_PATH" ]; then
=====================================
extras/package/win32/package.mak
=====================================
@@ -128,16 +128,19 @@ else
$(STRIP) $@
endif
+package-win32-src: package-win-strip
if HAVE_MAKENSIS
-package-win32-exe: package-win-strip $(win32_destdir)/NSIS/nsProcess.dll
extras/package/win32/NSIS/vlc.win32.nsi
# Script installer
cp $(top_builddir)/extras/package/win32/NSIS/vlc.win32.nsi
"$(win32_destdir)/"
cp $(top_builddir)/extras/package/win32/NSIS/spad.nsi
"$(win32_destdir)/"
- cp -r $(srcdir)/extras/package/win32/NSIS/languages
"$(win32_destdir)/"
- cp -r $(srcdir)/extras/package/win32/NSIS/helpers
"$(win32_destdir)/"
+ cp -r $(srcdir)/extras/package/win32/NSIS/languages
"$(win32_destdir)/"
+ cp -r $(srcdir)/extras/package/win32/NSIS/helpers
"$(win32_destdir)/"
cp "$(top_srcdir)/extras/package/win32/NSIS/nsProcess.nsh"
"$(win32_destdir)/NSIS/"
cp "$(top_srcdir)/extras/package/win32/NSIS/vlc_branding.bmp"
"$(win32_destdir)/NSIS/"
+endif
+if HAVE_MAKENSIS
+package-win32-exe: package-win32-src $(win32_destdir)/NSIS/nsProcess.dll
extras/package/win32/NSIS/vlc.win32.nsi
# Create package
$(MAKENSIS) "$(win32_destdir)/spad.nsi"
$(MAKENSIS) "$(win32_destdir)/vlc.win32.nsi"
@@ -167,14 +170,7 @@ package-win32: package-win32-zip package-win32-7zip
package-win32-exe
package-win32-debug: package-win32-debug-zip package-win32-debug-7zip
-package-win32-release: package-win-strip $(win32_destdir)/NSIS/nsProcess.dll
package-win-sdk
- cp $(top_builddir)/extras/package/win32/NSIS/vlc.win32.nsi
"$(win32_destdir)/"
- cp $(top_builddir)/extras/package/win32/NSIS/spad.nsi
"$(win32_destdir)/"
- cp -r $(srcdir)/extras/package/win32/NSIS/languages
"$(win32_destdir)/"
- cp -r $(srcdir)/extras/package/win32/NSIS/helpers
"$(win32_destdir)/"
- cp "$(top_srcdir)/extras/package/win32/NSIS/nsProcess.nsh"
"$(win32_destdir)/NSIS/"
- cp "$(top_srcdir)/extras/package/win32/NSIS/vlc_branding.bmp"
"$(win32_destdir)/NSIS/"
-
+package-win32-release: package-win32-src $(win32_destdir)/NSIS/nsProcess.dll
package-win-sdk
mkdir -p "$(win32_destdir)/msi/"
cp $(top_builddir)/extras/package/win32/msi/config.wxi
"$(win32_destdir)/msi/"
cp $(top_srcdir)/extras/package/win32/msi/axvlc.wxs
"$(win32_destdir)/msi/"
@@ -192,7 +188,7 @@ package-wince: package-win-strip
rm -f -- vlc-$(VERSION)-wince.zip
zip -r -9 vlc-$(VERSION)-wince.zip vlc-$(VERSION)
-.PHONY: package-win-install package-win-common package-win-strip
package-win32-exe package-win32-zip package-win32-debug-zip package-win32-7zip
package-win32-debug-7zip package-win32-cleanup package-win32
package-win32-debug package-wince
+.PHONY: package-win-install package-win-common package-win-strip
package-win32-src package-win32-exe package-win32-zip package-win32-debug-zip
package-win32-7zip package-win32-debug-7zip package-win32-cleanup package-win32
package-win32-debug package-wince
EXTRA_DIST += \
extras/package/win32/vlc.exe.manifest \
@@ -237,5 +233,3 @@ EXTRA_DIST += \
extras/package/win32/NSIS/languages/IcelandicExtra.nsh \
extras/package/win32/NSIS/languages/LatvianExtra.nsh \
extras/package/win32/NSIS/languages/IndonesianExtra.nsh
-
-
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/30611a9f5ffae67b52063625215dfde7bb5380ef
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/30611a9f5ffae67b52063625215dfde7bb5380ef
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
