cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5669 from ethereum/retire2015

Browse Source 
Remove support for Visual Studio 2015.
This commit is contained in:
chriseth 2018-12-17 19:49:51 +01:00 committed by GitHub
commit 8570bee20b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -20,6 +20,7 @@ Bugfixes:
Build System: Build System:
* Replace the trusty PPA build by a static build on cosmic that is used for the trusty package instead. * 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) ### 0.5.1 (2018-12-03)

6
appveyor.yml
View File

@ -35,7 +35,6 @@ configuration:
- RelWithDebInfo - RelWithDebInfo
environment: environment:
matrix: matrix:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
# This is used for pushing to solidity-test-bytecodes # This is used for pushing to solidity-test-bytecodes
priv_key: priv_key:
@ -63,12 +62,11 @@ install:
before_build: before_build:
- if not exist build mkdir build - if not exist build mkdir build
- cd build - cd build
- if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2015" ( cmake -G "Visual Studio 14 2015 Win64" .. -DTESTS=On ) - cmake -G "Visual Studio 15 2017 Win64" .. -DTESTS=On
else ( cmake -G "Visual Studio 15 2017 Win64" .. -DTESTS=On )
build_script: build_script:
- msbuild solidity.sln /p:Configuration=%CONFIGURATION% /m:%NUMBER_OF_PROCESSORS% /v:minimal - msbuild solidity.sln /p:Configuration=%CONFIGURATION% /m:%NUMBER_OF_PROCESSORS% /v:minimal
- cd %APPVEYOR_BUILD_FOLDER% - 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 - ps: $bytecodedir = git show -s --format="%cd-%H" --date=short
test_script: test_script:

10
scripts/release.bat
View File

@ -29,13 +29,9 @@ REM ---------------------------------------------------------------------------
set CONFIGURATION=%1 set CONFIGURATION=%1
set VERSION=%2 set VERSION=%2
IF "%VERSION%"=="2015" ( set "DLLS=MSVC_DLLS_NOT_FOUND"
set "DLLS=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x86\Microsoft.VC140.CRT\msvc*.dll" FOR /d %%d IN ("C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Redist\MSVC\*"
) ELSE ( "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 ^ 7z a solidity-windows.zip ^
.\build\solc\%CONFIGURATION%\solc.exe .\build\test\%CONFIGURATION%\soltest.exe ^ .\build\solc\%CONFIGURATION%\solc.exe .\build\test\%CONFIGURATION%\soltest.exe ^