aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/travis-emscripten/build_emscripten.sh
diff options
context:
space:
mode:
authorPaweł Bylica <chfast@gmail.com>2016-10-20 17:58:25 +0800
committerAlex Beregszaszi <alex@rtfs.hu>2016-10-21 05:18:13 +0800
commit4bde0a2d36297c4b3fa17c7dac2bb1681e1e7f75 (patch)
tree2cd568e291ce79d337c15721dee47993c16179bf /scripts/travis-emscripten/build_emscripten.sh
parent5875890576eb95dd73bc04b5e864975cd7a55f43 (diff)
downloaddexon-solidity-4bde0a2d36297c4b3fa17c7dac2bb1681e1e7f75.tar.gz
dexon-solidity-4bde0a2d36297c4b3fa17c7dac2bb1681e1e7f75.tar.zst
dexon-solidity-4bde0a2d36297c4b3fa17c7dac2bb1681e1e7f75.zip
Build jsoncpp from source using jsoncpp.cmake script
Diffstat (limited to 'scripts/travis-emscripten/build_emscripten.sh')
-rwxr-xr-xscripts/travis-emscripten/build_emscripten.sh16
1 files changed, 0 insertions, 16 deletions
diff --git a/scripts/travis-emscripten/build_emscripten.sh b/scripts/travis-emscripten/build_emscripten.sh
index 285c6338..17a40e1c 100755
--- a/scripts/travis-emscripten/build_emscripten.sh
+++ b/scripts/travis-emscripten/build_emscripten.sh
@@ -52,20 +52,6 @@ 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,8 +98,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 \