cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix emscripten build.

Browse Source
This commit is contained in:
chriseth 2016-08-01 16:49:05 +02:00
parent 82d113680c
commit 168261254b
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/build_emscripten.sh
View File

@ -26,7 +26,9 @@
# (c) 2016 solidity contributors. # (c) 2016 solidity contributors.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
set -e
if [[ "$OSTYPE" != "darwin"* ]]; then if [[ "$OSTYPE" != "darwin"* ]]; then
./scripts/travis-emscripten/install_deps.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 docker run -v $(pwd):/src trzeci/emscripten:sdk-tag-1.35.4-64bit ./scripts/travis-emscripten/build_emscripten.sh
fi fi

5
scripts/travis-emscripten/build_emscripten.sh
View File

@ -124,11 +124,8 @@ emcmake cmake \
.. ..
emmake make -j 4 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 .. cd ..
cp build/solc/soljson.js ./
rm -rf build rm -rf build
echo -en 'travis_fold:end:compiling_solidity\\r' echo -en 'travis_fold:end:compiling_solidity\\r'

7
scripts/travis-emscripten/publish_binary.sh
View File

@ -30,15 +30,11 @@
set -e set -e
cd solidity
VER=$(cat CMakeLists.txt | grep 'set(PROJECT_VERSION' | sed -e 's/.*set(PROJECT_VERSION "\(.*\)".*/\1/') VER=$(cat CMakeLists.txt | grep 'set(PROJECT_VERSION' | sed -e 's/.*set(PROJECT_VERSION "\(.*\)".*/\1/')
test -n "$VER" test -n "$VER"
VER="v$VER" VER="v$VER"
COMMIT=$(git rev-parse --short HEAD) COMMIT=$(git rev-parse --short HEAD)
DATE=$(date --date="$(git log -1 --date=iso --format=%ad HEAD)" --utc +%F) 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_KEY_VAR="encrypted_${ENCRYPTION_LABEL}_key"
ENCRYPTED_IV_VAR="encrypted_${ENCRYPTION_LABEL}_iv" 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 then
true true
else 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 ./update-index.sh
cd bin cd bin
LATEST=$(ls -r soljson-v* | head -n 1) LATEST=$(ls -r soljson-v* | head -n 1)