diff options
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rwxr-xr-x | scripts/travis-emscripten/build_emscripten.sh | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 1c65de56..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. # @@ -75,6 +69,7 @@ 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' |