dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix MUI dependencies check when Languages or Graphics are not installed

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6842 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2017-03-22 15:05:13 +00:00
parent c1c2ccb4a6
commit fd8cdfd4a2
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Examples/makensis.nsi
View file

@ -497,11 +497,10 @@ ${MementoSection} "Language Files" SecLangFiles
SetOutPath $INSTDIR\Bin SetOutPath $INSTDIR\Bin
File ..\Bin\MakeLangID.exe File ..\Bin\MakeLangID.exe
!insertmacro SectionFlagIsSet ${SecInterfacesModernUI} ${SF_SELECTED} mui nomui ${If} ${SectionIsSelected} ${SecInterfacesModernUI}
mui:
SetOutPath "$INSTDIR\Contrib\Language files" SetOutPath "$INSTDIR\Contrib\Language files"
File "..\Contrib\Language files\*.nsh" File "..\Contrib\Language files\*.nsh"
nomui: ${EndIf}
${MementoSectionEnd} ${MementoSectionEnd}
@ -787,13 +786,13 @@ Section -post
DetailPrint "Configuring Modern UI..." DetailPrint "Configuring Modern UI..."
SetDetailsPrint listonly SetDetailsPrint listonly
${If} ${SectionIsSelected} ${SecLangFiles} ${IfNot} ${SectionIsSelected} ${SecLangFiles}
SetOutPath "$INSTDIR\Contrib\Language files" SetOutPath "$INSTDIR\Contrib\Language files"
File "..\Contrib\Language files\English.nlf" File "..\Contrib\Language files\English.nlf"
File "..\Contrib\Language files\English.nsh" File "..\Contrib\Language files\English.nsh"
${EndIf} ${EndIf}
${If} ${SectionIsSelected} ${SecGraphics} ${IfNot} ${SectionIsSelected} ${SecGraphics}
SetOutPath $INSTDIR\Contrib\Graphics\Checks SetOutPath $INSTDIR\Contrib\Graphics\Checks
File "..\Contrib\Graphics\Checks\modern.bmp" File "..\Contrib\Graphics\Checks\modern.bmp"
SetOutPath $INSTDIR\Contrib\Graphics\Icons SetOutPath $INSTDIR\Contrib\Graphics\Icons