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

Use a warning helper function so "warn as error" works everywhere

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6709 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2016-02-16 14:59:04 +00:00
parent 0bd3a0d1a1
commit 4b0d6b1843
2 changed files with 36 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

56
Source/build.cpp
View file

@ -3404,6 +3404,32 @@ void CEXEBuild::set_verbosity(int lvl)
g_display_errors = display_errors;
}
void CEXEBuild::warninghelper(const TCHAR *msg)
{
m_warnings.add(msg,0);
extern bool g_warnaserror;
MakensisAPI::notify_e hostnotifyevnt = MakensisAPI::NOTIFY_WARNING;
if (g_warnaserror)
{
hostnotifyevnt = MakensisAPI::NOTIFY_ERROR;
display_warnings = display_errors;
}
notify(hostnotifyevnt, msg);
if (display_warnings)
{
PrintColorFmtMsg_WARN(_T("warning: %") NPRIs _T("\n"), msg);
}
if (g_warnaserror)
{
ERROR_MSG(_T("Error: warning treated as error\n"));
extern int g_display_errors;
if (!has_called_write_output) g_display_errors = false; // This is a hack to avoid the "stale file in %temp%" warning.
extern void quit(); quit();
}
}
void CEXEBuild::warning(const TCHAR *s, ...)
{
ExpandoString<TCHAR, NSIS_MAX_STRLEN + 100> buf;
@ -3412,12 +3438,7 @@ void CEXEBuild::warning(const TCHAR *s, ...)
buf.StrFmt(s,val);
va_end(val);
m_warnings.add(buf,0);
notify(MakensisAPI::NOTIFY_WARNING,buf.GetPtr());
if (display_warnings)
{
PrintColorFmtMsg_WARN(_T("warning: %") NPRIs _T("\n"),buf.GetPtr());
}
warninghelper(buf.GetPtr());
}
void CEXEBuild::warning_fl(const TCHAR *s, ...)
@ -3428,28 +3449,9 @@ void CEXEBuild::warning_fl(const TCHAR *s, ...)
size_t cchMsg = buf.StrFmt(s, val);
va_end(val);
buf.Reserve(cchMsg+2+_tcslen(curfilename)+50+1+1);
buf.Reserve(cchMsg+2+_tcslen(curfilename)+50+1+!0);
_stprintf(&buf[cchMsg], _T(" (%") NPRIs _T(":%u)"), curfilename, linecnt);
m_warnings.add(buf,0);
MakensisAPI::notify_e hostcode = MakensisAPI::NOTIFY_WARNING;
extern bool g_warnaserror;
if (g_warnaserror)
hostcode = MakensisAPI::NOTIFY_ERROR, display_warnings = display_errors;
notify(hostcode,buf.GetPtr());
if (display_warnings)
{
PrintColorFmtMsg_WARN(_T("warning: %") NPRIs _T("\n"),buf.GetPtr());
}
if (g_warnaserror)
{
ERROR_MSG(_T("Error: warning treated as error\n"));
extern int g_display_errors;
if (!has_called_write_output) g_display_errors = false; // This is a hack to avoid the "stale file in %temp%" warning.
extern void quit(); quit();
}
warninghelper(buf.GetPtr());
}
void CEXEBuild::ERROR_MSG(const TCHAR *s, ...) const

1
Source/build.h
View file

@ -306,6 +306,7 @@ class CEXEBuild {
int resolve_coderefs(const TCHAR *str);
void print_warnings();
void warninghelper(const TCHAR *msg);
int uninstall_generate();
/** Are we defining an uninstall version of the code?