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

implemented RFE #1459210 - !define /date should use UTC

Browse source 
added /utcdate flag


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4622 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2006-03-28 18:20:28 +00:00
parent 411a2d5c58
commit 12df15a9e5
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Docs/src/defines.but
View file

@ -10,11 +10,11 @@ Define/conditional compilation related commands:
\S1{define} !define
\c ([/date] gflag [value]) | (/math gflag val1 OP val2)
\c ([/date|/utcdate] gflag [value]) | (/math gflag val1 OP val2)
This command will add \e{gflag} to the global define list. This will have a similar effect as using the /D switch on the command line (only the define only becomes effective after the !define command).
If \e{/date} is used, \e{value} will be passed into strftime and the result will be used as the value of \e{gflag}. strftime converts special symbols into certain parts of the current time or date. For example, %H will be converted into the current hour in 24-hour format. For a complete list of available symbols, search for strftime on \W{http://msdn.microsoft.com/}{MSDN}. On POSIX, you can get the list by using \c{man strftime}.
If \e{/date} or \e{/utcdate} are used, \e{value} will be passed into strftime and the result will be used as the value of \e{gflag}. strftime converts special symbols into certain parts of the current time or date. For example, %H will be converted into the current hour in 24-hour format. For a complete list of available symbols, search for strftime on \W{http://msdn.microsoft.com/}{MSDN}. On POSIX, you can get the list by using \c{man strftime}.
If \e{/math} is used, the result of 'val1 OP val2', where OP may be +,-,*,/ or % , will be used as the value of \e{gflag}. Note that val1 AND val2 MUST be integer values!

7
Source/script.cpp
View file

@ -2693,15 +2693,20 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
char mathbuf[256];
bool date=false;
if (!stricmp(define,"/date")) {
if (!stricmp(define,"/date") || !stricmp(define,"/utcdate")) {
if (line.getnumtokens()!=4) PRINTHELP()
char *date_type = define;
define=line.gettoken_str(2);
value=line.gettoken_str(3);
time_t rawtime;
time(&rawtime);
if (!stricmp(date_type,"/utcdate"))
rawtime = mktime(gmtime(&rawtime));
datebuf[0]=0;
size_t s=strftime(datebuf,sizeof(datebuf),value,localtime(&rawtime));

2
Source/tokens.cpp
View file

@ -229,7 +229,7 @@ static tokenType tokenlist[TOK__LAST] =
{TOK_P_IFDEF,"!ifdef",1,-1,"symbol [| symbol2 [& symbol3 [...]]]",TP_ALL},
{TOK_P_IFNDEF,"!ifndef",1,-1,"symbol [| symbol2 [& symbol3 [...]]]",TP_ALL},
{TOK_P_ENDIF,"!endif",0,0,"",TP_ALL},
{TOK_P_DEFINE,"!define",1,4,"([/date] symbol [value]) | (/math symbol val1 OP val2)\n OP=(+ - * / %)",TP_ALL},
{TOK_P_DEFINE,"!define",1,4,"([/date|/utcdate] symbol [value]) | (/math symbol val1 OP val2)\n OP=(+ - * / %)",TP_ALL},
{TOK_P_UNDEF,"!undef",1,1,"symbol [value]",TP_ALL},
{TOK_P_ELSE,"!else",0,-1,"[if[macro][n][def] ...]",TP_ALL},
{TOK_P_ECHO,"!echo",1,0,"message",TP_ALL},