diff --git a/.ci/appveyor-make.bat b/.ci/appveyor-make.bat index d74c8758d..f06f7fa09 100644 --- a/.ci/appveyor-make.bat +++ b/.ci/appveyor-make.bat @@ -19,10 +19,10 @@ echo.%CONFIGURATION% | findstr /C:"static">nul && ( set "ST=-static" ) -set OS=64BIT -if "%PLATFORM%"=="x86" set OS=32BIT +set MY_OS=64BIT +if "%PLATFORM%"=="x86" set MY_OS=32BIT -echo [INFO] Platform: %OS% +echo [INFO] Platform: %MY_OS% :: Use parallel make, except for 3.14 set "MAKEARGS=-j2 -Otarget" @@ -30,7 +30,7 @@ if "%APPVEYOR_REPO_BRANCH%"=="3.14" set MAKEARGS= if "%TOOLCHAIN%"=="cygwin" ( set "MAKE=make" - if "%OS%"=="64BIT" ( + if "%MY_OS%"=="64BIT" ( set "EPICS_HOST_ARCH=cygwin-x86_64" set "INCLUDE=C:\cygwin64\include;%INCLUDE%" set "PATH=C:\cygwin64\bin;%PATH%" @@ -48,7 +48,7 @@ if "%TOOLCHAIN%"=="cygwin" ( if "%TOOLCHAIN%"=="mingw" ( set "MAKE=mingw32-make" - if "%OS%"=="64BIT" ( + if "%MY_OS%"=="64BIT" ( set "EPICS_HOST_ARCH=windows-x64-mingw" set "INCLUDE=C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\include;%INCLUDE%" set "PATH=C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin;%PATH%" @@ -77,7 +77,7 @@ set "MAKE=C:\tools\make" echo [INFO] APPVEYOR_BUILD_WORKER_IMAGE=%APPVEYOR_BUILD_WORKER_IMAGE% -if "%OS%"=="64BIT" ( +if "%MY_OS%"=="64BIT" ( set EPICS_HOST_ARCH=windows-x64%ST% :: VS 2017/2019 if exist "%VSINSTALL%\VC\Auxiliary\Build\vcvars64.bat" ( @@ -132,7 +132,7 @@ if "%OS%"=="64BIT" ( ) :MSMissing -echo [INFO] Installation for MSVC Toolchain %TOOLCHAIN% / %OS% seems to be missing +echo [INFO] Installation for MSVC Toolchain %TOOLCHAIN% / %MY_OS% seems to be missing exit 1 :MSFound diff --git a/.ci/appveyor-prepare.bat b/.ci/appveyor-prepare.bat index 95a6a07c8..255165256 100644 --- a/.ci/appveyor-prepare.bat +++ b/.ci/appveyor-prepare.bat @@ -11,10 +11,10 @@ Setlocal EnableDelayedExpansion -set OS=64BIT -if "%PLATFORM%"=="x86" set OS=32BIT +set MY_OS=64BIT +if "%PLATFORM%"=="x86" set MY_OS=32BIT -echo [INFO] Platform: %OS% +echo [INFO] Platform: %MY_OS% :: with MSVC either static or debug can be handled as part :: of EPICS_HOST_ARCH but not both. So we set the appropriate @@ -36,7 +36,7 @@ echo.%CONFIGURATION% | findstr /C:"debug">nul && ( ) if "%TOOLCHAIN%"=="cygwin" ( - if "%OS%"=="64BIT" ( + if "%MY_OS%"=="64BIT" ( echo [INFO] Installing Cygwin 64bit and dependencies @powershell -Command "(new-object net.webclient).DownloadFile('http://www.cygwin.com/setup-x86_64.exe', 'C:\cygwin64\setup-x86_64.exe')" C:\cygwin64\setup-x86_64.exe -q -P "libreadline-devel,libncursesw-devel"