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

Only ignore makensis.nsi test on non-Win32 platforms

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7040 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2018-11-02 20:15:20 +00:00
parent 1afaca0e41
commit d6adb07487
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
SConstruct
View file

@ -143,7 +143,7 @@ if 'NSIS_CONFIG_CONST_DATA_PATH' in defenv['NSIS_CPPDEFINES']:
else:
dirs = install_dirs['relocatable']
if 'msvc' in defenv['TOOLS'] or 'mstoolkit' in defenv['TOOLS']:
if defenv['PLATFORM'] == 'win32':
ignore_tests = 'none'
else:
ignore_tests = ','.join(Split("""

2
Source/tokens.cpp
View file

@ -271,7 +271,7 @@ static tokenType tokenlist[TOK__LAST] =
{TOK_P_IFNDEF,_T("!ifndef"),1,-1,_T("symbol [| symbol2 [& symbol3 [...]]]"),TP_ALL},
{TOK_P_ENDIF,_T("!endif"),0,0,_T(""),TP_ALL},
{TOK_P_DEFINE,_T("!define"),1,5,_T("[/ifndef | /redef] ([/date|/utcdate] symbol [value]) | (/file symbol filename) | (/math symbol val1 OP val2)\n OP=(+ - * / % << >> >>> & | ^ ~ ! && ||)"),TP_ALL},
{TOK_P_UNDEF,_T("!undef"),1,-1,_T("[/noerrors] symbol"),TP_ALL},
{TOK_P_UNDEF,_T("!undef"),1,-1,_T("[/noerrors] symbol [...]"),TP_ALL},
{TOK_P_ELSE,_T("!else"),0,-1,_T("[if[macro][n][def] ...]"),TP_ALL},
{TOK_P_ECHO,_T("!echo"),1,0,_T("message"),TP_ALL},
{TOK_P_WARNING,_T("!warning"),0,1,_T("[warning_message]"),TP_ALL},