Merge branch 'develop' into discovery

CMakeLists.txt

@@ -389,23 +389,37 @@ endif()
 if (WIN32)
 	# packaging stuff
 	include(InstallRequiredSystemLibraries)
-	set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "ethereum")
+	set(CPACK_PACKAGE_NAME "Ethereum")
+	set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Ethereum")
 	set(CPACK_PACKAGE_VENDOR "ethereum.org")
 	set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
 	set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
-	set(CPACK_PACKAGE_VERSION "0.7")
+	set(CPACK_PACKAGE_VERSION "0.9")
 	set(CPACK_GENERATOR "NSIS")
 	# seems to be not working
 	# set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/alethzero/alethzero.bmp")
 
 	# our stuff
 	set(CPACK_COMPONENT_ALETHZERO_GROUP "Applications")
-	set(CPACK_COMPONENT_THIRD_GROUP "Applications")
 	set(CPACK_COMPONENT_MIX_GROUP "Applications")
-	set(CPACK_COMPONENTS_ALL alethzero third mix)
+	set(CPACK_COMPONENT_SOLC_GROUP "CLI")
+	set(CPACK_COMPONENT_ETH_GROUP "CLI")
+	set(CPACK_COMPONENT_ETHMINER_GROUP "CLI")
+	set(CPACK_COMPONENT_RLP_GROUP "CLI")
+	set(CPACK_COMPONENT_ABI_GROUP "CLI")
+
+	set(CPACK_COMPONENTS_ALL alethzero mix solc eth ethminer rlp abi)
 
 	# nsis specific stuff
-	set(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} ethereum")
+	if (CMAKE_CL_64)
+		set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64")
+		set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION} (Win64)")
+	else ()
+		set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES")
+		set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION}")
+	endif()
+
+	set(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} Ethereum")
 	set(CPACK_NSIS_HELP_LINK "https://github.com/ethereum/cpp-ethereum")
 	set(CPACK_NSIS_URL_INFO_ABOUT "https://github.com/ethereum/cpp-ethereum")
 	set(CPACK_NSIS_CONTACT "ethereum.org")

abi/CMakeLists.txt

@@ -12,5 +12,4 @@ add_executable(${EXECUTABLE} ${SRC_LIST})
 
 target_link_libraries(${EXECUTABLE} ethereum)
 
-install( TARGETS ${EXECUTABLE} DESTINATION bin) 
-
+eth_install_executable(${EXECUTABLE})

cmake/EthExecutableHelper.cmake

@@ -126,8 +126,15 @@ macro(eth_install_executable EXECUTABLE)
 			eth_copy_dlls(${EXECUTABLE} ${dll})
 		endforeach(dll)
 
-		install( TARGETS ${EXECUTABLE} RUNTIME 
-			DESTINATION bin
+		install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/Debug"
+			DESTINATION .
+			CONFIGURATIONS Debug
+			COMPONENT ${EXECUTABLE}
+		)
+
+		install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/Release"
+			DESTINATION .
+			CONFIGURATIONS Release
 			COMPONENT ${EXECUTABLE}
 		)
 

eth/CMakeLists.txt

@@ -37,5 +37,4 @@ if (DEFINED WIN32 AND NOT DEFINED CMAKE_COMPILER_IS_MINGW)
 	eth_copy_dlls("${EXECUTABLE}" MHD_DLLS)
 endif()
 
-install( TARGETS ${EXECUTABLE} DESTINATION bin )
-
+eth_install_executable(${EXECUTABLE})

ethminer/CMakeLists.txt

@@ -37,5 +37,4 @@ if (DEFINED WIN32 AND NOT DEFINED CMAKE_COMPILER_IS_MINGW)
 	eth_copy_dlls("${EXECUTABLE}" MHD_DLLS)
 endif()
 
-install( TARGETS ${EXECUTABLE} DESTINATION bin )
-
+eth_install_executable(${EXECUTABLE})

libdevcore/Common.cpp

@@ -28,7 +28,7 @@ using namespace dev;
 namespace dev
 {
 
-char const* Version = "0.9.14";
+char const* Version = "0.9.15";
 
 void HasInvariants::checkInvariants() const
 {

libp2p/NodeTable.h

@@ -132,7 +132,7 @@ public:
 	~NodeTable();
 
 	/// Returns distance based on xor metric two node ids. Used by NodeEntry and NodeTable.
-	static unsigned distance(NodeId const& _a, NodeId const& _b) { u512 d = _a ^ _b; unsigned ret; for (ret = 0; d >>= 1; ++ret) {}; return ret; }
+	static unsigned distance(NodeId const& _a, NodeId const& _b) { u256 d = sha3(_a) ^ sha3(_b); unsigned ret; for (ret = 0; d >>= 1; ++ret) {}; return ret; }
 
 	/// Set event handler for NodeEntryAdded and NodeEntryDropped events.
 	void setEventHandler(NodeTableEventHandler* _handler) { m_nodeEventHandler.reset(_handler); }
@@ -169,7 +169,7 @@ private:
 
 	/// Constants for Kademlia, derived from address space.
 
-	static unsigned const s_addressByteSize = sizeof(NodeId);				///< Size of address type in bytes.
+	static unsigned const s_addressByteSize = h256::size;					///< Size of address type in bytes.
 	static unsigned const s_bits = 8 * s_addressByteSize;					///< Denoted by n in [Kademlia].
 	static unsigned const s_bins = s_bits - 1;								///< Size of m_state (excludes root, which is us).
 	static unsigned const s_maxSteps = boost::static_log2<s_bits>::value;	///< Max iterations of discovery. (discover)

rlp/CMakeLists.txt

@@ -12,5 +12,4 @@ add_executable(${EXECUTABLE} ${SRC_LIST})
 
 target_link_libraries(${EXECUTABLE} devcrypto)
 
-install( TARGETS ${EXECUTABLE} DESTINATION bin) 
-
+eth_install_executable(${EXECUTABLE})

solc/CMakeLists.txt

@@ -17,7 +17,7 @@ target_link_libraries(${EXECUTABLE} ${Boost_FILESYSTEM_LIBRARIES})
 target_link_libraries(${EXECUTABLE} ${Boost_PROGRAM_OPTIONS_LIBRARIES})
 target_link_libraries(${EXECUTABLE} solidity)
 
-install( TARGETS ${EXECUTABLE} DESTINATION bin )
+eth_install_executable(${EXECUTABLE})
 
 add_library(soljson jsonCompiler.cpp ${HEADERS})
 target_link_libraries(soljson solidity)