fixed bug #1784470 - MUI_RESERVEFILE_INSTALLOPTIONS fails install build
nicer error messages when moving from MUI to MUI2 git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5432 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
807a9b3687
commit
4aca101c3c
3 changed files with 74 additions and 0 deletions
72
Contrib/Modern UI 2/Deprecated.nsh
Normal file
72
Contrib/Modern UI 2/Deprecated.nsh
Normal file
|
@ -0,0 +1,72 @@
|
||||||
|
/*
|
||||||
|
|
||||||
|
NSIS Modern User Interface
|
||||||
|
Deprecated code - display warnings
|
||||||
|
|
||||||
|
*/
|
||||||
|
|
||||||
|
;--------------------------------
|
||||||
|
;InstallOptions
|
||||||
|
|
||||||
|
!define INSTALLOPTIONS_ERROR "MUI_INSTALLOPTIONS_* macros are no longer a part of MUI2. Include InstallOptions.nsh and use INSTALLOPTIONS_* macros instead. It is also recommended to upgrade to nsDialogs."
|
||||||
|
|
||||||
|
!macro MUI_INSTALLOPTIONS_EXTRACT FILE
|
||||||
|
|
||||||
|
!error "${INSTALLOPTIONS_ERROR}"
|
||||||
|
|
||||||
|
!macroend
|
||||||
|
|
||||||
|
!macro MUI_INSTALLOPTIONS_EXTRACT_AS FILE FILENAME
|
||||||
|
|
||||||
|
!error "${INSTALLOPTIONS_ERROR}"
|
||||||
|
|
||||||
|
!macroend
|
||||||
|
|
||||||
|
!macro MUI_INSTALLOPTIONS_DISPLAY FILE
|
||||||
|
|
||||||
|
!error "${INSTALLOPTIONS_ERROR}"
|
||||||
|
|
||||||
|
!macroend
|
||||||
|
|
||||||
|
!macro MUI_INSTALLOPTIONS_DISPLAY_RETURN FILE
|
||||||
|
|
||||||
|
!error "${INSTALLOPTIONS_ERROR}"
|
||||||
|
|
||||||
|
!macroend
|
||||||
|
|
||||||
|
!macro MUI_INSTALLOPTIONS_INITDIALOG FILE
|
||||||
|
|
||||||
|
!error "${INSTALLOPTIONS_ERROR}"
|
||||||
|
|
||||||
|
!macroend
|
||||||
|
|
||||||
|
!macro MUI_INSTALLOPTIONS_SHOW
|
||||||
|
|
||||||
|
!error "${INSTALLOPTIONS_ERROR}"
|
||||||
|
|
||||||
|
!macroend
|
||||||
|
|
||||||
|
!macro MUI_INSTALLOPTIONS_SHOW_RETURN
|
||||||
|
|
||||||
|
!error "${INSTALLOPTIONS_ERROR}"
|
||||||
|
|
||||||
|
!macroend
|
||||||
|
|
||||||
|
!macro MUI_INSTALLOPTIONS_READ VAR FILE SECTION KEY
|
||||||
|
|
||||||
|
!error "${INSTALLOPTIONS_ERROR}"
|
||||||
|
|
||||||
|
!macroend
|
||||||
|
|
||||||
|
!macro MUI_INSTALLOPTIONS_WRITE FILE SECTION KEY VALUE
|
||||||
|
|
||||||
|
!error "${INSTALLOPTIONS_ERROR}"
|
||||||
|
|
||||||
|
!macroend
|
||||||
|
|
||||||
|
!macro MUI_RESERVEFILE_INSTALLOPTIONS
|
||||||
|
|
||||||
|
!define MUI_DOLLAR "$"
|
||||||
|
!error "MUI_RESERVEFILE_INSTALLOPTIONS is no longer supported as InstallOptions is no longer used by MUI2. Instead, use ReserveFile '${MUI_DOLLAR}{NSISDIR}\Plugins\InstallOptions.dll'. It is also recommended to upgrade to nsDialogs."
|
||||||
|
|
||||||
|
!macroend
|
|
@ -72,6 +72,7 @@ Copyright
|
||||||
;--------------------------------
|
;--------------------------------
|
||||||
;MUI interface
|
;MUI interface
|
||||||
|
|
||||||
|
!include "Deprecated.nsh"
|
||||||
!include "Interface.nsh"
|
!include "Interface.nsh"
|
||||||
!include "Localization.nsh"
|
!include "Localization.nsh"
|
||||||
!include "Pages.nsh"
|
!include "Pages.nsh"
|
||||||
|
|
|
@ -14,6 +14,7 @@ doc_images = Split("""
|
||||||
""")
|
""")
|
||||||
|
|
||||||
contribs = Split("""
|
contribs = Split("""
|
||||||
|
Deprecated.nsh
|
||||||
Interface.nsh
|
Interface.nsh
|
||||||
Localization.nsh
|
Localization.nsh
|
||||||
MUI2.nsh
|
MUI2.nsh
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue