diff options
| author | Paweł Bylica <chfast@gmail.com> | 2016-11-08 08:16:21 +0800 |
|---|---|---|
| committer | Paweł Bylica <chfast@gmail.com> | 2016-11-08 08:16:31 +0800 |
| commit | 598154ed17f4155406ec1c047f3294c316ebd658 (patch) | |
| tree | 739ed636a30bcfda6d6716de3d4ffae83b60a479 | |
| parent | 10019d4a5e9ae063f7f4fe3b70a096e554e89805 (diff) | |
| download | dexon-solidity-598154ed17f4155406ec1c047f3294c316ebd658.tar dexon-solidity-598154ed17f4155406ec1c047f3294c316ebd658.tar.gz dexon-solidity-598154ed17f4155406ec1c047f3294c316ebd658.tar.bz2 dexon-solidity-598154ed17f4155406ec1c047f3294c316ebd658.tar.lz dexon-solidity-598154ed17f4155406ec1c047f3294c316ebd658.tar.xz dexon-solidity-598154ed17f4155406ec1c047f3294c316ebd658.tar.zst dexon-solidity-598154ed17f4155406ec1c047f3294c316ebd658.zip | |
Drop CryptoPP leftovers
Especially, do not compile CryptoPP for Emscripten.
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | libdevcore/Common.h | 1 | ||||
| -rwxr-xr-x | scripts/release_ppa.sh | 1 | ||||
| -rwxr-xr-x | scripts/travis-emscripten/build_emscripten.sh | 14 | ||||
| -rwxr-xr-x | scripts/travis-emscripten/install_deps.sh | 1 |
5 files changed, 0 insertions, 18 deletions
diff --git a/.travis.yml b/.travis.yml index 14325567..2748c460 100644 --- a/.travis.yml +++ b/.travis.yml @@ -135,7 +135,6 @@ git: cache: ccache: true directories: - - cryptopp - boost_1_57_0 - build diff --git a/libdevcore/Common.h b/libdevcore/Common.h index 43ae7162..d65cfeac 100644 --- a/libdevcore/Common.h +++ b/libdevcore/Common.h @@ -70,7 +70,6 @@ #include "vector_ref.h" -// CryptoPP defines byte in the global namespace, so must we. using byte = uint8_t; // Quote a given token stream to turn it into a string. diff --git a/scripts/release_ppa.sh b/scripts/release_ppa.sh index 1aaa2a42..39003795 100755 --- a/scripts/release_ppa.sh +++ b/scripts/release_ppa.sh @@ -84,7 +84,6 @@ Section: science Priority: extra Maintainer: Christian (Buildserver key) <builds@ethereum.org> Build-Depends: debhelper (>= 9.0.0), - libcryptopp-dev, cmake, g++-4.8, git, diff --git a/scripts/travis-emscripten/build_emscripten.sh b/scripts/travis-emscripten/build_emscripten.sh index 17a40e1c..f5374a33 100755 --- a/scripts/travis-emscripten/build_emscripten.sh +++ b/scripts/travis-emscripten/build_emscripten.sh @@ -40,18 +40,6 @@ apt-get -y install git-core export WORKSPACE=/src -# CryptoPP -echo -en 'travis_fold:start:compiling_cryptopp\\r' -cd "$WORKSPACE/cryptopp" -# if .git exists, it is a fresh checkout, otherwise it comes from the cache -# and is already compiled -test -e .git && ( -emcmake cmake -DCRYPTOPP_LIBRARY_TYPE=STATIC -DCRYPTOPP_RUNTIME_TYPE=STATIC && emmake make -j 4 -ln -s . src/cryptopp || true -rm -rf .git -) -echo -en 'travis_fold:end:compiling_cryptopp\\r' - # Boost echo -en 'travis_fold:start:compiling_boost\\r' cd "$WORKSPACE"/boost_1_57_0 @@ -98,8 +86,6 @@ emcmake cmake \ -DBoost_THREAD_LIBRARIES="$WORKSPACE"/boost_1_57_0/libboost_thread.a \ -DBoost_UNIT_TEST_FRAMEWORK_LIBRARY="$WORKSPACE"/boost_1_57_0/libboost_unit_test_framework.a \ -DBoost_UNIT_TEST_FRAMEWORK_LIBRARIES="$WORKSPACE"/boost_1_57_0/libboost_unit_test_framework.a \ - -DCRYPTOPP_LIBRARY="$WORKSPACE"/cryptopp/src/libcryptlib.a \ - -DCRYPTOPP_INCLUDE_DIR="$WORKSPACE"/cryptopp/src/ \ -DDev_DEVCORE_LIBRARY="$WORKSPACE"/solidity/build/libdevcore/libsoldevcore.a \ -DEth_EVMASM_LIBRARY="$WORKSPACE"/solidity/build/libevmasm/libsolevmasm.a \ -DETH_STATIC=1 -DTESTS=0 \ diff --git a/scripts/travis-emscripten/install_deps.sh b/scripts/travis-emscripten/install_deps.sh index d85337c0..252c74b0 100755 --- a/scripts/travis-emscripten/install_deps.sh +++ b/scripts/travis-emscripten/install_deps.sh @@ -30,7 +30,6 @@ set -ev echo -en 'travis_fold:start:installing_dependencies\\r' -test -e cryptopp -a -e cryptopp/src || git clone https://github.com/mmoss/cryptopp.git test -e boost_1_57_0 -a -e boost_1_57_0/boost || ( wget 'http://downloads.sourceforge.net/project/boost/boost/'\ '1.57.0/boost_1_57_0.tar.bz2?r=http%3A%2F%2Fsourceforge.net%2F'\ |