tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source 
Conflicts:
	install.sh
This commit is contained in:
obscuren 2014-06-26 23:14:50 +02:00
commit 2d274003b8
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ethereal/main.go
View File

@ -10,10 +10,11 @@ import (
) )
func main() { func main() {
runtime.GOMAXPROCS(runtime.NumCPU()) // Leave QT on top at ALL times.
qml.Init(nil) qml.Init(nil)
runtime.GOMAXPROCS(runtime.NumCPU())
var interrupted = false var interrupted = false
utils.RegisterInterrupt(func(os.Signal) { utils.RegisterInterrupt(func(os.Signal) {
interrupted = true interrupted = true

13
install.sh
View File

@ -26,13 +26,18 @@ if [ $? != 0 ]; then
exit exit
fi fi
echo "serpent-go"
cd $GOPATH/src/github.com/obscuren/mutan cd $GOPATH/src/github.com/obscuren/mutan
git submodule init
git sumbodule update
echo "init submodule"
git submodule init
git submodule update
echo "eth-go"
cd $GOPATH/src/github.com/ethereum/eth-go cd $GOPATH/src/github.com/ethereum/eth-go
git checkout $branch git checkout $branch
echo "go-ethereum"
cd $GOPATH/src/github.com/ethereum/go-ethereum/$exe cd $GOPATH/src/github.com/ethereum/go-ethereum/$exe
git checkout $branch git checkout $branch
@ -40,9 +45,9 @@ if [ "$exe" == "ethereal" ]; then
echo "Building ethereal GUI. Assuming Qt is installed. If this step" 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)" echo "fails; please refer to: https://github.com/ethereum/go-ethereum/wiki/Building-Ethereum(Go)"
else else
echo "Building ethereum CLI. echo "Building ethereum CLI."
fi fi
go install go install
echo "done..." echo "done. Please run $exe :-)"