Merge branch 'develop' into evmc

# Conflicts:
#	appveyor.yml

Author: chfast

CMakeLists.txt

@@ -36,15 +36,18 @@ eth_policy()
 # project name and version should be set after cmake_policy CMP0048
 project(cpp-ethereum VERSION "1.3.0")
 
+set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY On)
+
+include(EthOptions)
 include(EthCompilerSettings)
 include(EthExecutableHelper)
 include(EthDependencies)
 include(EthUtils)
-include(EthOptions)
 
 include(deps/jsoncpp.cmake)
 include(deps/jsonrpc.cmake)
 include(deps/cryptopp.cmake)
+include(deps/boost.cmake)
 
 configure_project(CPUID CURL EVMJIT FATDB MINIUPNPC ROCKSDB PARANOID TESTS VMTRACE)
 

appveyor.yml

@@ -45,7 +45,10 @@ clone_script:
           git checkout -qf FETCH_HEAD
           git submodule -q update --init --recursive
       }
-cache: build/evmjit/llvm -> evmjit/cmake/llvm.cmake
+cache:
+    - build/evmjit/llvm -> evmjit/cmake/llvm.cmake
+    - deps/boost -> deps/boost.cmake
+    - deps/tmp/boost -> deps/boost.cmake
 #RDP LOGIN details for trouble shooting
 #init:
 #    - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

bench/CMakeLists.txt

@@ -9,19 +9,6 @@ target_include_directories(bench PRIVATE ../utils)
 target_link_libraries(bench ${Dev_DEVCORE_LIBRARIES})
 target_link_libraries(bench ${Dev_DEVCRYPTO_LIBRARIES})
 
-if (MSVC)
-	find_package(Boost QUIET REQUIRED COMPONENTS chrono date_time)
-	target_link_libraries(bench ${Boost_CHRONO_LIBRARIES})
-	target_link_libraries(bench ${Boost_DATE_TIME_LIBRARIES})
-endif()
-
 if (UNIX AND NOT APPLE)
 	target_link_libraries(bench pthread)
 endif()
-
-if (APPLE)
-	install(TARGETS bench DESTINATION bin)
-else()
-	eth_install_executable(bench)
-endif()
-

cmake/EthBuildInfo.cmake

@@ -1,4 +1,4 @@
-function(create_build_info NAME)
+function(create_build_info)
 
 	# Set build platform; to be written to BuildInfo.h
 	set(ETH_BUILD_OS "${CMAKE_SYSTEM_NAME}")
@@ -27,10 +27,6 @@ function(create_build_info NAME)
 
 	set(ETH_BUILD_PLATFORM "${ETH_BUILD_OS}/${ETH_BUILD_COMPILER}/${ETH_BUILD_JIT_MODE}")
 
-	if (PARANOID)
-		set(ETH_BUILD_PLATFORM "${ETH_BUILD_PLATFORM}/PARA")
-	endif ()
-
 	#cmake build type may be not speCified when using msvc
 	if (CMAKE_BUILD_TYPE)
 		set(_cmake_build_type ${CMAKE_BUILD_TYPE})
@@ -39,9 +35,9 @@ function(create_build_info NAME)
 	endif()
 
 	# Generate header file containing useful build information
