Mercurial > hg > sonic-annotator
changeset 355:0b3c180d5e08
Update builds for VC2019 etc
| author | Chris Cannam |
|---|---|
| date | Wed, 23 Oct 2019 09:52:21 +0100 |
| parents | 68305800139d |
| children | e10d30c67eff |
| files | .appveyor.yml .travis.yml deploy/win/build-64.bat |
| diffstat | 3 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/.appveyor.yml Tue Oct 08 14:56:20 2019 +0100 +++ b/.appveyor.yml Wed Oct 23 09:52:21 2019 +0100 @@ -1,12 +1,13 @@ image: - - Visual Studio 2017 + - Visual Studio 2019 configuration: - Release install: - cinst --allow-empty-checksums smlnj + - cinst hg - ps: '"[hostfingerprints]" | Out-File -Encoding "ASCII" -Append $env:USERPROFILE\mercurial.ini' - ps: '"code.soundsoftware.ac.uk = C7:27:7E:2C:1E:67:62:90:E9:8D:27:52:66:30:E6:FE:D4:2C:C5:30" | Out-File -Encoding "ASCII" -Append $env:USERPROFILE\mercurial.ini' - ps: '"[hostsecurity]" | Out-File -Encoding "ASCII" -Append $env:USERPROFILE\mercurial.ini'
--- a/.travis.yml Tue Oct 08 14:56:20 2019 +0100 +++ b/.travis.yml Wed Oct 23 09:52:21 2019 +0100 @@ -12,7 +12,7 @@ - required osx_image: - - xcode9 + - xcode11 addons: apt:
--- a/deploy/win/build-64.bat Tue Oct 08 14:56:20 2019 +0100 +++ b/deploy/win/build-64.bat Wed Oct 23 09:52:21 2019 +0100 @@ -5,18 +5,20 @@ set STARTPWD=%CD% -set QTDIR=C:\Qt\5.13.0\msvc2017_64 +set QTDIR=C:\Qt\5.13.1\msvc2017_64 if not exist %QTDIR% ( -@ echo Could not find 64-bit Qt +@ echo Could not find 64-bit Qt in %QTDIR% @ exit /b 2 ) -if not exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" ( +set vcvarsall="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" + +if not exist %vcvarsall% ( @ echo "Could not find MSVC vars batch file" @ exit /b 2 ) -call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64 +call %vcvarsall% amd64 set ORIGINALPATH=%PATH% set PATH=%PATH%;C:\Program Files (x86)\SMLNJ\bin;%QTDIR%\bin