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

Don't list /amd64-unicode in !addplugindir help (makensis win32)

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6446 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2014-03-04 19:26:56 +00:00
parent ac873f36cb
commit ce0d6a7a94
4 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Docs/src/history.but
View file

@ -15,6 +15,7 @@ Released on ?, 2014
\S2{} Minor Changes \S2{} Minor Changes
\b Added Int<32|64|Ptr><Op|Cmp[U]> helper macros to Util.nsh \b Added Int<32|64|Ptr><Op|Cmp[U]> helper macros to Util.nsh
\b Added P<, P<=, P=, P<>, P>= and P> LogicLib ptrdiff_t tests \b Added P<, P<=, P=, P<>, P>= and P> LogicLib ptrdiff_t tests
\H{v3.0a2} 3.0 Alpha 2 \H{v3.0a2} 3.0 Alpha 2

6
Source/build.cpp
View file

@ -3703,12 +3703,12 @@ CEXEBuild::TARGETTYPE CEXEBuild::get_target_type(const TCHAR*s) const
for(int i = CEXEBuild::TARGETFIRST; i < CEXEBuild::TARGETCOUNT; ++i) for(int i = CEXEBuild::TARGETFIRST; i < CEXEBuild::TARGETCOUNT; ++i)
{ {
CEXEBuild::TARGETTYPE tt = (CEXEBuild::TARGETTYPE) i; CEXEBuild::TARGETTYPE tt = (CEXEBuild::TARGETTYPE) i;
if (!_tcsicmp(get_target_suffix(tt),s)) return tt; if (!_tcsicmp(get_target_suffix(tt, _T("")),s) && *s) return tt;
} }
return TARGET_UNKNOWN; return TARGET_UNKNOWN;
} }
const TCHAR* CEXEBuild::get_target_suffix(CEXEBuild::TARGETTYPE tt) const const TCHAR* CEXEBuild::get_target_suffix(CEXEBuild::TARGETTYPE tt, const TCHAR*defval) const
{ {
switch(tt) switch(tt)
{ {
@ -3717,7 +3717,7 @@ const TCHAR* CEXEBuild::get_target_suffix(CEXEBuild::TARGETTYPE tt) const
#if !defined(_WIN32) || defined(_WIN64) // BUGBUG: Need a better define for this #if !defined(_WIN32) || defined(_WIN64) // BUGBUG: Need a better define for this
case TARGET_AMD64 :return _T("amd64-unicode"); case TARGET_AMD64 :return _T("amd64-unicode");
#endif #endif
default:return _T("?"); default:return defval;
} }
} }

2
Source/build.h
View file

@ -126,7 +126,7 @@ class CEXEBuild {
} TARGETTYPE; } TARGETTYPE;
TARGETTYPE m_target_type; TARGETTYPE m_target_type;
TARGETTYPE get_target_type(const TCHAR*s) const; TARGETTYPE get_target_type(const TCHAR*s) const;
const TCHAR* get_target_suffix(CEXEBuild::TARGETTYPE tt) const; const TCHAR* get_target_suffix(CEXEBuild::TARGETTYPE tt, const TCHAR*defval = _T("?")) const;
const TCHAR* get_target_suffix() const {return get_target_suffix(m_target_type);} const TCHAR* get_target_suffix() const {return get_target_suffix(m_target_type);}
bool is_target_64bit() const { return TARGET_AMD64 == m_target_type; } bool is_target_64bit() const { return TARGET_AMD64 == m_target_type; }

11
Source/script.cpp
View file

@ -6234,17 +6234,18 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
TCHAR *path = line.gettoken_str(numtok); TCHAR *path = line.gettoken_str(numtok);
if (2 == numtok) if (2 == numtok)
{ {
const TCHAR* arcstr = line.gettoken_str(--numtok); const TCHAR *arcstr = line.gettoken_str(--numtok);
tt = get_target_type(arcstr+1); tt = get_target_type(arcstr+1);
if (_T('/') != arcstr[0] || CEXEBuild::TARGET_UNKNOWN == tt) if (_T('/') != arcstr[0] || CEXEBuild::TARGET_UNKNOWN == tt)
{ {
tstring es = get_commandtoken_name(which_token); tstring es = get_commandtoken_name(which_token);
es += _T(": Target parameter must be one of: /"); es += _T(": Target parameter must be one of: /");
for(int i = CEXEBuild::TARGETFIRST; i < CEXEBuild::TARGETCOUNT; ++i) for(int comma = 0, i = CEXEBuild::TARGETFIRST; i < CEXEBuild::TARGETCOUNT; ++i)
{ {
tt = (CEXEBuild::TARGETTYPE) i; const TCHAR *ts = get_target_suffix((CEXEBuild::TARGETTYPE) i, 0);
if (CEXEBuild::TARGETFIRST != tt) es += _T(", /"); if (!ts) continue;
es += get_target_suffix(tt); if (comma++) es += _T(", /");
es += ts;
} }
ERROR_MSG(_T("Error: %") NPRIs _T("\n"),es.c_str()); ERROR_MSG(_T("Error: %") NPRIs _T("\n"),es.c_str());
return PS_ERROR; return PS_ERROR;