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

Allow support for older boost and adjust docs

Browse Source
This commit is contained in:
Nikola Matic 2023-01-18 09:01:33 +01:00
parent 96ddc54fa2
commit c2e2adb953
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/installing-solidity.rst
View File

@ -319,9 +319,10 @@ The following are dependencies for all builds of Solidity:
+-----------------------------------+-------------------------------------------------------+ +-----------------------------------+-------------------------------------------------------+
| Software | Notes | | Software | Notes |
+===================================+=======================================================+ +===================================+=======================================================+
| `CMake`_ (version 3.13+) | Cross-platform build file generator. | | `CMake`_ (version 3.21.3+ on | Cross-platform build file generator. |
| Windows, 3.13+ otherwise) | |
+-----------------------------------+-------------------------------------------------------+ +-----------------------------------+-------------------------------------------------------+
| `Boost`_ (version 1.77+ on | C++ libraries. | | `Boost`_ (version 1.77 on | C++ libraries. |
| Windows, 1.65+ otherwise) | | | Windows, 1.65+ otherwise) | |
+-----------------------------------+-------------------------------------------------------+ +-----------------------------------+-------------------------------------------------------+
| `Git`_ | Command-line tool for retrieving source code. | | `Git`_ | Command-line tool for retrieving source code. |
@ -408,7 +409,7 @@ You need to install the following dependencies for Windows builds of Solidity:
+-----------------------------------+-------------------------------------------------------+ +-----------------------------------+-------------------------------------------------------+
| `Visual Studio 2019`_ (Optional) | C++ compiler and dev environment. | | `Visual Studio 2019`_ (Optional) | C++ compiler and dev environment. |
+-----------------------------------+-------------------------------------------------------+ +-----------------------------------+-------------------------------------------------------+
| `Boost`_ (version 1.77+) | C++ libraries. | | `Boost`_ (version 1.77) | C++ libraries. |
+-----------------------------------+-------------------------------------------------------+ +-----------------------------------+-------------------------------------------------------+
If you already have one IDE and only need the compiler and libraries, If you already have one IDE and only need the compiler and libraries,

6
libsolidity/lsp/LanguageServer.cpp
View File

@ -220,8 +220,12 @@ vector<boost::filesystem::path> LanguageServer::allSolidityFilesFromProject() co
// We explicitly decided against including all files from include paths but leave the possibility // We explicitly decided against including all files from include paths but leave the possibility
// open for a future PR to enable such a feature to be optionally enabled (default disabled). // open for a future PR to enable such a feature to be optionally enabled (default disabled).
// Note: Newer versions of boost have deprecated symlink_option::recurse
#if (BOOST_VERSION < 107200)
auto directoryIterator = fs::recursive_directory_iterator(m_fileRepository.basePath(), fs::symlink_option::recurse);
#else
auto directoryIterator = fs::recursive_directory_iterator(m_fileRepository.basePath(), fs::directory_options::follow_directory_symlink); auto directoryIterator = fs::recursive_directory_iterator(m_fileRepository.basePath(), fs::directory_options::follow_directory_symlink);
#endif
for (fs::directory_entry const& dirEntry: directoryIterator) for (fs::directory_entry const& dirEntry: directoryIterator)
if ( if (
dirEntry.path().extension() == ".sol" && dirEntry.path().extension() == ".sol" &&

3
libsolutil/Common.h
View File

@ -41,9 +41,6 @@
#include <libsolutil/vector_ref.h> #include <libsolutil/vector_ref.h>
#include <boost/version.hpp> #include <boost/version.hpp>
#if (BOOST_VERSION < 106500)
#error "Unsupported Boost version. At least 1.65 required."
#endif
#include <map> #include <map>
#include <utility> #include <utility>

3
libsolutil/Numeric.h
View File

@ -25,9 +25,6 @@
#include <libsolutil/CommonData.h> #include <libsolutil/CommonData.h>
#include <boost/version.hpp> #include <boost/version.hpp>
#if (BOOST_VERSION < 106500)
#error "Unsupported Boost version. At least 1.65 required."
#endif
// TODO: do this only conditionally as soon as a boost version with gcc 12 support is released. // TODO: do this only conditionally as soon as a boost version with gcc 12 support is released.
#if defined(__GNUC__) && !defined(__clang__) && (__GNUC__ >= 12) #if defined(__GNUC__) && !defined(__clang__) && (__GNUC__ >= 12)