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

* !AddIncludeDir displays the cpu architecture in the script message if specified as a parameter

Browse source 
* Removed unused SYSTEM_PARTIALCALLSUPPORT define
* Fixed minor typos
* Allow MSVC_USE_SCRIPT to be specified on the commandline or in the environment


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6611 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2015-09-18 23:16:34 +00:00
parent d0ddb4aab0
commit 5615d42881
5 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Contrib/System/SConscript
View file

@ -33,7 +33,6 @@ srcsuff = ''
if env['TARGET_ARCH'] != 'x86':
srcsuff = '-' + env['TARGET_ARCH']
defs += ['SYSTEM_NOCALLBACKS'] # BUGBUG: Remove this when CallBack() is implemented
defs += ['SYSTEM_PARTIALCALLSUPPORT']
filename = 'Call' + srcsuff
src_ascpp = """

2
SConstruct
View file

@ -449,7 +449,7 @@ def DistributeExtras(env, target, examples, docs):
if defenv['MSTOOLKIT']:
if GetOptionOrEnv('MSVC_USE_SCRIPT', '!') != '!':
defenv['MSVC_USE_SCRIPT'] = ARGUMENTS.get('MSVC_USE_SCRIPT')
defenv['MSVC_USE_SCRIPT'] = GetOptionOrEnv('MSVC_USE_SCRIPT')
defenv.Tool('mstoolkit', toolpath = [Dir('SCons/Tools').rdir()])
defenv.Append(CCFLAGS = Split('$APPEND_CCFLAGS'))

2
Source/build.cpp
View file

@ -484,7 +484,7 @@ int CEXEBuild::add_string(const TCHAR *string, int process/*=1*/, UINT codepage/
{
codepage = curlinereader ? curlinereader->StreamEncoding().GetCodepage() : CP_UTF8;
// If the current source file is Unicode we have to pick a real codepage for ANSI!
// It might not be the correct codepage but its the best we can do.
// It might not be the correct codepage but it's the best we can do.
// Not using CP_ACP to avoid heisenbugs when compiled on a different system.
if (NStreamEncoding::IsUnicodeCodepage(codepage)) codepage = 1252;
}

6
Source/fileform.cpp
View file

@ -22,9 +22,9 @@
#include <cassert>
// these functions MUST be synchronized with the structures in Source/exehead/fileform.h !
// data must be written in the same order it's defined in Source/exehead/fileform.h
// in the future, i hope to get one of the two automtaically generated from the other
// These functions MUST be synchronized with the structures in Source/exehead/fileform.h !
// Data must be written in the same order it's defined in Source/exehead/fileform.h
// In the future, I hope to get one of the two automatically generated from the other
void firstheader_writer::write(const firstheader *data)
{

20
Source/script.cpp
View file

@ -6094,29 +6094,29 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
{
CEXEBuild::TARGETTYPE tt = m_target_type;
int numtok = line.getnumtokens() - 1;
TCHAR *path = line.gettoken_str(numtok);
const TCHAR *path = line.gettoken_str(numtok), *cmdnam = get_commandtoken_name(which_token), *arcstr = 0;
if (2 == numtok)
{
const TCHAR *arcstr = line.gettoken_str(--numtok);
tt = get_target_type(arcstr+1);
if (_T('/') != arcstr[0] || CEXEBuild::TARGET_UNKNOWN == tt)
arcstr = line.gettoken_str(--numtok);
if (_T('/') != *arcstr || CEXEBuild::TARGET_UNKNOWN == (tt = get_target_type(++arcstr)))
{
tstring es = get_commandtoken_name(which_token);
es += _T(": Target parameter must be one of: /");
tstring errstr = cmdnam;
errstr += _T(": Target parameter must be one of: /");
for(int comma = 0, i = CEXEBuild::TARGETFIRST; i < CEXEBuild::TARGETCOUNT; ++i)
{
const TCHAR *ts = get_target_suffix((CEXEBuild::TARGETTYPE) i, 0);
if (!ts) continue;
if (comma++) es += _T(", /");
es += ts;
if (comma++) errstr += _T(", /");
errstr += ts;
}
ERROR_MSG(_T("Error: %") NPRIs _T("\n"), es.c_str());
ERROR_MSG(_T("Error: %") NPRIs _T("\n"), errstr.c_str());
return PS_ERROR;
}
}
if (1 == numtok)
{
SCRIPT_MSG(_T("PluginDir: \"%") NPRIs _T("\"\n"),path);
const TCHAR *fmtstr = _T("%") NPRIs _T(": \"%") NPRIs _T("\"%") NPRIs _T("%") NPRIs _T("%") NPRIs _T("\n");
SCRIPT_MSG(fmtstr, cmdnam, path, arcstr ? _T(" (") : _T(""), arcstr ? arcstr : _T(""), arcstr ? _T(")") : _T(""));
PATH_CONVERT(path);
m_plugins[tt].AddPluginsDir(path, !!display_script);
return PS_OK;