aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/travis-emscripten
diff options
context:
space:
mode:
authorchriseth <c@ethdev.com>2016-08-01 22:49:05 +0800
committerchriseth <c@ethdev.com>2016-08-01 22:49:19 +0800
commit168261254bef13ed7fc06814bee933c43c3a82ee (patch)
tree2f527c0d12853226e83aa80d13175cc491690afd /scripts/travis-emscripten
parent82d113680c47b7916d2d8fb7c9b94d0370777c85 (diff)
downloaddexon-solidity-168261254bef13ed7fc06814bee933c43c3a82ee.tar
dexon-solidity-168261254bef13ed7fc06814bee933c43c3a82ee.tar.gz
dexon-solidity-168261254bef13ed7fc06814bee933c43c3a82ee.tar.bz2
dexon-solidity-168261254bef13ed7fc06814bee933c43c3a82ee.tar.lz
dexon-solidity-168261254bef13ed7fc06814bee933c43c3a82ee.tar.xz
dexon-solidity-168261254bef13ed7fc06814bee933c43c3a82ee.tar.zst
dexon-solidity-168261254bef13ed7fc06814bee933c43c3a82ee.zip
Fix emscripten build.
Diffstat (limited to 'scripts/travis-emscripten')
-rwxr-xr-xscripts/travis-emscripten/build_emscripten.sh5
-rwxr-xr-xscripts/travis-emscripten/publish_binary.sh7
2 files changed, 3 insertions, 9 deletions
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)