From e46e7e7a9cd42016c24d15b2a0b7f01cdb059740 Mon Sep 17 00:00:00 2001 From: obscuren Date: Thu, 26 Jun 2014 23:04:46 +0200 Subject: [PATCH 1/4] Added install script --- install.sh | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 install.sh diff --git a/install.sh b/install.sh new file mode 100644 index 0000000000..d9151f27b3 --- /dev/null +++ b/install.sh @@ -0,0 +1,49 @@ +#!/bin/sh + +if [ "$1" == "" ]; then + echo "Usage $0 executable branch ethereum develop" + echo "executable ethereum or ethereal" + echo "branch develop or master" + exit +fi + +exe=$1 +branch=$2 + +# Test if go is installed +command -v go >/dev/null 2>&1 || { echo >&2 "Unable to find 'go'. This script requires go."; exit 1; } + +# Test if $GOPATH is set +if [ "$GOPATH" == "" ]; then + echo "\$GOPATH not set" + exit +fi + +echo "go get -u -d github.com/ethereum/go-ethereum/$exe" +go get -v -u -d github.com/ethereum/go-ethereum/$exe +if [ $? != 0 ]; then + echo "go get failed" + exit +fi + +cd $GOPATH/src/github.com/obscuren/mutan +git submodule init +git submodule update + +echo "git checkout $branch" +cd $GOPATH/src/github.com/ethereum/eth-go +git checkout $branch + +cd $GOPATH/src/github.com/ethereum/go-ethereum/$exe +git checkout $branch + +if [ "$exe" == "ethereal" ]; then + echo "Building ethereal GUI. Assuming Qt is installed. If this step" + echo "fails; please refer to: https://github.com/ethereum/go-ethereum/wiki/Building-Ethereum(Go)" +else + echo "Building ethereum CLI." +fi + +go install + +echo "done..." From cad98dc4d54c37dc2098b781d8f21b1ba5da23bd Mon Sep 17 00:00:00 2001 From: obscuren Date: Thu, 26 Jun 2014 23:06:04 +0200 Subject: [PATCH 2/4] update --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index d9151f27b3..d8d0f55207 100644 --- a/install.sh +++ b/install.sh @@ -46,4 +46,4 @@ fi go install -echo "done..." +echo "done. Please run $exe :-)" From 214721ca0155d872a355991506149fdf7e018ad5 Mon Sep 17 00:00:00 2001 From: obscuren Date: Thu, 26 Jun 2014 23:07:20 +0200 Subject: [PATCH 3/4] update --- install.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/install.sh b/install.sh index d8d0f55207..fe80a69565 100644 --- a/install.sh +++ b/install.sh @@ -26,14 +26,18 @@ if [ $? != 0 ]; then exit fi +echo "serpent-go" cd $GOPATH/src/github.com/obscuren/mutan + +echo "init submodule" git submodule init git submodule update -echo "git checkout $branch" +echo "eth-go" cd $GOPATH/src/github.com/ethereum/eth-go git checkout $branch +echo "go-ethereum" cd $GOPATH/src/github.com/ethereum/go-ethereum/$exe git checkout $branch From 52ddf044ae28cf84e61ced2d9193e7d5e806e1ef Mon Sep 17 00:00:00 2001 From: obscuren Date: Thu, 26 Jun 2014 23:14:17 +0200 Subject: [PATCH 4/4] Initialization of Qt should happen before anything else --- ethereal/main.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ethereal/main.go b/ethereal/main.go index 799b50e4b5..1674b59d9d 100644 --- a/ethereal/main.go +++ b/ethereal/main.go @@ -10,10 +10,11 @@ import ( ) func main() { - runtime.GOMAXPROCS(runtime.NumCPU()) - + // Leave QT on top at ALL times. qml.Init(nil) + runtime.GOMAXPROCS(runtime.NumCPU()) + var interrupted = false utils.RegisterInterrupt(func(os.Signal) { interrupted = true