From 00924dcba0d2306eca995956c7407d5c094434a0 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 8 Dec 2017 16:37:03 -0600 Subject: [PATCH 1/8] About to tag 3.14.12.7-rc1 --- configure/CONFIG_BASE_VERSION | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure/CONFIG_BASE_VERSION b/configure/CONFIG_BASE_VERSION index e5f7e58b4..650301dda 100644 --- a/configure/CONFIG_BASE_VERSION +++ b/configure/CONFIG_BASE_VERSION @@ -28,15 +28,15 @@ EPICS_MODIFICATION = 12 # EPICS_PATCH_LEVEL must be a number (win32 resource file requirement) # Not included if zero -EPICS_PATCH_LEVEL = 6 +EPICS_PATCH_LEVEL = 7 # This will end in -DEV between official releases -EPICS_DEV_SNAPSHOT=-DEV +#EPICS_DEV_SNAPSHOT=-DEV #EPICS_DEV_SNAPSHOT=-pre1 #EPICS_DEV_SNAPSHOT=-pre1-DEV #EPICS_DEV_SNAPSHOT=-pre2 #EPICS_DEV_SNAPSHOT=-pre2-DEV -#EPICS_DEV_SNAPSHOT=-rc1 +EPICS_DEV_SNAPSHOT=-rc1 #EPICS_DEV_SNAPSHOT=-rc1-DEV #EPICS_DEV_SNAPSHOT=-rc2 #EPICS_DEV_SNAPSHOT=-rc2-DEV From f6be3c7f7041d108e607e9113dff94133df61eb0 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 8 Dec 2017 16:40:08 -0600 Subject: [PATCH 2/8] Set snapshot to -rc1-DEV --- configure/CONFIG_BASE_VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure/CONFIG_BASE_VERSION b/configure/CONFIG_BASE_VERSION index 650301dda..75270c8eb 100644 --- a/configure/CONFIG_BASE_VERSION +++ b/configure/CONFIG_BASE_VERSION @@ -36,8 +36,8 @@ EPICS_PATCH_LEVEL = 7 #EPICS_DEV_SNAPSHOT=-pre1-DEV #EPICS_DEV_SNAPSHOT=-pre2 #EPICS_DEV_SNAPSHOT=-pre2-DEV -EPICS_DEV_SNAPSHOT=-rc1 -#EPICS_DEV_SNAPSHOT=-rc1-DEV +#EPICS_DEV_SNAPSHOT=-rc1 +EPICS_DEV_SNAPSHOT=-rc1-DEV #EPICS_DEV_SNAPSHOT=-rc2 #EPICS_DEV_SNAPSHOT=-rc2-DEV #EPICS_DEV_SNAPSHOT= From 5ca1bb3bd513baba18eea07ce6244673cb1d6ec3 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 15 Dec 2017 16:06:08 -0600 Subject: [PATCH 3/8] Set SNAPSHOT for 3.14.12.7 final release --- configure/CONFIG_BASE_VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure/CONFIG_BASE_VERSION b/configure/CONFIG_BASE_VERSION index 75270c8eb..c339b3671 100644 --- a/configure/CONFIG_BASE_VERSION +++ b/configure/CONFIG_BASE_VERSION @@ -37,10 +37,10 @@ EPICS_PATCH_LEVEL = 7 #EPICS_DEV_SNAPSHOT=-pre2 #EPICS_DEV_SNAPSHOT=-pre2-DEV #EPICS_DEV_SNAPSHOT=-rc1 -EPICS_DEV_SNAPSHOT=-rc1-DEV +#EPICS_DEV_SNAPSHOT=-rc1-DEV #EPICS_DEV_SNAPSHOT=-rc2 #EPICS_DEV_SNAPSHOT=-rc2-DEV -#EPICS_DEV_SNAPSHOT= +EPICS_DEV_SNAPSHOT= # No changes should be needed below here From 98a287172722b5d175e2395b69589afa04f1212f Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 15 Dec 2017 16:09:21 -0600 Subject: [PATCH 4/8] Reset SNAPSHOT to -DEV after tagging 3.14.12.7 --- configure/CONFIG_BASE_VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure/CONFIG_BASE_VERSION b/configure/CONFIG_BASE_VERSION index c339b3671..1a4f925a2 100644 --- a/configure/CONFIG_BASE_VERSION +++ b/configure/CONFIG_BASE_VERSION @@ -31,7 +31,7 @@ EPICS_MODIFICATION = 12 EPICS_PATCH_LEVEL = 7 # This will end in -DEV between official releases -#EPICS_DEV_SNAPSHOT=-DEV +EPICS_DEV_SNAPSHOT=-DEV #EPICS_DEV_SNAPSHOT=-pre1 #EPICS_DEV_SNAPSHOT=-pre1-DEV #EPICS_DEV_SNAPSHOT=-pre2 @@ -40,7 +40,7 @@ EPICS_PATCH_LEVEL = 7 #EPICS_DEV_SNAPSHOT=-rc1-DEV #EPICS_DEV_SNAPSHOT=-rc2 #EPICS_DEV_SNAPSHOT=-rc2-DEV -EPICS_DEV_SNAPSHOT= +#EPICS_DEV_SNAPSHOT= # No changes should be needed below here From 276dee2c3eba422b2da6fee453a8c2440ac3ae85 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Mon, 11 Dec 2017 09:49:01 +0100 Subject: [PATCH 5/8] appveyor-ci: use curl for download of make.zip --- ci/appveyor-prepare.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/appveyor-prepare.bat b/ci/appveyor-prepare.bat index 6edb7b52f..7d50c88be 100644 --- a/ci/appveyor-prepare.bat +++ b/ci/appveyor-prepare.bat @@ -65,6 +65,6 @@ if "%TOOLCHAIN%"=="mingw" ( ) echo [INFO] Installing Make 4.1 -@powershell -Command "(new-object net.webclient).DownloadFile('https://www.aps.anl.gov/epics/download/tools/make-4.1-win64.zip', 'C:\tools\make-4.1.zip')" +curl -fsS --retry 3 -o C:\tools\make-4.1.zip https://www.aps.anl.gov/epics/download/tools/make-4.1-win64.zip cd \tools "C:\Program Files\7-Zip\7z" e make-4.1.zip From 006ce1a2402c991fe3736f70c17544c9970164b5 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Tue, 12 Dec 2017 09:43:07 +0100 Subject: [PATCH 6/8] appveyor-ci: remove VS 2008, add VS 2017 --- appveyor.yml | 5 ++--- ci/appveyor-make.bat | 23 +++++++++++++++++++++-- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index e4c5010cb..dbbd7a908 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -40,11 +40,12 @@ configuration: # Environment variables: compiler toolchain environment: matrix: - - TOOLCHAIN: 9.0 - TOOLCHAIN: 10.0 - TOOLCHAIN: 11.0 - TOOLCHAIN: 12.0 - TOOLCHAIN: 14.0 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + TOOLCHAIN: 2017 - TOOLCHAIN: cygwin - TOOLCHAIN: mingw @@ -57,8 +58,6 @@ platform: matrix: exclude: # VS Express installs don't have the 64 bit compiler - - platform: x64 - TOOLCHAIN: 9.0 - platform: x64 TOOLCHAIN: 10.0 diff --git a/ci/appveyor-make.bat b/ci/appveyor-make.bat index 8ecf61dbe..a489d80ee 100644 --- a/ci/appveyor-make.bat +++ b/ci/appveyor-make.bat @@ -1,6 +1,6 @@ :: Universal build script for AppVeyor (https://ci.appveyor.com/) :: Environment: -:: TOOLCHAIN - toolchain version [9.0/10.0/11.0/12.0/14.0/cygwin/mingw] +:: TOOLCHAIN - toolchain version [10.0/11.0/12.0/14.0/2017/cygwin/mingw] :: CONFIGURATION - determines EPICS build [dynamic/static] :: PLATFORM - architecture [x86/x64] :: @@ -57,10 +57,22 @@ if "%TOOLCHAIN%"=="mingw" ( ) set "VSINSTALL=C:\Program Files (x86)\Microsoft Visual Studio %TOOLCHAIN%" +if not exist "%VSINSTALL%\" set "VSINSTALL=C:\Program Files (x86)\Microsoft Visual Studio\%TOOLCHAIN%\Community" +if not exist "%VSINSTALL%\" goto MSMissing + set "MAKE=C:\tools\make" +echo [INFO] APPVEYOR_BUILD_WORKER_IMAGE=%APPVEYOR_BUILD_WORKER_IMAGE% + if "%OS%"=="64BIT" ( set EPICS_HOST_ARCH=windows-x64%ST% + :: VS 2017 + if exist "%VSINSTALL%\VC\Auxiliary\Build\vcvars64.bat" ( + call "%VSINSTALL%\VC\Auxiliary\Build\vcvars64.bat" + where cl + if !ERRORLEVEL! NEQ 0 goto MSMissing + goto MSFound + ) if exist "%VSINSTALL%\VC\vcvarsall.bat" ( call "%VSINSTALL%\VC\vcvarsall.bat" amd64 where cl @@ -79,12 +91,19 @@ if "%OS%"=="64BIT" ( ) ) else ( set EPICS_HOST_ARCH=win32-x86%ST% + :: VS 2017 + if exist "%VSINSTALL%\VC\Auxiliary\Build\vcvars32.bat" ( + call "%VSINSTALL%\VC\Auxiliary\Build\vcvars32.bat" + where cl + if !ERRORLEVEL! NEQ 0 goto MSMissing + goto MSFound + ) if exist "%VSINSTALL%\VC\vcvarsall.bat" ( call "%VSINSTALL%\VC\vcvarsall.bat" x86 where cl if !ERRORLEVEL! NEQ 0 goto MSMissing goto MSFound - ) + ) if exist "%VSINSTALL%\VC\bin\vcvars32.bat" ( call "%VSINSTALL%\VC\bin\vcvars32.bat" where cl From 5c97e54cf7794a332895cd7bdf09ffd466aa170d Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Thu, 28 Dec 2017 11:28:41 -0600 Subject: [PATCH 7/8] Drop seconds from genVersionHeader's build date/time On Windows a build can loop forever if seconds are included. --- src/tools/genVersionHeader.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/genVersionHeader.pl b/src/tools/genVersionHeader.pl index 5851ea831..c61f14c98 100644 --- a/src/tools/genVersionHeader.pl +++ b/src/tools/genVersionHeader.pl @@ -18,8 +18,8 @@ use POSIX qw(strftime); use strict; -# RFC 8601 date+time w/ zone (eg "2014-08-29T09:42:47-0700") -my $tfmt = '%Y-%m-%dT%H:%M:%S'; +# RFC 8601 date+time w/ zone (eg "2014-08-29T09:42-0700") +my $tfmt = '%Y-%m-%dT%H:%M'; $tfmt .= '%z' unless $^O eq 'MSWin32'; # %z returns zone name on Windows my $now = strftime($tfmt, localtime); From 8a1477ecab8433232d78e0a1806b3c5339135567 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Thu, 4 Jan 2018 09:00:18 +0100 Subject: [PATCH 8/8] appveyor-ci: update APS download URL --- ci/appveyor-prepare.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/appveyor-prepare.bat b/ci/appveyor-prepare.bat index 7d50c88be..26ca8118a 100644 --- a/ci/appveyor-prepare.bat +++ b/ci/appveyor-prepare.bat @@ -65,6 +65,6 @@ if "%TOOLCHAIN%"=="mingw" ( ) 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 "C:\Program Files\7-Zip\7z" e make-4.1.zip