cerc-io/solidity
16
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

Update boost to 1.70 for emscripten and cache a proper installation.

Browse Source
This commit is contained in:
Daniel Kirchner 2019-06-06 17:19:18 +02:00
parent 226f8bb64d
commit 2ec45797b2
4 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/config.yml
View File

@ -78,7 +78,7 @@ jobs:
name: Save Boost build name: Save Boost build
key: *boost-cache-key key: *boost-cache-key
paths: paths:
- boost_1_68_0 - boost_1_70_0_install
- store_artifacts: - store_artifacts:
path: emscripten_build/libsolc/soljson.js path: emscripten_build/libsolc/soljson.js
destination: soljson.js destination: soljson.js

2
.travis.yml
View File

@ -183,7 +183,7 @@ git:
cache: cache:
ccache: true ccache: true
directories: directories:
- boost_1_68_0 - boost_1_70_0_install
- $HOME/.local - $HOME/.local
install: install:

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

@ -64,15 +64,14 @@ fi
# Boost # Boost
echo -en 'travis_fold:start:compiling_boost\\r' echo -en 'travis_fold:start:compiling_boost\\r'
cd "$WORKSPACE"/boost_1_68_0 test -e "$WORKSPACE"/boost_1_70_0_install || (
# if b2 exists, it is a fresh checkout, otherwise it comes from the cache cd "$WORKSPACE"/boost_1_70_0
# and is already compiled
test -e b2 && (
./b2 toolset=emscripten link=static variant=release threading=single runtime-link=static \ ./b2 toolset=emscripten link=static variant=release threading=single runtime-link=static \
system regex filesystem unit_test_framework program_options cxxflags="-Wno-unused-local-typedef -Wno-variadic-macros -Wno-c99-extensions -Wno-all" --with-system --with-regex --with-filesystem --with-test --with-program_options cxxflags="-Wno-unused-local-typedef -Wno-variadic-macros -Wno-c99-extensions -Wno-all" \
find . -name 'libboost*.a' -exec cp {} . \; --prefix="$WORKSPACE"/boost_1_70_0_install install
rm -rf b2 libs doc tools more bin.v2 status
) )
ln -sf "$WORKSPACE"/boost_1_70_0_install/lib/* /emsdk_portable/sdk/system/lib
ln -sf "$WORKSPACE"/boost_1_70_0_install/include/* /emsdk_portable/sdk/system/include
echo -en 'travis_fold:end:compiling_boost\\r' echo -en 'travis_fold:end:compiling_boost\\r'
echo -en 'travis_fold:start:install_cmake.sh\\r' echo -en 'travis_fold:start:install_cmake.sh\\r'
@ -87,15 +86,8 @@ cd $BUILD_DIR
cmake \ cmake \
-DCMAKE_TOOLCHAIN_FILE=../cmake/toolchains/emscripten.cmake \ -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchains/emscripten.cmake \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DBoost_FOUND=1 \
-DBoost_USE_STATIC_LIBS=1 \ -DBoost_USE_STATIC_LIBS=1 \
-DBoost_USE_STATIC_RUNTIME=1 \ -DBoost_USE_STATIC_RUNTIME=1 \
-DBoost_INCLUDE_DIR="$WORKSPACE"/boost_1_68_0/ \
-DBoost_FILESYSTEM_LIBRARY_RELEASE="$WORKSPACE"/boost_1_68_0/libboost_filesystem.a \
-DBoost_PROGRAM_OPTIONS_LIBRARY_RELEASE="$WORKSPACE"/boost_1_68_0/libboost_program_options.a \
-DBoost_REGEX_LIBRARY_RELEASE="$WORKSPACE"/boost_1_68_0/libboost_regex.a \
-DBoost_SYSTEM_LIBRARY_RELEASE="$WORKSPACE"/boost_1_68_0/libboost_system.a \
-DBoost_UNIT_TEST_FRAMEWORK_LIBRARY_RELEASE="$WORKSPACE"/boost_1_68_0/libboost_unit_test_framework.a \
-DTESTS=0 \ -DTESTS=0 \
.. ..
make -j 4 make -j 4

18
scripts/travis-emscripten/install_deps.sh
View File

@ -30,15 +30,15 @@
set -ev set -ev
echo -en 'travis_fold:start:installing_dependencies\\r' echo -en 'travis_fold:start:installing_dependencies\\r'
test -e boost_1_68_0 -a -e boost_1_68_0/boost || ( test -e boost_1_70_0_install || (
rm -rf boost_1_68_0 rm -rf boost_1_70_0
rm -f boost.tar.xz rm -f boost.tar.gz
wget -q 'https://sourceforge.net/projects/boost/files/boost/1.68.0/boost_1_68_0.tar.gz/download'\ wget -q 'https://sourceforge.net/projects/boost/files/boost/1.70.0/boost_1_70_0.tar.gz/download'\
-O boost.tar.xz -O boost.tar.gz
test "$(shasum boost.tar.xz)" = "a78cf6ebb111a48385dd0c135e145a6819a8c856 boost.tar.xz" test "$(shasum boost.tar.gz)" = "7804c782deb00f36ac80b1000b71a3707eadb620 boost.tar.gz"
tar -xzf boost.tar.xz tar -xzf boost.tar.gz
rm boost.tar.xz rm boost.tar.gz
cd boost_1_68_0 cd boost_1_70_0
./bootstrap.sh ./bootstrap.sh
wget -q 'https://raw.githubusercontent.com/tee3/boost-build-emscripten/master/emscripten.jam' wget -q 'https://raw.githubusercontent.com/tee3/boost-build-emscripten/master/emscripten.jam'
test "$(shasum emscripten.jam)" = "a7e13fc2c1e53b0e079ef440622f879aa6da3049 emscripten.jam" test "$(shasum emscripten.jam)" = "a7e13fc2c1e53b0e079ef440622f879aa6da3049 emscripten.jam"