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

Added !uninstfinalize (patch 280)

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7294 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2021-08-18 13:53:50 +00:00
parent 1768555f2b
commit 41bb557cbc
11 changed files with 166 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Source/script.cpp
View file

@ -530,7 +530,7 @@ parse_again:
extern FILE *g_output;
bool pptok = is_pp_token(tkid), docmd = pptok;
bool both = TOK_P_VERBOSE == tkid || TOK_P_WARNING == tkid || TOK_P_ECHO == tkid;
if (TOK_P_FINALIZE == tkid || TOK_P_PACKEXEHEADER == tkid) docmd = false;
if (TOK_P_FINALIZE == tkid || TOK_P_UNINSTFINALIZE == tkid || TOK_P_PACKEXEHEADER == tkid) docmd = false;
if (docmd && is_unsafe_pp_token(tkid) && preprocessonly > 0) docmd = false;
if (!docmd || both) _ftprintf(g_output,(_T("%") NPRIs _T("\n")),ppoline.get());
if (!docmd && !both) return PS_OK;
@ -2553,7 +2553,8 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
case TOK_P_PACKEXEHEADER:
return pp_packhdr(line);
case TOK_P_FINALIZE:
return pp_finalize(line);
case TOK_P_UNINSTFINALIZE:
return pp_finalize(which_token, line);
case TOK_P_SYSTEMEXEC:
case TOK_P_EXECUTE:
case TOK_P_MAKENSIS: