diff options
| author | Gav Wood <g@ethdev.com> | 2015-04-19 21:49:22 +0800 |
|---|---|---|
| committer | Gav Wood <g@ethdev.com> | 2015-04-19 21:49:22 +0800 |
| commit | 2eb7c95d88a8c24b2d0db609544535e12b845fc6 (patch) | |
| tree | 1672730526e71599fc3cfc28894fbf1134990a33 | |
| parent | 8e04b27252abf101a2899b5729fe012c159dab80 (diff) | |
| parent | 41c2990ed7b93862219715b4c77317e1443bb5ce (diff) | |
| download | dexon-solidity-2eb7c95d88a8c24b2d0db609544535e12b845fc6.tar dexon-solidity-2eb7c95d88a8c24b2d0db609544535e12b845fc6.tar.gz dexon-solidity-2eb7c95d88a8c24b2d0db609544535e12b845fc6.tar.bz2 dexon-solidity-2eb7c95d88a8c24b2d0db609544535e12b845fc6.tar.lz dexon-solidity-2eb7c95d88a8c24b2d0db609544535e12b845fc6.tar.xz dexon-solidity-2eb7c95d88a8c24b2d0db609544535e12b845fc6.tar.zst dexon-solidity-2eb7c95d88a8c24b2d0db609544535e12b845fc6.zip | |
Merge pull request #1665 from chriseth/sol_jsoncppDocker
Add jsoncpp dependency for solidity-js.
| -rw-r--r-- | docker_emscripten/Dockerfile | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/docker_emscripten/Dockerfile b/docker_emscripten/Dockerfile index 06467a2c..1ad1875d 100644 --- a/docker_emscripten/Dockerfile +++ b/docker_emscripten/Dockerfile @@ -43,7 +43,14 @@ RUN sed -i 's/$(archiver\[1\])/\/home\/user\/emsdk_portable\/emscripten\/master\ RUN sed -i 's/$(ranlib\[1\])/\/home\/user\/emsdk_portable\/emscripten\/master\/emranlib/g' ./tools/build/src/tools/gcc.jam RUN ./b2 link=static variant=release threading=single runtime-link=static thread system regex -# Build soljs +# Json-CPP +WORKDIR /home/user +RUN git clone https://github.com/open-source-parsers/jsoncpp.git +WORKDIR /home/user/jsoncpp +RUN 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" . +RUN emmake make + +## Build soljs WORKDIR /home/user ADD https://api.github.com/repos/ethereum/cpp-ethereum/git/refs/heads/develop unused.txt RUN git clone --depth=1 https://github.com/ethereum/cpp-ethereum @@ -55,8 +62,10 @@ RUN git remote add -f solidityjs https://github.com/chriseth/cpp-ethereum # TODO this should be a proper merge but somehow causes problems # NOTE that we only get the latest commit of that branch RUN git cherry-pick solidityjs/solidity-js -RUN emcmake cmake -DETH_STATIC=1 -DONLY_SOLIDITY=1 -DHEADLESS=1 -DCMAKE_CXX_COMPILER=/home/user/emsdk_portable/emscripten/master/em++ -DCMAKE_C_COMPILER=/home/user/emsdk_portable/emscripten/master/emcc +RUN emcmake cmake -DETH_STATIC=1 -DSOLIDITY=ON -DGUI=0 -DCMAKE_CXX_COMPILER=/home/user/emsdk_portable/emscripten/master/em++ -DCMAKE_C_COMPILER=/home/user/emsdk_portable/emscripten/master/emcc RUN emmake make -j 6 soljs -ENTRYPOINT cat soljs/soljs.js +WORKDIR /home/user/cpp-ethereum/soljs +# somehow it does not work to pipe out both files +#ENTRYPOINT tar -c soljs.js soljs.js.mem | base64 |