EPICS_base/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Merge changes from 3.16 into core/master

Browse Source
This commit is contained in:
Ralph Lange
2018-01-04 09:11:08 +01:00
parent e43c6634d0 84e0220852
commit 88be36002a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/appveyor-prepare.bat
View File

@ -65,6 +65,6 @@ if "%TOOLCHAIN%"=="mingw" (
) )
echo [INFO] Installing Make 4.1 echo [INFO] Installing Make 4.1
curl -fsS --retry 3 -o C:\tools\make-4.1.zip https://www.aps.anl.gov/epics/download/tools/make-4.1-win64.zip curl -fsS --retry 3 -o C:\tools\make-4.1.zip https://epics.anl.gov/download/tools/make-4.1-win64.zip
cd \tools cd \tools
"C:\Program Files\7-Zip\7z" e make-4.1.zip "C:\Program Files\7-Zip\7z" e make-4.1.zip

4
src/tools/genVersionHeader.pl
View File

@ -18,8 +18,8 @@ use POSIX qw(strftime);
use strict; use strict;
# RFC 8601 date+time w/ zone (eg "2014-08-29T09:42:47-0700") # RFC 8601 date+time w/ zone (eg "2014-08-29T09:42-0700")
my $tfmt = '%Y-%m-%dT%H:%M:%S'; my $tfmt = '%Y-%m-%dT%H:%M';
$tfmt .= '%z' unless $^O eq 'MSWin32'; # %z returns zone name on Windows $tfmt .= '%z' unless $^O eq 'MSWin32'; # %z returns zone name on Windows
my $now = strftime($tfmt, localtime); my $now = strftime($tfmt, localtime);