diff options
author | Paweł Bylica <chfast@gmail.com> | 2016-10-20 17:58:25 +0800 |
---|---|---|
committer | Alex Beregszaszi <alex@rtfs.hu> | 2016-10-21 05:18:13 +0800 |
commit | 4bde0a2d36297c4b3fa17c7dac2bb1681e1e7f75 (patch) | |
tree | 2cd568e291ce79d337c15721dee47993c16179bf /scripts | |
parent | 5875890576eb95dd73bc04b5e864975cd7a55f43 (diff) | |
download | dexon-solidity-4bde0a2d36297c4b3fa17c7dac2bb1681e1e7f75.tar dexon-solidity-4bde0a2d36297c4b3fa17c7dac2bb1681e1e7f75.tar.gz dexon-solidity-4bde0a2d36297c4b3fa17c7dac2bb1681e1e7f75.tar.bz2 dexon-solidity-4bde0a2d36297c4b3fa17c7dac2bb1681e1e7f75.tar.lz dexon-solidity-4bde0a2d36297c4b3fa17c7dac2bb1681e1e7f75.tar.xz dexon-solidity-4bde0a2d36297c4b3fa17c7dac2bb1681e1e7f75.tar.zst dexon-solidity-4bde0a2d36297c4b3fa17c7dac2bb1681e1e7f75.zip |
Build jsoncpp from source using jsoncpp.cmake script
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/install_deps.sh | 10 | ||||
-rwxr-xr-x | scripts/release_ppa.sh | 20 | ||||
-rwxr-xr-x | scripts/travis-emscripten/build_emscripten.sh | 16 | ||||
-rwxr-xr-x | scripts/travis-emscripten/install_deps.sh | 1 |
4 files changed, 4 insertions, 43 deletions
diff --git a/scripts/install_deps.sh b/scripts/install_deps.sh index 334c62d4..c9f82769 100755 --- a/scripts/install_deps.sh +++ b/scripts/install_deps.sh @@ -105,7 +105,6 @@ case $(uname -s) in brew install boost brew install cmake - brew install jsoncpp # We should really 'brew install' our eth client here, but at the time of writing # the bottle is known broken, so we will just cheat and use a hardcoded ZIP for @@ -164,7 +163,7 @@ case $(uname -s) in # See https://pkgs.alpinelinux.org/ apk update - apk add boost-dev build-base cmake jsoncpp-dev + apk add boost-dev build-base cmake ;; @@ -219,7 +218,6 @@ case $(uname -s) in gcc \ git \ libboost-all-dev \ - libjsoncpp-dev \ unzip ;; @@ -321,8 +319,7 @@ case $(uname -s) in build-essential \ cmake \ git \ - libboost-all-dev \ - libjsoncpp-dev + libboost-all-dev # Install 'eth', for use in the Solidity Tests-over-IPC. sudo add-apt-repository -y ppa:ethereum/ethereum @@ -363,9 +360,6 @@ case $(uname -s) in sudo yum -y remove boost-devel sudo wget http://repo.enetres.net/enetres.repo -O /etc/yum.repos.d/enetres.repo sudo yum install boost-devel - - # And finally jsoncpp - sudo yum -y install jsoncpp-devel else echo "Aborted CentOS Solidity Dependency Installation"; exit 1 diff --git a/scripts/release_ppa.sh b/scripts/release_ppa.sh index 7231f582..1aaa2a42 100755 --- a/scripts/release_ppa.sh +++ b/scripts/release_ppa.sh @@ -76,21 +76,6 @@ cp /tmp/${packagename}_${debversion}.orig.tar.gz ../ # Create debian package information -case $distribution in - trusty) - jsoncpplib=libjsoncpp0 - ;; - vivid) - jsoncpplib=libjsoncpp0 - ;; - wily) - jsoncpplib=libjsoncpp0v5 - ;; - *) - jsoncpplib=libjsoncpp1 - ;; -esac - mkdir debian echo 9 > debian/compat cat <<EOF > debian/control @@ -107,8 +92,7 @@ Build-Depends: debhelper (>= 9.0.0), libboost-all-dev, automake, libtool, - scons, - libjsoncpp-dev + scons Standards-Version: 3.9.5 Homepage: https://ethereum.org Vcs-Git: git://github.com/ethereum/solidity.git @@ -117,7 +101,7 @@ Vcs-Browser: https://github.com/ethereum/solidity Package: solc Architecture: any-i386 any-amd64 Multi-Arch: same -Depends: \${shlibs:Depends}, \${misc:Depends}, $jsoncpplib +Depends: \${shlibs:Depends}, \${misc:Depends} Replaces: lllc (<< 1:0.3.6) Conflicts: libethereum (<= 1.2.9) Description: Solidity compiler. 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 \ diff --git a/scripts/travis-emscripten/install_deps.sh b/scripts/travis-emscripten/install_deps.sh index 2c0e9f26..d85337c0 100755 --- a/scripts/travis-emscripten/install_deps.sh +++ b/scripts/travis-emscripten/install_deps.sh @@ -31,7 +31,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 jsoncpp -a -e jsoncpp/include || git clone https://github.com/open-source-parsers/jsoncpp.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'\ |