diff options
| author | chriseth <c@ethdev.com> | 2016-08-02 18:55:28 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-02 18:55:28 +0800 |
| commit | 2e174e1d19c5aeb7e58b06f81e193700d88c3ae7 (patch) | |
| tree | 95262e221f1197b871c8b4c0e99ae6c93ccd369d /scripts | |
| parent | adbb6f78d00c0d3d52f6bd042d6b41ab36eafbf6 (diff) | |
| parent | 7120c6ba602f34400bfd3a67153b6d927ac7af9b (diff) | |
| download | dexon-solidity-2e174e1d19c5aeb7e58b06f81e193700d88c3ae7.tar dexon-solidity-2e174e1d19c5aeb7e58b06f81e193700d88c3ae7.tar.gz dexon-solidity-2e174e1d19c5aeb7e58b06f81e193700d88c3ae7.tar.bz2 dexon-solidity-2e174e1d19c5aeb7e58b06f81e193700d88c3ae7.tar.lz dexon-solidity-2e174e1d19c5aeb7e58b06f81e193700d88c3ae7.tar.xz dexon-solidity-2e174e1d19c5aeb7e58b06f81e193700d88c3ae7.tar.zst dexon-solidity-2e174e1d19c5aeb7e58b06f81e193700d88c3ae7.zip | |
Merge pull request #793 from chriseth/parbuild
Parallel builds for emscripten and docs.
Diffstat (limited to 'scripts')
| -rwxr-xr-x[-rw-r--r--] | scripts/docs.sh | 9 | ||||
| -rwxr-xr-x | scripts/install_deps.sh | 2 | ||||
| -rwxr-xr-x | scripts/travis-emscripten/build_emscripten.sh | 10 |
3 files changed, 9 insertions, 12 deletions
diff --git a/scripts/docs.sh b/scripts/docs.sh index a674373a..42400bc7 100644..100755 --- a/scripts/docs.sh +++ b/scripts/docs.sh @@ -26,8 +26,7 @@ # (c) 2016 solidity contributors. #------------------------------------------------------------------------------ -if [[ "$OSTYPE" == "darwin"* ]]; then - # We aren't building docs locally for macOS at the moment -else - cd docs && sphinx-build -nW -b html -d _build/doctrees . _build/html && cd .. -fi +set -e +cd docs +sphinx-build -nW -b html -d _build/doctrees . _build/html +cd .. diff --git a/scripts/install_deps.sh b/scripts/install_deps.sh index f1585178..865242c6 100755 --- a/scripts/install_deps.sh +++ b/scripts/install_deps.sh @@ -298,7 +298,7 @@ case $(uname -s) in ;; *) #other Ubuntu - echo "ERROR - Unknown or unsupported Ubuntu version." + echo "ERROR - Unknown or unsupported Ubuntu version (" $(lsb_release -cs) ")" echo "We only support Trusty, Utopic, Vivid, Wily and Xenial, with work-in-progress on Yakkety." exit 1 ;; diff --git a/scripts/travis-emscripten/build_emscripten.sh b/scripts/travis-emscripten/build_emscripten.sh index abdf401f..2b5e409f 100755 --- a/scripts/travis-emscripten/build_emscripten.sh +++ b/scripts/travis-emscripten/build_emscripten.sh @@ -85,13 +85,11 @@ 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-emscripten -cd build-emscripten +mkdir -p build +cd build emcmake cmake \ -DCMAKE_BUILD_TYPE=Release \ -DEMSCRIPTEN=1 \ - -DCMAKE_CXX_COMPILER=em++ \ - -DCMAKE_C_COMPILER=emcc \ -DBoost_FOUND=1 \ -DBoost_USE_STATIC_LIBS=1 \ -DBoost_USE_STATIC_RUNTIME=1 \ @@ -120,11 +118,11 @@ emcmake cmake \ -DCRYPTOPP_INCLUDE_DIR="$WORKSPACE"/cryptopp/src/ \ -DDev_DEVCORE_LIBRARY="$WORKSPACE"/solidity/build/libdevcore/libdevcore.a \ -DEth_EVMASM_LIBRARY="$WORKSPACE"/solidity/build/libevmasm/libevmasm.a \ - -DETHASHCL=0 -DEVMJIT=0 -DETH_STATIC=1 -DSOLIDITY=1 -DFATDB=0 -DTESTS=0 -DTOOLS=0 \ + -DETH_STATIC=1 -DTESTS=0 \ .. emmake make -j 4 cd .. -cp build-emscripten/solc/soljson.js ./ +cp build/solc/soljson.js ./ echo -en 'travis_fold:end:compiling_solidity\\r' |