Merge pull request #793 from chriseth/parbuild

Parallel builds for emscripten and docs.

4 files changed, 31 insertions, 21 deletions

diff --git a/.travis.yml b/.travis.yml
index 1ee16333..ad1c3f77 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,13 +38,25 @@ matrix:
           dist: trusty
           sudo: required
           compiler: gcc
+          env:
+              - TRAVIS_BUILD_TYPE=RelWithDebInfo
+              - ZIP_SUFFIX=ubuntu-trusty
+        - os: linux
+          dist: trusty
+          sudo: required
+          compiler: gcc
+          env:
+              - JOB=docs
+        - os: linux
+          dist: trusty
+          sudo: required
+          compiler: gcc
           services:
               - docker
           before_install:
               - docker pull trzeci/emscripten:sdk-tag-1.35.4-64bit
           env:
-              - TRAVIS_BUILD_TYPE=RelWithDebInfo
-              - ZIP_SUFFIX=ubuntu-trusty
+              - JOB=emscripten
         - os: osx
           osx_image: beta-xcode6.2
           env:
@@ -71,19 +83,18 @@ cache:
         - cryptopp
         - boost_1_57_0
         - build
-        - build-emscripten
         - jsoncpp
 
 install:
-    - ./scripts/install_deps.sh
+    - test $JOB != default || ./scripts/install_deps.sh
 before_script:
-    - ./scripts/build_emscripten.sh
-    - mkdir -p build
+    - test $JOB != emscripten || ./scripts/build_emscripten.sh
+    - test $JOB != default || (mkdir -p build
       && cd build
       && cmake .. -DCMAKE_BUILD_TYPE=$TRAVIS_BUILD_TYPE
       && make -j2
       && cd ..
-      && ./scripts/release.sh $ZIP_SUFFIX
+      && ./scripts/release.sh $ZIP_SUFFIX )
 script:
     # There are a variety of reliability issues with the Solidity unit-tests at the time of
     # writing (especially on macOS), so within TravisCI we will try to run the unit-tests
@@ -95,10 +106,12 @@ script:
     # itself is broken from the failure messages which we are seeing.
     #
     # More details on known issues at https://github.com/ethereum/solidity/issues/769    
-    - cd $TRAVIS_BUILD_DIR && (./scripts/tests.sh || ./scripts/tests.sh || ./scripts/tests.sh)
+    - test $JOB != default || (cd $TRAVIS_BUILD_DIR && (./scripts/tests.sh || ./scripts/tests.sh || ./scripts/tests.sh) )
+    - test $JOB != docs || ./scripts/docs.sh
 env:
     global:
         - ENCRYPTION_LABEL="296c219a3f41"
+        - JOB=default
 
 # This is the deploy target for the Emscripten build.
 # It publishes the JS file which was compiled as part of the earlier 'build_emscripten.sh'
@@ -109,7 +122,7 @@ env:
 
 deploy:
     provider: script
-    script: scripts/release_emscripten.sh
+    script: test $JOB != emscripten || scripts/release_emscripten.sh
     skip_cleanup: true
     on:
         branch: develop
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'