From 168261254bef13ed7fc06814bee933c43c3a82ee Mon Sep 17 00:00:00 2001
From: chriseth <c@ethdev.com>
Date: Mon, 1 Aug 2016 16:49:05 +0200
Subject: Fix emscripten build.

---
 scripts/build_emscripten.sh                   | 6 ++++--
 scripts/travis-emscripten/build_emscripten.sh | 5 +----
 scripts/travis-emscripten/publish_binary.sh   | 7 ++-----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/scripts/build_emscripten.sh b/scripts/build_emscripten.sh
index 53171599..6046978e 100755
--- a/scripts/build_emscripten.sh
+++ b/scripts/build_emscripten.sh
@@ -26,7 +26,9 @@
 # (c) 2016 solidity contributors.
 #------------------------------------------------------------------------------
 
+set -e
+
 if [[ "$OSTYPE" != "darwin"* ]]; then
-    ./scripts/travis-emscripten/install_deps.sh \
-        && docker run -v $(pwd):/src trzeci/emscripten:sdk-tag-1.35.4-64bit ./scripts/travis-emscripten/build_emscripten.sh
+    ./scripts/travis-emscripten/install_deps.sh
+    docker run -v $(pwd):/src trzeci/emscripten:sdk-tag-1.35.4-64bit ./scripts/travis-emscripten/build_emscripten.sh
 fi
diff --git a/scripts/travis-emscripten/build_emscripten.sh b/scripts/travis-emscripten/build_emscripten.sh
index db409455..5726b840 100755
--- a/scripts/travis-emscripten/build_emscripten.sh
+++ b/scripts/travis-emscripten/build_emscripten.sh
@@ -124,11 +124,8 @@ emcmake cmake \
   ..
 emmake make -j 4
 
-# TODO - This is a temporary solution to the permissions issue which we are seeing in TravisCI,
-# where this Emscripten build generates files which the main build then cannot delete.
-# Presumably different accounts being used?   This needs wrapping in some conditional, so we
-# can choose to build, or build-and-clean.
 cd ..
+cp build/solc/soljson.js ./
 rm -rf build
 
 echo -en 'travis_fold:end:compiling_solidity\\r'
diff --git a/scripts/travis-emscripten/publish_binary.sh b/scripts/travis-emscripten/publish_binary.sh
index f4139539..a62d4b47 100755
--- a/scripts/travis-emscripten/publish_binary.sh
+++ b/scripts/travis-emscripten/publish_binary.sh
@@ -30,15 +30,11 @@
 
 set -e
 
-cd solidity
 VER=$(cat CMakeLists.txt | grep 'set(PROJECT_VERSION' | sed -e 's/.*set(PROJECT_VERSION "\(.*\)".*/\1/')
 test -n "$VER"
 VER="v$VER"
 COMMIT=$(git rev-parse --short HEAD)
 DATE=$(date --date="$(git log -1 --date=iso --format=%ad HEAD)" --utc +%F)
-cp build/solc/soljson.js "../soljson-$VER-$DATE-$COMMIT.js"
-cd ..
-
 
 ENCRYPTED_KEY_VAR="encrypted_${ENCRYPTION_LABEL}_key"
 ENCRYPTED_IV_VAR="encrypted_${ENCRYPTION_LABEL}_iv"
@@ -60,7 +56,8 @@ if ls ./bin/soljson-"$VER-$DATE"-*.js ./bin/soljson-*-"$COMMIT.js" > /dev/null
 then
   true
 else
-  cp ../soljson-*.js ./bin/
+  # This file is assumed to be the product of the build_emscripten.sh script.
+  cp ../soljson.js ./bin/"soljson-$VER-$DATE-$COMMIT.js"
   ./update-index.sh
   cd bin
   LATEST=$(ls -r soljson-v* | head -n 1)
-- 
cgit v1.2.3