reorganize deps installation

Signed-off-by: RJ Catalano <rj@monax.io>
This commit is contained in:
RJ Catalano 2017-02-02 18:52:59 -06:00
parent 503cf4eaeb
commit 00feec567a
No known key found for this signature in database
GPG Key ID: D4AB109D9B5D6386

View File

@ -57,7 +57,7 @@ detect_linux_distro() {
# extract 'foo' from NAME=foo, only on the line with NAME=foo # extract 'foo' from NAME=foo, only on the line with NAME=foo
DISTRO=$(sed -n -e 's/^NAME="\(.*\)\"/\1/p' /etc/os-release) DISTRO=$(sed -n -e 's/^NAME="\(.*\)\"/\1/p' /etc/os-release)
elif [ -f /etc/centos-release ]; then elif [ -f /etc/centos-release ]; then
DISTRO=CentOS DISTRO=CentOS
else else
DISTRO='' DISTRO=''
fi fi
@ -93,19 +93,17 @@ case $(uname -s) in
# Check for Homebrew install and abort if it is not installed. # Check for Homebrew install and abort if it is not installed.
brew -v > /dev/null 2>&1 || { echo >&2 "ERROR - solidity requires a Homebrew install. See http://brew.sh."; exit 1; } brew -v > /dev/null 2>&1 || { echo >&2 "ERROR - solidity requires a Homebrew install. See http://brew.sh."; exit 1; }
brew update brew update
brew upgrade
brew install boost brew install boost
brew install cmake brew install cmake
if ["$CI" = true]; then
# We should really 'brew install' our eth client here, but at the time of writing brew upgrade cmake
# the bottle is known broken, so we will just cheat and use a hardcoded ZIP for brew tap ethereum/ethereum
# the time being, which is good enough. The cause of the breaks will go away brew install cpp-ethereum
# when we commit the repository reorg changes anyway. brew linkapps cpp-ethereum
curl -L -O https://github.com/bobsummerwill/cpp-ethereum/releases/download/v1.3.0/cpp-ethereum-osx-mavericks-v1.3.0.zip else
unzip cpp-ethereum-osx-mavericks-v1.3.0.zip brew upgrade
fi
;; ;;
@ -207,7 +205,6 @@ case $(uname -s) in
# Install "normal packages" # Install "normal packages"
sudo apt-get -y update sudo apt-get -y update
sudo apt-get -y install \ sudo apt-get -y install \
python-sphinx \
build-essential \ build-essential \
cmake \ cmake \
g++ \ g++ \
@ -311,17 +308,17 @@ case $(uname -s) in
sudo apt-get -y update sudo apt-get -y update
sudo apt-get -y install \ sudo apt-get -y install \
python-sphinx \
build-essential \ build-essential \
cmake \ cmake \
git \ git \
libboost-all-dev libboost-all-dev
if [ "$CI" = true ]; then
# Install 'eth', for use in the Solidity Tests-over-IPC. # Install 'eth', for use in the Solidity Tests-over-IPC.
sudo add-apt-repository -y ppa:ethereum/ethereum sudo add-apt-repository -y ppa:ethereum/ethereum
sudo add-apt-repository -y ppa:ethereum/ethereum-dev sudo add-apt-repository -y ppa:ethereum/ethereum-dev
sudo apt-get -y update sudo apt-get -y update
sudo apt-get -y install eth sudo apt-get -y install eth
fi
;; ;;