Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop

.travis.yml

@@ -2,16 +2,16 @@ language: go
 go:
   - tip
 before_install:
-  - sudo add-apt-repository ppa:ubuntu-sdk-team/ppa -y
+  - sudo add-apt-repository ppa:beineri/opt-qt54 -y
   - sudo apt-get update -qq
-  - sudo apt-get install -yqq libgmp3-dev qtbase5-private-dev qtdeclarative5-private-dev libqt5opengl5-dev libreadline6-dev
+  - sudo apt-get install -yqq libgmp3-dev libreadline6-dev qt54quickcontrols qt54webengine
 install:
   - go get code.google.com/p/go.tools/cmd/goimports
   - go get github.com/golang/lint/golint
   # - go get golang.org/x/tools/cmd/vet 
   - if ! go get code.google.com/p/go.tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; fi
   - go get github.com/mattn/goveralls
-  - go get gopkg.in/qml.v1
+  - go get -d github.com/obscuren/qml && cd $HOME/gopath/src/github.com/obscuren/qml && git checkout v1 && cd $TRAVIS_BUILD_DIR
   - ETH_DEPS=$(go list -f '{{.Imports}} {{.TestImports}} {{.XTestImports}}' github.com/ethereum/go-ethereum/... | sed -e 's/\[//g' | sed -e 's/\]//g' | sed -e 's/C //g'); if [ "$ETH_DEPS" ]; then go get $ETH_DEPS; fi
 before_script:
   - gofmt -l -w .
@@ -22,5 +22,8 @@ before_script:
 script:
   - ./gocoverage.sh
 env:
+  global:
+    - PKG_CONFIG_PATH=/opt/qt54/lib/pkgconfig
+    - LD_LIBRARY_PATH=/opt/qt54/lib
     - secure: "U2U1AmkU4NJBgKR/uUAebQY87cNL0+1JHjnLOmmXwxYYyj5ralWb1aSuSH3qSXiT93qLBmtaUkuv9fberHVqrbAeVlztVdUsKAq7JMQH+M99iFkC9UiRMqHmtjWJ0ok4COD1sRYixxi21wb/JrMe3M1iL4QJVS61iltjHhVdM64="
 

Dockerfile

@@ -3,39 +3,38 @@ FROM ubuntu:14.04
 ## Environment setup
 ENV HOME /root
 ENV GOPATH /root/go
-ENV PATH /go/bin:/root/go/bin:/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games
+ENV PATH /golang/bin:/root/go/bin:/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games
+ENV PKG_CONFIG_PATH /opt/qt54/lib/pkgconfig
 
 RUN mkdir -p /root/go
 ENV DEBIAN_FRONTEND noninteractive
 
 ## Install base dependencies
 RUN apt-get update && apt-get upgrade -y
-RUN apt-get install -y git mercurial build-essential software-properties-common pkg-config libgmp3-dev libreadline6-dev libpcre3-dev libpcre++-dev
+RUN apt-get install -y git mercurial build-essential software-properties-common pkg-config libgmp3-dev libreadline6-dev libpcre3-dev libpcre++-dev mesa-common-dev libglu1-mesa-dev
 
-## Build and install Go
+## Install Qt5.4 dependencies from PPA
+RUN add-apt-repository ppa:beineri/opt-qt54-trusty -y
+RUN apt-get update -y
+RUN apt-get install -y qt54quickcontrols qt54webengine 
+
+## Build and install latest Go
 RUN git clone https://go.googlesource.com/go golang
 RUN cd golang && git checkout go1.4.1
 RUN cd golang/src && ./all.bash && go version
 
-## Install GUI dependencies
-RUN add-apt-repository ppa:ubuntu-sdk-team/ppa -y
-RUN apt-get update -y
-RUN apt-get install -y qtbase5-private-dev qtdeclarative5-private-dev libqt5opengl5-dev
-
-## Fetch and install serpent-go
-RUN go get -v -d github.com/ethereum/serpent-go
-WORKDIR $GOPATH/src/github.com/ethereum/serpent-go
-# RUN git checkout master
-RUN git submodule update --init
+## Fetch and install QML
+RUN go get -u -v -d github.com/obscuren/qml
+WORKDIR $GOPATH/src/github.com/obscuren/qml
+RUN git checkout v1
 RUN go install -v
 
-# Fetch and install go-ethereum
-RUN go get -v -d github.com/ethereum/go-ethereum/...
+## Fetch and install go-ethereum
+RUN go get -u -v -d github.com/ethereum/go-ethereum/...
 WORKDIR $GOPATH/src/github.com/ethereum/go-ethereum
-# RUN git checkout develop
 RUN ETH_DEPS=$(go list -f '{{.Imports}} {{.TestImports}} {{.XTestImports}}' github.com/ethereum/go-ethereum/... | sed -e 's/\[//g' | sed -e 's/\]//g' | sed -e 's/C //g'); if [ "$ETH_DEPS" ]; then go get $ETH_DEPS; fi
 RUN go install -v ./cmd/ethereum
 
-# Run JSON RPC
+## Run & expose JSON RPC
 ENTRYPOINT ["ethereum", "-rpc=true", "-rpcport=8080"]
 EXPOSE 8080

README.md

@@ -10,7 +10,7 @@ Ethereum PoC-8
 * [![Build Status](http://build.ethdev.com/buildstatusimage?builder=Linux%20Go%20master%20branch)](http://build.ethdev.com:8010/builders/Linux%20Go%20master%20branch/builds/-1) master
 * [![Build Status](http://build.ethdev.com/buildstatusimage?builder=Linux%20Go%20develop%20branch)](http://build.ethdev.com:8010/builders/Linux%20Go%20develop%20branch/builds/-1) develop
 * [![Travis-ci](https://api.travis-ci.org/ethereum/go-ethereum.svg)](https://travis-ci.org/ethereum/go-ethereum) travis-ci
-* [![Coverage Status](https://coveralls.io/repos/ethereum/go-ethereum/badge.png?branch=tests)](https://coveralls.io/r/ethereum/go-ethereum?branch=tests)
+* [![Coverage Status](https://coveralls.io/repos/ethereum/go-ethereum/badge.png?branch=develop)](https://coveralls.io/r/ethereum/go-ethereum?branch=develop)
 
 Ethereum Go Client © 2014 Jeffrey Wilcke.