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

Changed keyword UnicodeInstaller to a more versatile TargetMinimalOS <version> keyword

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6102 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
wizou 2010-06-14 15:24:50 +00:00
parent 52408912ab
commit 487e37ffb7
6 changed files with 44 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Source/script.cpp
View file

@ -2686,20 +2686,21 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
return PS_OK;
#ifdef _UNICODE
case TOK_UNICODEINSTALLER:
case TOK_TARGETMINIMALOS:
{
if (build_compressor_set) {
ERROR_MSG(_T("Error: can't change type of installer after data already got compressed or header already changed!\n"));
ERROR_MSG(_T("Error: can't change target minimal OS version after data already got compressed or header already changed!\n"));
return PS_ERROR;
}
int param=line.gettoken_enum(1,_T("off\0on\0"));
if (param==-1) PRINTHELP()
SCRIPT_MSG(_T("UnicodeInstaller: %s\n"),line.gettoken_str(1));
if (set_build_unicode(param != 0) != PS_OK)
int major = 0, minor = 0;
if (_stscanf(line.gettoken_str(1), _T("%d.%d"), &major, &minor) == 0)
PRINTHELP()
if (set_target_minimal_OS(major,minor) != PS_OK) // Windows 5.0 or more recent requested? => Unicode support
{
ERROR_MSG(_T("Error: error while setting type of installer! (stub not found?)\n"));
ERROR_MSG(_T("Error: error while setting target minimal OS! (adequate stub not found?)\n"));
return PS_ERROR;
}
SCRIPT_MSG(_T("TargetMinimalOS: %d.%d %s\n"),major,minor,build_unicode?_T("(Unicode installer)"):_T(""));
}
return PS_OK;
#endif