make !define /date prints act like !define /math

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4623 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2006-03-28 18:22:34 +00:00
parent 12df15a9e5
commit 3581eec6ee

View file

@ -2691,7 +2691,6 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
char *value; char *value;
char datebuf[256]; char datebuf[256];
char mathbuf[256]; char mathbuf[256];
bool date=false;
if (!stricmp(define,"/date") || !stricmp(define,"/utcdate")) { if (!stricmp(define,"/date") || !stricmp(define,"/utcdate")) {
if (line.getnumtokens()!=4) PRINTHELP() if (line.getnumtokens()!=4) PRINTHELP()
@ -2717,8 +2716,6 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
value=datebuf; value=datebuf;
date=true;
} else if (!stricmp(define,"/math")) { } else if (!stricmp(define,"/math")) {
int value1; int value1;
@ -2764,7 +2761,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
ERROR_MSG("!define: \"%s\" already defined!\n",define); ERROR_MSG("!define: \"%s\" already defined!\n",define);
return PS_ERROR; return PS_ERROR;
} }
SCRIPT_MSG("!define: %s\"%s\"=\"%s\"\n",date?"/date ":"",define,date?line.gettoken_str(3):value); SCRIPT_MSG("!define: \"%s\"=\"%s\"\n",define,value);
} }
return PS_OK; return PS_OK;
case TOK_P_UNDEF: case TOK_P_UNDEF: