Commit 9dc07ecd authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

win32/nsis: Don't try to install --disabled features

This commit create conditional lines in the Windows
installer script to not try to install some features if
they have not been compiled.
(cherry picked from commit 599883e0)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 90a0990f
...@@ -20,6 +20,9 @@ ...@@ -20,6 +20,9 @@
!define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_DIR_REGKEY}" !define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_DIR_REGKEY}"
!define MUI_LANGDLL_REGISTRY_VALUENAME "Language" !define MUI_LANGDLL_REGISTRY_VALUENAME "Language"
@BUILD_ACTIVEX_TRUE@ !define INSTALL_ACTIVEX
@BUILD_MOZILLA_TRUE@ !define INSTALL_MOZILLA
@FILE_LIBVLCCORE_DLL@ @FILE_LIBVLCCORE_DLL@
@FILE_LIBVLC_DLL@ @FILE_LIBVLC_DLL@
...@@ -417,10 +420,11 @@ Section $Name_Section01 SEC01 ...@@ -417,10 +420,11 @@ Section $Name_Section01 SEC01
; Subfolders ; Subfolders
!insertmacro InstallFolder plugins !insertmacro InstallFolder plugins
!insertmacro InstallFolder locale !insertmacro InstallFolder locale
!insertmacro InstallFolder osdmenu @BUILD_OSDMENU_TRUE@ !insertmacro InstallFolder osdmenu
!insertmacro InstallFolder skins @BUILD_SKINS_TRUE@ !insertmacro InstallFolder skins
!insertmacro InstallFolder http @BUILD_HTTPD_TRUE@ !insertmacro InstallFolder http
!insertmacro InstallFolder lua @BUILD_LUA_TRUE@ !insertmacro InstallFolder lua
; URLs ; URLs
WriteIniStr "$INSTDIR\${PRODUCT_GROUP} Website.url" "InternetShortcut" "URL" \ WriteIniStr "$INSTDIR\${PRODUCT_GROUP} Website.url" "InternetShortcut" "URL" \
...@@ -467,8 +471,8 @@ Section $Name_Section02a SEC02a ...@@ -467,8 +471,8 @@ Section $Name_Section02a SEC02a
CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Audio\Set Audio mode to Waveout.lnk" \ CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Audio\Set Audio mode to Waveout.lnk" \
"$INSTDIR\vlc.exe" "--aout waveout --save-config vlc://quit" "$INSTDIR\vlc.exe" "--aout waveout --save-config vlc://quit"
CreateDirectory "$SMPROGRAMS\VideoLAN\Quick Settings\Interface" CreateDirectory "$SMPROGRAMS\VideoLAN\Quick Settings\Interface"
CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Interface\Set Main Interface to Skinnable.lnk" \ @BUILD_SKINS_TRUE@ CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Interface\Set Main Interface to Skinnable.lnk" \
"$INSTDIR\vlc.exe" "-I skins --save-config vlc://quit" @BUILD_SKINS_TRUE@ "$INSTDIR\vlc.exe" "-I skins --save-config vlc://quit"
CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Interface\Set Main Interface to Qt (default).lnk" \ CreateShortCut "$SMPROGRAMS\VideoLAN\Quick Settings\Interface\Set Main Interface to Qt (default).lnk" \
"$INSTDIR\vlc.exe" "-I qt --save-config vlc://quit" "$INSTDIR\vlc.exe" "-I qt --save-config vlc://quit"
CreateDirectory "$SMPROGRAMS\VideoLAN\Quick Settings\Video" CreateDirectory "$SMPROGRAMS\VideoLAN\Quick Settings\Video"
...@@ -503,6 +507,7 @@ Section $Name_Section02b SEC02b ...@@ -503,6 +507,7 @@ Section $Name_Section02b SEC02b
"$INSTDIR\vlc.exe" "" "$INSTDIR\vlc.exe" ""
SectionEnd SectionEnd
!ifdef INSTALL_MOZILLA
Section /o $Name_Section03 SEC03 Section /o $Name_Section03 SEC03
SectionIn 3 SectionIn 3
...@@ -549,7 +554,9 @@ Section /o $Name_Section03 SEC03 ...@@ -549,7 +554,9 @@ Section /o $Name_Section03 SEC03
;!undef Index ;!undef Index
SectionEnd SectionEnd
!endif
!ifdef INSTALL_ACTIVEX
Section $Name_Section04 SEC04 Section $Name_Section04 SEC04
SectionIn 3 SectionIn 3
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
...@@ -559,6 +566,7 @@ Section $Name_Section04 SEC04 ...@@ -559,6 +566,7 @@ Section $Name_Section04 SEC04
!insertmacro CloseUninstallLog !insertmacro CloseUninstallLog
RegDLL "$INSTDIR\axvlc.dll" RegDLL "$INSTDIR\axvlc.dll"
SectionEnd SectionEnd
!endif
Section $Name_Section05 SEC05 Section $Name_Section05 SEC05
...@@ -624,8 +632,8 @@ SectionEnd ...@@ -624,8 +632,8 @@ SectionEnd
!insertmacro MUI_DESCRIPTION_TEXT ${SEC01} $Desc_Section01 !insertmacro MUI_DESCRIPTION_TEXT ${SEC01} $Desc_Section01
!insertmacro MUI_DESCRIPTION_TEXT ${SEC02a} $Desc_Section02a !insertmacro MUI_DESCRIPTION_TEXT ${SEC02a} $Desc_Section02a
!insertmacro MUI_DESCRIPTION_TEXT ${SEC02b} $Desc_Section02b !insertmacro MUI_DESCRIPTION_TEXT ${SEC02b} $Desc_Section02b
!insertmacro MUI_DESCRIPTION_TEXT ${SEC03} $Desc_Section03 @BUILD_MOZILLA_TRUE@ !insertmacro MUI_DESCRIPTION_TEXT ${SEC03} $Desc_Section03
!insertmacro MUI_DESCRIPTION_TEXT ${SEC04} $Desc_Section04 @BUILD_ACTIVEX_TRUE@ !insertmacro MUI_DESCRIPTION_TEXT ${SEC04} $Desc_Section04
!insertmacro MUI_DESCRIPTION_TEXT ${SEC05} $Desc_Section05 !insertmacro MUI_DESCRIPTION_TEXT ${SEC05} $Desc_Section05
!insertmacro MUI_DESCRIPTION_TEXT ${SEC06} $Desc_Section06 !insertmacro MUI_DESCRIPTION_TEXT ${SEC06} $Desc_Section06
!insertmacro MUI_DESCRIPTION_TEXT ${SEC07} $Desc_Section07 !insertmacro MUI_DESCRIPTION_TEXT ${SEC07} $Desc_Section07
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment