Commit c4f9151c authored by obscuren's avatar obscuren

Moved files

parent 28353213
UNAME = $(shell uname)
FILES=qml *.png
GOPATH=$(PWD)
# Default is building
all:
go get -d
cp *.go $(GOPATH)/src/github.com/ethereum/go-ethereum
cp -r ui $(GOPATH)/src/github.com/ethereum/go-ethereum
go build
install:
# Linux build
ifeq ($(UNAME),Linux)
cp -r assets/* /usr/share/ethereal
cp go-ethereum /usr/local/bin/ethereal
endif
# OS X build
ifeq ($(UNAME),Darwin)
# Execute py script
endif
package ethui package main
import ( import (
"fmt" "fmt"
......
package ethui package main
import ( import (
"fmt" "fmt"
......
package ethui package main
import ( import (
"bytes" "bytes"
...@@ -40,7 +40,7 @@ type Gui struct { ...@@ -40,7 +40,7 @@ type Gui struct {
} }
// Create GUI, but doesn't start it // Create GUI, but doesn't start it
func New(ethereum *eth.Ethereum, session string, logLevel int) *Gui { func NewWindow(ethereum *eth.Ethereum, session string, logLevel int) *Gui {
db, err := ethdb.NewLDBDatabase("tx_database") db, err := ethdb.NewLDBDatabase("tx_database")
if err != nil { if err != nil {
......
package ethui package main
import ( import (
"errors" "errors"
......
...@@ -2,7 +2,6 @@ package main ...@@ -2,7 +2,6 @@ package main
import ( import (
"github.com/ethereum/eth-go/ethlog" "github.com/ethereum/eth-go/ethlog"
"github.com/ethereum/go-ethereum/ethereal/ui"
"github.com/ethereum/go-ethereum/utils" "github.com/ethereum/go-ethereum/utils"
"github.com/go-qml/qml" "github.com/go-qml/qml"
"os" "os"
...@@ -47,7 +46,7 @@ func main() { ...@@ -47,7 +46,7 @@ func main() {
utils.StartRpc(ethereum, RpcPort) utils.StartRpc(ethereum, RpcPort)
} }
gui := ethui.New(ethereum, KeyRing, LogLevel) gui := NewWindow(ethereum, KeyRing, LogLevel)
utils.RegisterInterrupt(func(os.Signal) { utils.RegisterInterrupt(func(os.Signal) {
gui.Stop() gui.Stop()
......
package ethui package main
import ( import (
"github.com/ethereum/eth-go/ethchain" "github.com/ethereum/eth-go/ethchain"
......
package ethui package main
import ( import (
"github.com/ethereum/eth-go" "github.com/ethereum/eth-go"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment