From db77f2064193afc7d9dc77c2544bd1f515e64315 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Wed, 2 Jul 2014 16:55:56 +0200 Subject: [PATCH] Minor fix. --- CMakeLists.txt | 53 ++++++++++++++++----------------- MANIFEST.in | 28 ------------------ libethereum/PeerServer.cpp | 23 ++++++++++----- setup.py | 60 -------------------------------------- 4 files changed, 40 insertions(+), 124 deletions(-) delete mode 100644 MANIFEST.in delete mode 100644 setup.py diff --git a/CMakeLists.txt b/CMakeLists.txt index 9fafcb9ca..a137a7432 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,51 +109,48 @@ else () message(FATAL_ERROR "Your C++ compiler does not support C++11.") endif () -if (${TARGET_PLATFORM} STREQUAL "w64") -else () +if(${TARGET_PLATFORM} STREQUAL "w64") +else() # Look for available Crypto++ version and if it is >= 5.6.2 find_path(ID cryptlib.h - /usr/include/cryptopp - /usr/include/crypto++ - /usr/local/include/cryptopp - /usr/local/include/crypto++ - /opt/local/include/cryptopp - /opt/local/include/crypto++ - ) - find_library(LS NAMES cryptoppeth cryptopp - PATHS - /usr/lib - /usr/local/lib - /opt/local/lib - ) + ../cryptopp/src + ../../cryptopp/src) + if(ID) + set(LS ${ID}/../target/build/release/libcryptopp.so) + else() + find_path(ID cryptlib.h + /usr/include/cryptopp + /usr/include/crypto++ + /usr/local/include/cryptopp + /usr/local/include/crypto++ + /opt/local/include/cryptopp + /opt/local/include/crypto++ + ) + find_library(LS NAMES cryptoppeth cryptopp + PATHS + /usr/lib + /usr/local/lib + /opt/local/lib + ) + endif() - if(ID AND LS) + if (ID AND LS) message(STATUS "Found Crypto++: ${ID}, ${LS}") set(_CRYPTOPP_VERSION_HEADER ${ID}/config.h) if(EXISTS ${_CRYPTOPP_VERSION_HEADER}) file(STRINGS ${_CRYPTOPP_VERSION_HEADER} _CRYPTOPP_VERSION REGEX "^#define CRYPTOPP_VERSION[ \t]+[0-9]+$") string(REGEX REPLACE "^#define CRYPTOPP_VERSION[ \t]+([0-9]+)" "\\1" _CRYPTOPP_VERSION ${_CRYPTOPP_VERSION}) if(${_CRYPTOPP_VERSION} LESS 562) - message(STATUS "System Crypto++ version found is smaller than 5.6.2.") + message(STATUS "Crypto++ version found is smaller than 5.6.2.") else() set(CRYPTOPP_INCLUDE_DIR ${ID} CACHE FILEPATH "" FORCE) set(CRYPTOPP_LIBRARIES ${LS} CACHE FILEPATH "" FORCE) set(CRYPTOPP_FOUND TRUE) - message(STATUS "System Crypto++ found and version greater or equal to 5.6.2") + message(STATUS "Crypto++ found and version greater or equal to 5.6.2") endif() endif() endif() - if(NOT CRYPTOPP_FOUND) - set(CRYPTOPP_INCLUDE_DIR "../cryptopp562" CACHE FILEPATH "" FORCE) - find_library(LSLOC NAMES cryptoppeth cryptopp - PATHS ../cryptopp562 - NO_DEFAULT_PATH - ) - set(CRYPTOPP_LIBRARIES ${LSLOC} CACHE FILEPATH "" FORCE) - message(STATUS "System Crypto++ not found, broken or too old. We use ${LSLOC}") - endif() - # Not really worth caching. We want to reevaluate anyway. mark_as_advanced(CRYPTOPP_INCLUDE_DIR CRYPTOPP_LIBRARIES) diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index 129167e2e..000000000 --- a/MANIFEST.in +++ /dev/null @@ -1,28 +0,0 @@ -include CMakeLists.txt -include libevmface/*.cpp -include libevmface/*.h -include libevmface/CMakeLists.txt -include libethcore/*.cpp -include libethcore/*.h -include libethcore/CMakeLists.txt -include libethential/*.cpp -include libethential/*.h -include libethential/CMakeLists.txt -include liblll/*.cpp -include liblll/*.h -include liblll/CMakeLists.txt -include libserpent/*.cpp -include libserpent/*.h -include libserpent/CMakeLists.txt -include libpyserpent/*.cpp -include libpyserpent/*.h -include libpyserpent/CMakeLists.txt -include libpyserpent/*.cpp -include libpyserpent/CMakeLists.txt -include lllc/*.cpp -include lllc/CMakeLists.txt -include sc/*.cpp -include sc/CMakeLists.txt - -include README.md -include BuildInfo.sh diff --git a/libethereum/PeerServer.cpp b/libethereum/PeerServer.cpp index aecaf1482..b3e45b018 100644 --- a/libethereum/PeerServer.cpp +++ b/libethereum/PeerServer.cpp @@ -213,14 +213,21 @@ void PeerServer::populateAddresses() if (getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in), host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST)) continue; // TODO: Make exception safe when no internet. - auto it = r.resolve({host, "30303"}); - bi::tcp::endpoint ep = it->endpoint(); - bi::address ad = ep.address(); - m_addresses.push_back(ad.to_v4()); - bool isLocal = std::find(c_rejectAddresses.begin(), c_rejectAddresses.end(), ad) != c_rejectAddresses.end(); - if (!isLocal) - m_peerAddresses.push_back(ad.to_v4()); - clog(NetNote) << "Address: " << host << " = " << m_addresses.back() << (isLocal ? " [LOCAL]" : " [PEER]"); + try + { + auto it = r.resolve({host, "30303"}); + bi::tcp::endpoint ep = it->endpoint(); + bi::address ad = ep.address(); + m_addresses.push_back(ad.to_v4()); + bool isLocal = std::find(c_rejectAddresses.begin(), c_rejectAddresses.end(), ad) != c_rejectAddresses.end(); + if (!isLocal) + m_peerAddresses.push_back(ad.to_v4()); + clog(NetNote) << "Address: " << host << " = " << m_addresses.back() << (isLocal ? " [LOCAL]" : " [PEER]"); + } + catch (...) + { + clog(NetNote) << "Couldn't resolve: " << host; + } } } diff --git a/setup.py b/setup.py deleted file mode 100644 index 440712247..000000000 --- a/setup.py +++ /dev/null @@ -1,60 +0,0 @@ -#!/usr/bin/env python - -import os -import sys -from setuptools import setup -from setuptools.command.install import install -from distutils.command.build import build -from subprocess import call - -# Setup.py for languages only - - -class build_me(build): - def run(self): - build.run(self) - # if os.uname()[0] == 'Linux' and os.geteuid() == 0: - # call(['sudo', 'apt-get', 'install', 'build-essential']) - # call(['sudo', 'apt-get', 'install', 'g++-4.8']) - # call(['sudo', 'apt-get', 'install', 'cmake']) - # call(['sudo', 'apt-get', 'install', 'libboost-all-dev']) - call(['mkdir', 'build']) - os.chdir('build') - call(['cmake', '..', '-DLANGUAGES=1']) - call(['make']) - os.chdir('..') - - -class install_me(install): - def run(self): - install.run(self) - os.chdir('build') - call(['make', 'install']) - os.chdir('..') - - -class uninstall_me(): - def run(self): - sys.stderr.write("This is currently a dummy method. " - "Nothing has been uninstalled.") - - -def read(fname): - return open(os.path.join(os.path.dirname(__file__), fname)).read() - - -setup( - name='ethereum-serpent', - version='1.4.11', - description='Serpent compiler', - maintainer='Vitalik Buterin', - maintainer_email='v@buterin.com', - license='WTFPL', - url='http://www.ethereum.org/', - long_description=read('README.md'), - cmdclass={ - 'build': build_me, - 'install': install_me, - 'uninstall': uninstall_me, - } -)