diff options
| author | chriseth <c@ethdev.com> | 2016-08-02 05:40:53 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-02 05:40:53 +0800 |
| commit | fb90e8876f6d1172405890bee694ccc6000b9387 (patch) | |
| tree | ffbe6caef83e4426971ff5733f6ea8657c2da546 | |
| parent | ec97d574b1000933ab7f869cf83217f8687eef25 (diff) | |
| parent | 1445284a785898f676ba1c9dddd199618297e6c3 (diff) | |
| download | dexon-solidity-fb90e8876f6d1172405890bee694ccc6000b9387.tar.gz dexon-solidity-fb90e8876f6d1172405890bee694ccc6000b9387.tar.zst dexon-solidity-fb90e8876f6d1172405890bee694ccc6000b9387.zip | |
Merge pull request #791 from chriseth/emscrip
Further tweaks to the build.
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rwxr-xr-x | scripts/travis-emscripten/build_emscripten.sh | 7 |
2 files changed, 5 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 18730138..2ec5bf46 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,12 +5,6 @@ # # http://solidity.readthedocs.org # -# TODO - Merge with .travis.yml file which currently lives in the root of -# webthree-umbrella, but actually contains the automation for the Solidity -# Emscripten build, which will also need consolidating into here somehow. -# -# See https://github.com/ethereum/webthree-umbrella/blob/develop/.travis.yml -# # ------------------------------------------------------------------------------ # This file is part of cpp-ethereum. # @@ -74,6 +68,8 @@ git: cache: ccache: true directories: + - build + - build-emscripten - boost_1_57_0 - jsoncpp - cryptopp diff --git a/scripts/travis-emscripten/build_emscripten.sh b/scripts/travis-emscripten/build_emscripten.sh index 5726b840..abdf401f 100755 --- a/scripts/travis-emscripten/build_emscripten.sh +++ b/scripts/travis-emscripten/build_emscripten.sh @@ -85,8 +85,8 @@ echo -en 'travis_fold:end:compiling_boost\\r' # Build dependent components and solidity itself echo -en 'travis_fold:start:compiling_solidity\\r' cd $WORKSPACE -mkdir -p build -cd build +mkdir -p build-emscripten +cd build-emscripten emcmake cmake \ -DCMAKE_BUILD_TYPE=Release \ -DEMSCRIPTEN=1 \ @@ -125,7 +125,6 @@ emcmake cmake \ emmake make -j 4 cd .. -cp build/solc/soljson.js ./ -rm -rf build +cp build-emscripten/solc/soljson.js ./ echo -en 'travis_fold:end:compiling_solidity\\r' |