mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
4ee2114127
This commit is the culmination of several months of work to decouple Solidity from the webthree-umbrella so that it can be developed in parallel with cpp-ethereum (the Ethereum C++ runtime) and so that even for the Solidity unit-tests there is no hard-dependency onto the C++ runtime. The Tests-over-IPC refactoring was a major step in the same process which was already committed. This commit contains the following changes: - A subset of the CMake functionality in webthree-helpers was extracted and tailored for Solidity into ./cmake. Further cleanup is certainly possible. - A subset of the libdevcore functionality in libweb3core was extracted and tailored for Solidity into ./libdevcore. Further cleanup is certainly possible - The gas price constants in EVMSchedule were orphaned into libevmasm. - Some other refactorings and cleanups were made to sever unnecessary EVM dependencies in the Solidity unit-tests. - TravisCI and Appveyor support was added, covering builds and running of the unit-tests (Linux and macOS only for now) - A bug-fix was made to get the Tests-over-IPC running on macOS. - There are still reliability issues in the unit-tests, which need immediate attention. The Travis build has been flipped to run the unit-tests 5 times, to try to flush these out. - The Emscripten automation which was previously in webthree-umbrella was merged into the TravisCI automation here. - The development ZIP deployment step has been commented out, but we will want to read that ONLY for release branch. Further iteration on these changes will definitely be needed, but I feel these have got to sufficient maturity than holding them back further isn't winning us anything. It is go time :-)
44 lines
956 B
CMake
44 lines
956 B
CMake
cmake_minimum_required(VERSION 3.0.0)
|
|
|
|
set(ETH_CMAKE_DIR "${CMAKE_CURRENT_LIST_DIR}/cmake" CACHE PATH "The the path to the cmake directory")
|
|
list(APPEND CMAKE_MODULE_PATH ${ETH_CMAKE_DIR})
|
|
|
|
# Set cmake_policies
|
|
include(EthPolicy)
|
|
eth_policy()
|
|
|
|
# project name and version should be set after cmake_policy CMP0048
|
|
set(PROJECT_VERSION "0.3.5")
|
|
project(solidity VERSION ${PROJECT_VERSION})
|
|
|
|
# Let's find our dependencies
|
|
include(EthDependencies)
|
|
|
|
# Figure out what compiler and system are we using
|
|
include(EthCompilerSettings)
|
|
|
|
# Include helper macros
|
|
include(EthExecutableHelper)
|
|
|
|
# Include utils
|
|
include(EthUtils)
|
|
|
|
include(EthOptions)
|
|
configure_project(TESTS)
|
|
|
|
add_subdirectory(libdevcore)
|
|
add_subdirectory(libevmasm)
|
|
add_subdirectory(libsolidity)
|
|
add_subdirectory(solc)
|
|
|
|
if (NOT EMSCRIPTEN)
|
|
add_subdirectory(liblll)
|
|
add_subdirectory(lllc)
|
|
endif()
|
|
|
|
if (TESTS AND NOT EMSCRIPTEN)
|
|
add_subdirectory(test)
|
|
endif()
|
|
|
|
# TODO installation and packaging rules
|