From 338a7e695fe0a2123fff5efeb410f368ea8d2072 Mon Sep 17 00:00:00 2001 From: Gildas Bazin Date: Sat, 15 May 2004 01:11:57 +0000 Subject: [PATCH] * vlc.win32.nsi: compressor needs to be defined at the top. --- vlc.win32.nsi | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/vlc.win32.nsi b/vlc.win32.nsi index c6379dab96..eaa46b2c63 100644 --- a/vlc.win32.nsi +++ b/vlc.win32.nsi @@ -12,6 +12,23 @@ !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_ROOT_KEY "HKLM" +;;;;;;;;;;;;;;;;;;;;;;;;; +; General configuration ; +;;;;;;;;;;;;;;;;;;;;;;;;; + +Name "${PRODUCT_GROUP} ${PRODUCT_NAME} ${PRODUCT_VERSION}" +OutFile ..\vlc-${VERSION}-win32.exe +InstallDir "$PROGRAMFILES\VideoLAN\VLC" +InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "Install_Dir" +SetCompressor lzma +ShowInstDetails show +ShowUnInstDetails show +SetOverwrite ifnewer +CRCCheck on + +InstType "Normal" +InstType "Full" + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; NSIS Modern User Interface configuration ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -37,6 +54,7 @@ !insertmacro MUI_PAGE_INSTFILES ; Finish page !define MUI_FINISHPAGE_RUN "$INSTDIR\vlc.exe" +!define MUI_FINISHPAGE_NOREBOOTSUPPORT !insertmacro MUI_PAGE_FINISH ; Uninstaller pages @@ -100,22 +118,9 @@ FunctionEnd Pop $R0 !macroend -;;;;;;;;;;;;;;;;;;;;;;;;; -; General configuration ; -;;;;;;;;;;;;;;;;;;;;;;;;; - -Name "${PRODUCT_GROUP} ${PRODUCT_NAME} ${PRODUCT_VERSION}" -OutFile ..\vlc-${VERSION}-win32.exe -InstallDir "$PROGRAMFILES\VideoLAN\VLC" -InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "Install_Dir" -SetCompressor lzma -ShowInstDetails show -ShowUnInstDetails show -SetOverwrite ifnewer -CRCCheck on - -InstType "Normal" -InstType "Full" +;;;;;;;;;;;;;;;;;;;;;; +; Installer sections ; +;;;;;;;;;;;;;;;;;;;;;; Section "Media player (required)" SEC01 SectionIn 1 2 3 RO -- 2.39.2