diff options
| author | chriseth <chris@ethereum.org> | 2016-11-08 20:47:52 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-08 20:47:52 +0800 |
| commit | 7a30e8cf6edd3749e908913794aa6b195ba7520b (patch) | |
| tree | 4ed6b70b663c2b344f81d019f8764584b02b69c3 /scripts/travis-emscripten/build_emscripten.sh | |
| parent | dd0879fe438af22d6db49826e800ccd14c3780e7 (diff) | |
| parent | 598154ed17f4155406ec1c047f3294c316ebd658 (diff) | |
| download | dexon-solidity-7a30e8cf6edd3749e908913794aa6b195ba7520b.tar dexon-solidity-7a30e8cf6edd3749e908913794aa6b195ba7520b.tar.gz dexon-solidity-7a30e8cf6edd3749e908913794aa6b195ba7520b.tar.bz2 dexon-solidity-7a30e8cf6edd3749e908913794aa6b195ba7520b.tar.lz dexon-solidity-7a30e8cf6edd3749e908913794aa6b195ba7520b.tar.xz dexon-solidity-7a30e8cf6edd3749e908913794aa6b195ba7520b.tar.zst dexon-solidity-7a30e8cf6edd3749e908913794aa6b195ba7520b.zip | |
Merge pull request #1252 from ethereum/jsoncpp-from-source
Build jsoncpp from source using jsoncpp.cmake script
Diffstat (limited to 'scripts/travis-emscripten/build_emscripten.sh')
| -rwxr-xr-x | scripts/travis-emscripten/build_emscripten.sh | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/scripts/travis-emscripten/build_emscripten.sh b/scripts/travis-emscripten/build_emscripten.sh index 285c6338..f5374a33 100755 --- a/scripts/travis-emscripten/build_emscripten.sh +++ b/scripts/travis-emscripten/build_emscripten.sh @@ -40,32 +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' - -# Json-CPP -echo -en 'travis_fold:start:compiling_jsoncpp\\r' -cd "$WORKSPACE/jsoncpp" -# if .git exists, it is a fresh checkout, otherwise it comes from the cache -# and is already compiled -test -e .git && ( -emcmake cmake -DJSONCPP_LIB_BUILD_STATIC=ON -DJSONCPP_LIB_BUILD_SHARED=OFF \ - -DJSONCPP_WITH_TESTS=OFF -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF \ - -G "Unix Makefiles" . -emmake make -j 4 -rm -rf .git -) -echo -en 'travis_fold:end:compiling_jsoncpp\\r' - # Boost echo -en 'travis_fold:start:compiling_boost\\r' cd "$WORKSPACE"/boost_1_57_0 @@ -112,10 +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 \ - -DJSONCPP_LIBRARY="$WORKSPACE"/jsoncpp/src/lib_json/libjsoncpp.a \ - -DJSONCPP_INCLUDE_DIR="$WORKSPACE"/jsoncpp/include/ \ - -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 \ |