diff options
| author | chriseth <chris@ethereum.org> | 2018-12-18 02:49:51 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-18 02:49:51 +0800 |
| commit | 8570bee20bb4ed8720f9f774244797379c2b1d50 (patch) | |
| tree | 42893bd9a6a901d30b00fae602c9b095570860b0 | |
| parent | c5316b13e761e1e76e29d3dd820eaf5e01f08088 (diff) | |
| parent | 7b1a6798e6ca7a4dfb979d8c16da04d37038a563 (diff) | |
| download | dexon-solidity-8570bee20bb4ed8720f9f774244797379c2b1d50.tar.gz dexon-solidity-8570bee20bb4ed8720f9f774244797379c2b1d50.tar.zst dexon-solidity-8570bee20bb4ed8720f9f774244797379c2b1d50.zip | |
Merge pull request #5669 from ethereum/retire2015
Remove support for Visual Studio 2015.
| -rw-r--r-- | Changelog.md | 1 | ||||
| -rw-r--r-- | appveyor.yml | 6 | ||||
| -rw-r--r-- | scripts/release.bat | 10 |
3 files changed, 6 insertions, 11 deletions
diff --git a/Changelog.md b/Changelog.md index 3eeb6fa8..e26ab0f9 100644 --- a/Changelog.md +++ b/Changelog.md @@ -20,6 +20,7 @@ Bugfixes: Build System: * Replace the trusty PPA build by a static build on cosmic that is used for the trusty package instead. + * Remove support for Visual Studio 2015. ### 0.5.1 (2018-12-03) diff --git a/appveyor.yml b/appveyor.yml index 91ea8af7..5377925e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -35,7 +35,6 @@ configuration: - RelWithDebInfo environment: matrix: - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 # This is used for pushing to solidity-test-bytecodes priv_key: @@ -63,12 +62,11 @@ install: before_build: - if not exist build mkdir build - cd build - - if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2015" ( cmake -G "Visual Studio 14 2015 Win64" .. -DTESTS=On ) - else ( cmake -G "Visual Studio 15 2017 Win64" .. -DTESTS=On ) + - cmake -G "Visual Studio 15 2017 Win64" .. -DTESTS=On build_script: - msbuild solidity.sln /p:Configuration=%CONFIGURATION% /m:%NUMBER_OF_PROCESSORS% /v:minimal - cd %APPVEYOR_BUILD_FOLDER% - - if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2017" ( scripts\release.bat %CONFIGURATION% 2017 ) + - scripts\release.bat %CONFIGURATION% 2017 - ps: $bytecodedir = git show -s --format="%cd-%H" --date=short test_script: diff --git a/scripts/release.bat b/scripts/release.bat index b15b49b7..cfd0c838 100644 --- a/scripts/release.bat +++ b/scripts/release.bat @@ -29,13 +29,9 @@ REM --------------------------------------------------------------------------- set CONFIGURATION=%1 set VERSION=%2 -IF "%VERSION%"=="2015" ( - set "DLLS=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x86\Microsoft.VC140.CRT\msvc*.dll" -) ELSE ( - set "DLLS=MSVC_DLLS_NOT_FOUND" - FOR /d %%d IN ("C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Redist\MSVC\*" - "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\*") DO set "DLLS=%%d\x86\Microsoft.VC141.CRT\msvc*.dll" -) +set "DLLS=MSVC_DLLS_NOT_FOUND" +FOR /d %%d IN ("C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Redist\MSVC\*" + "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\*") DO set "DLLS=%%d\x86\Microsoft.VC141.CRT\msvc*.dll" 7z a solidity-windows.zip ^ .\build\solc\%CONFIGURATION%\solc.exe .\build\test\%CONFIGURATION%\soltest.exe ^ |