-	add_custom_target(${NAME}_BuildInfo.h ALL
+	add_custom_target(BuildInfo.h ALL
 		WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-		COMMAND ${CMAKE_COMMAND} -DETH_SOURCE_DIR="${PROJECT_SOURCE_DIR}" -DETH_BUILDINFO_IN="${ETH_CMAKE_DIR}/templates/BuildInfo.h.in" -DETH_DST_DIR="${PROJECT_BINARY_DIR}/include/${PROJECT_NAME}" -DETH_CMAKE_DIR="${ETH_CMAKE_DIR}"
+		COMMAND ${CMAKE_COMMAND} -DETH_SOURCE_DIR="${PROJECT_SOURCE_DIR}" -DETH_BUILDINFO_IN="${ETH_CMAKE_DIR}/templates/BuildInfo.h.in" -DETH_DST_DIR="${PROJECT_BINARY_DIR}/include" -DETH_CMAKE_DIR="${ETH_CMAKE_DIR}"
 		-DETH_BUILD_TYPE="${_cmake_build_type}"
 		-DETH_BUILD_OS="${ETH_BUILD_OS}"
 		-DETH_BUILD_COMPILER="${ETH_BUILD_COMPILER}"

cmake/EthCompilerSettings.cmake

@@ -196,12 +196,6 @@ elseif (MSVC)
 	# stack size 16MB
 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ignore:4099,4075 /STACK:16777216")
 
-	# windows likes static
-	if (NOT ETH_STATIC)
-		message("Forcing static linkage for MSVC.")
-		set(ETH_STATIC 1)
-	endif ()
-
 # If you don't have GCC, Clang or VC++ then you are on your own.  Good luck!
 else ()
 	message(WARNING "Your compiler is not tested, if you run into any issues, we'd welcome any patches.")
@@ -240,9 +234,3 @@ if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MA
 		endif ()
 	endif ()
 endif ()
-
-if(ETH_STATIC)
-	set(BUILD_SHARED_LIBS OFF)
-else()
-	set(BUILD_SHARED_LIBS ON)
-endif(ETH_STATIC)

cmake/EthDependencies.cmake

@@ -49,9 +49,6 @@ if (MSVC)
 	set (CMAKE_PREFIX_PATH ${ETH_DEPENDENCY_INSTALL_DIR} ${CMAKE_PREFIX_PATH})
 endif()
 
-# boilerplate macros for some code editors
-add_definitions(-DETH_TRUE)
-
 # custom cmake scripts
 set(ETH_CMAKE_DIR ${CMAKE_CURRENT_LIST_DIR})
 set(ETH_SCRIPTS_DIR ${ETH_CMAKE_DIR}/scripts)
@@ -88,105 +85,13 @@ else()
 	set(Boost_USE_STATIC_LIBS ON)
 endif()
 
-# We have work-in-progress here to support building cpp-ethereum with static-linkage, which
-# provides a fantastic end-user experience.  You have entirely standalone executables
-# which are entirely atomic and "just work".  They contain everything you need and talk directly
-# to the operating system kernel.  Such linkage also allow best-possible dead-code removal and
-# global optimizations.  That is the model which is used by default for all golang apps.
-#
-# "Enable static build of binaries"
-# https://github.com/ethereum/webthree-umbrella/issues/495
-#
-# So we just have `geth` and `geth.exe`.  This mode lets you have an `eth` which works just
-# the same.  This approach is a particular benefit on Linux where there is huge fragmentation
-# of packaging systems and .so versioning across distros.  Building a standalone executable
-# for Linux which "just works" on all distros would be a huge win.  This mode allows just
-# that to happen already on Alpine Linux using the musl standard library, and I hope we can
-# extend that support to further distros in the near future.
-#
-# We also have partial support for static linkage on macOS, though we would only be able to
-# statically link the external dependencies above the kernel.  Anything which is part of the
-# operating system itself can only be used via dylibs.  Still, we can improve things a lot.
-#
-# This is a macOS operating system constraint.
-#
-# See https://developer.apple.com/library/mac/qa/qa1118/_index.html
-#
-# "Apple does not support statically linked binaries on Mac OS X.  A statically linked binary
-# assumes binary compatibility at the kernel system call interface, and we do not make any
-# guarantees on that front. Rather, we strive to ensure binary compatibility in each
-# dynamically linked system library and framework."
-
-set(STATIC_LINKING FALSE CACHE BOOL "Build static binaries")
-
-if (STATIC_LINKING)
-
-	set(Boost_USE_STATIC_RUNTIME ON)
-	set(OpenSSL_USE_STATIC_LIBS ON)
-
-	if (MSVC)
-		# TODO - Why would we need .a on Windows?  Maybe some Cygwin-ism.
-		# When I work through Windows static linkage, I will remove this,
-		# if that is possible.
-		set(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
-	elseif (APPLE)
-		# At the time of writing, we are still only PARTIALLY statically linked
-		# on OS X, with a mixture of statically linked external libraries where
-		# those are available, and dynamically linked where that is the only
-		# option we have.    Ultimately, the aim would be for everything except
-		# the runtime libraries to be statically linked.
-		#
-		# Still TODO:
-		# - json-rpc-cpp
-		# - leveldb (which pulls in snappy, for the dylib at ;east)
-		# - miniupnp
-		# - gmp
-		#
-		# Two further libraries (curl and zlib) ship as dylibs with the platform
-		# but again we could build from source and statically link these too.
-		set(CMAKE_FIND_LIBRARY_SUFFIXES .a .dylib)
-	else()
-		set(CMAKE_FIND_LIBRARY_SUFFIXES .a)
-	endif()
-
-	set(ETH_STATIC ON)
-endif()
-
-# Add Homebrew include paths and library paths for macOS clients.
-#
-# Homebrew (http://brew.sh/) is the de-facto standard package manager for Mac.
-# It is a rolling-release manager, which brings its own problems, because it
-# means that we are building on top of an unstable platform, where the build
-# can work for me today and be broken for you tomorrow, even though we didn't
-# change anything ourselves.  Qt was particularly problematic for this, but
-# thankfully is no longer an issue for us anymore, after we removed the GUI
-# applications in cpp-ethereum-v1.3.0.
-#
-# There is an alternative (minority) packaging system called MacPorts, but it isn't
-# possible to run both on a single computer, so we dropped support for
-# MacPorts in early 2016 to simplify our problem space.
-#
-# Again, as per the Windows notes above, building dependencies from source
-# would sidestep these issues entirely.
-#
-# "Both Homebrew and MacPorts are 'rolling release' package managers"
-# https://github.com/ethereum/webthree-umbrella/issues/118
-if (APPLE)
-	link_directories(/usr/local/lib)
-	include_directories(/usr/local/include)
-endif()
-
 include_directories(BEFORE "${PROJECT_BINARY_DIR}/include")
 
 function(eth_use TARGET REQUIRED)
 	if (NOT TARGET ${TARGET})
 		message(FATAL_ERROR "eth_use called for non existing target ${TARGET}")
 	endif()
 
-	if (TARGET ${PROJECT_NAME}_BuildInfo.h)
-		add_dependencies(${TARGET} ${PROJECT_NAME}_BuildInfo.h)
-	endif()
-
 	foreach(MODULE ${ARGN})
 		string(REPLACE "::" ";" MODULE_PARTS "${MODULE}")
 		list(GET MODULE_PARTS 0 MODULE_MAIN)

cmake/EthExecutableHelper.cmake

@@ -43,36 +43,6 @@ macro(eth_add_executable EXECUTABLE)
 
 endmacro()
 
-macro(eth_simple_add_executable EXECUTABLE)
-	add_executable(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
-
-	# Apple does not support statically linked binaries on OS X.   That means
-	# that we can only statically link against our external libraries, but
-	# we cannot statically link against the C++ runtime libraries and other
-	# platform libraries (as is possible on Windows and Alpine Linux) to produce
-	# an entirely transportable binary.
-	#
-	# See https://developer.apple.com/library/mac/qa/qa1118/_index.html for more info.
-	#
-	# GLIBC also appears not to support static linkage too, which probably means that
-	# Debian and Ubuntu will only be able to do partially-statically linked
-	# executables too, just like OS X.
-	#
-	# For OS X, at the time of writing, we are left with the following dynamically
-	# linked dependencies, of which curl and libz might still be fixable:
-	#
-	# /usr/lib/libc++.1.dylib
-	# /usr/lib/libSystem.B.dylib
-	# /usr/lib/libcurl.4.dylib
-	# /usr/lib/libz.1.dylib
-	#
-	if (STATIC_LINKING AND NOT APPLE)
-		set(CMAKE_EXE_LINKER_FLAGS "-static ${CMAKE_EXE_LINKER_FLAGS}")
-		set_target_properties(${EXECUTABLE} PROPERTIES LINK_SEARCH_START_STATIC 1)
-		set_target_properties(${EXECUTABLE} PROPERTIES LINK_SEARCH_END_STATIC 1)
-	endif()
-endmacro()
-
 macro(eth_copy_dll EXECUTABLE DLL)
 	# dlls must be unsubstitud list variable (without ${}) in format
 	# optimized;path_to_dll.dll;debug;path_to_dlld.dll

cmake/EthOptions.cmake

@@ -7,7 +7,7 @@ macro(configure_project)
 			"Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE)
 	endif()
 
-	eth_default_option(STATIC_BUILD OFF)
+	eth_default_option(BUILD_SHARED_LIBS OFF)
 
 	# features
 	eth_default_option(VMTRACE OFF)
@@ -34,11 +34,6 @@ macro(configure_project)
 		endif ()
 	endif ()
 
-	if (STATIC_BUILD)
-		set(STATIC_LINKING 1)
-		set(BUILD_SHARED_LIBS 0)
-	endif ()
-
 	# Define a matching property name of each of the "features".
 	foreach(FEATURE ${ARGN})
 		set(SUPPORT_${FEATURE} TRUE)
@@ -49,10 +44,6 @@ macro(configure_project)
 	# and on again easily enough, and also to grep for them.
 	add_definitions(-DDISABLE_BROKEN_UNIT_TESTS_UNTIL_WE_FIX_THEM)
 
-	# TODO:  Eliminate this pre-processor symbol, which is a bad pattern.
-	# Common code has no business knowing which application it is part of.
-	add_definitions(-DETH_TRUE)
-
 	# Are we including the JIT EVM module?
 	# That pulls in a quite heavyweight LLVM dependency, which is
 	# not suitable for all platforms.
@@ -92,7 +83,7 @@ macro(configure_project)
 	endif()
 
 	include(EthBuildInfo)
-	create_build_info(${NAME})
+	create_build_info()
 	print_config(${NAME})
 endmacro()
 

cmake/FindLevelDB.cmake

@@ -29,7 +29,7 @@ set(LEVELDB_LIBRARIES ${LEVELDB_LIBRARY})
 # This might be due to some dependency within leveldb which would be dead-code
 # stripped if we were using a static lib for leveldb.   We aren't (yet), because
 # we only have partial static-linkage on OS X so far.
-if (STATIC_LINKING AND APPLE)
+if (NOT BUILD_SHARED_LIBS AND APPLE)
 	find_path(SNAPPY_INCLUDE_DIR snappy.h PATH_SUFFIXES snappy)
 	find_library(SNAPPY_LIBRARY snappy)
 	set(LEVELDB_INCLUDE_DIRS ${LEVELDB_INCLUDE_DIR} ${SNAPPY_INCLUDE_DIR})

cmake/UseMiniupnpc.cmake

@@ -2,7 +2,7 @@ function(eth_apply TARGET REQUIRED)
 	find_package (Miniupnpc 1.8.2013)
 	eth_show_dependency(MINIUPNPC miniupnpc)
 	if (MINIUPNPC AND MINIUPNPC_FOUND)
-		target_include_directories(${TARGET} SYSTEM PUBLIC ${MINIUPNPC_INCLUDE_DIRS})
+		target_include_directories(${TARGET} SYSTEM PRIVATE ${MINIUPNPC_INCLUDE_DIRS})
 		target_link_libraries(${TARGET} ${MINIUPNPC_LIBRARIES})
 		target_compile_definitions(${TARGET} PUBLIC ETH_MINIUPNPC)
 	elseif (NOT ${REQUIRED} STREQUAL "OPTIONAL")