diff options
| -rw-r--r-- | Changelog.md | 1 | ||||
| -rw-r--r-- | appveyor.yml | 6 | ||||
| -rw-r--r-- | libsolidity/parsing/DocStringParser.cpp | 20 | ||||
| -rw-r--r-- | libsolidity/parsing/DocStringParser.h | 2 | ||||
| -rw-r--r-- | libsolidity/parsing/Parser.cpp | 7 | ||||
| -rw-r--r-- | scripts/release.bat | 10 |
6 files changed, 29 insertions, 17 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/libsolidity/parsing/DocStringParser.cpp b/libsolidity/parsing/DocStringParser.cpp index d8927fea..d1d45150 100644 --- a/libsolidity/parsing/DocStringParser.cpp +++ b/libsolidity/parsing/DocStringParser.cpp @@ -1,17 +1,33 @@ +/* + This file is part of solidity. + + solidity is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + solidity is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with solidity. If not, see <http://www.gnu.org/licenses/>. +*/ #include <libsolidity/parsing/DocStringParser.h> + #include <liblangutil/ErrorReporter.h> #include <liblangutil/Exceptions.h> -#include <boost/range/irange.hpp> #include <boost/range/algorithm.hpp> +#include <boost/range/irange.hpp> using namespace std; using namespace dev; using namespace langutil; using namespace dev::solidity; - namespace { diff --git a/libsolidity/parsing/DocStringParser.h b/libsolidity/parsing/DocStringParser.h index c83b416d..671a2f34 100644 --- a/libsolidity/parsing/DocStringParser.h +++ b/libsolidity/parsing/DocStringParser.h @@ -22,8 +22,8 @@ #pragma once -#include <string> #include <libsolidity/ast/ASTAnnotations.h> +#include <string> namespace langutil { diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp index 26f13f93..9de2146e 100644 --- a/libsolidity/parsing/Parser.cpp +++ b/libsolidity/parsing/Parser.cpp @@ -20,14 +20,15 @@ * Solidity parser. */ -#include <cctype> -#include <vector> #include <libsolidity/parsing/Parser.h> + #include <libyul/AsmParser.h> #include <libyul/backends/evm/EVMDialect.h> -#include <liblangutil/SourceLocation.h> #include <liblangutil/ErrorReporter.h> #include <liblangutil/Scanner.h> +#include <liblangutil/SourceLocation.h> +#include <cctype> +#include <vector> using namespace std; using namespace langutil; 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 ^ |