From c4f9151c67b1481490978a9dca0599b3e92680d5 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Wed, 2 Jul 2014 00:13:50 +0200
Subject: [PATCH] Moved files
---
ethereal/Makefile | 22 --------------------
ethereal/{ui => }/debugger.go | 2 +-
ethereal/{ui => }/ext_app.go | 2 +-
ethereal/{ui => }/gui.go | 4 ++--
ethereal/{ui => }/html_container.go | 2 +-
ethereal/main.go | 3 +--
ethereal/{ui/qml_app.go => qml_container.go} | 2 +-
ethereal/{ui => }/ui_lib.go | 2 +-
8 files changed, 8 insertions(+), 31 deletions(-)
delete mode 100644 ethereal/Makefile
rename ethereal/{ui => }/debugger.go (99%)
rename ethereal/{ui => }/ext_app.go (99%)
rename ethereal/{ui => }/gui.go (99%)
rename ethereal/{ui => }/html_container.go (99%)
rename ethereal/{ui/qml_app.go => qml_container.go} (99%)
rename ethereal/{ui => }/ui_lib.go (99%)
diff --git a/ethereal/Makefile b/ethereal/Makefile
deleted file mode 100644
index 1acf03049..000000000
--- a/ethereal/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-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
diff --git a/ethereal/ui/debugger.go b/ethereal/debugger.go
similarity index 99%
rename from ethereal/ui/debugger.go
rename to ethereal/debugger.go
index 5ad1b4a2c..416155835 100644
--- a/ethereal/ui/debugger.go
+++ b/ethereal/debugger.go
@@ -1,4 +1,4 @@
-package ethui
+package main
import (
"fmt"
diff --git a/ethereal/ui/ext_app.go b/ethereal/ext_app.go
similarity index 99%
rename from ethereal/ui/ext_app.go
rename to ethereal/ext_app.go
index 0230c46ab..17c342a1b 100644
--- a/ethereal/ui/ext_app.go
+++ b/ethereal/ext_app.go
@@ -1,4 +1,4 @@
-package ethui
+package main
import (
"fmt"
diff --git a/ethereal/ui/gui.go b/ethereal/gui.go
similarity index 99%
rename from ethereal/ui/gui.go
rename to ethereal/gui.go
index 91351aced..1e6fac4de 100644
--- a/ethereal/ui/gui.go
+++ b/ethereal/gui.go
@@ -1,4 +1,4 @@
-package ethui
+package main
import (
"bytes"
@@ -40,7 +40,7 @@ type Gui struct {
}
// 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")
if err != nil {
diff --git a/ethereal/ui/html_container.go b/ethereal/html_container.go
similarity index 99%
rename from ethereal/ui/html_container.go
rename to ethereal/html_container.go
index f2ebd840c..1e835eebc 100644
--- a/ethereal/ui/html_container.go
+++ b/ethereal/html_container.go
@@ -1,4 +1,4 @@
-package ethui
+package main
import (
"errors"
diff --git a/ethereal/main.go b/ethereal/main.go
index 82427f088..f3f1d3140 100644
--- a/ethereal/main.go
+++ b/ethereal/main.go
@@ -2,7 +2,6 @@ package main
import (
"github.com/ethereum/eth-go/ethlog"
- "github.com/ethereum/go-ethereum/ethereal/ui"
"github.com/ethereum/go-ethereum/utils"
"github.com/go-qml/qml"
"os"
@@ -47,7 +46,7 @@ func main() {
utils.StartRpc(ethereum, RpcPort)
}
- gui := ethui.New(ethereum, KeyRing, LogLevel)
+ gui := NewWindow(ethereum, KeyRing, LogLevel)
utils.RegisterInterrupt(func(os.Signal) {
gui.Stop()
diff --git a/ethereal/ui/qml_app.go b/ethereal/qml_container.go
similarity index 99%
rename from ethereal/ui/qml_app.go
rename to ethereal/qml_container.go
index d23fdd110..a8ce1cb75 100644
--- a/ethereal/ui/qml_app.go
+++ b/ethereal/qml_container.go
@@ -1,4 +1,4 @@
-package ethui
+package main
import (
"github.com/ethereum/eth-go/ethchain"
diff --git a/ethereal/ui/ui_lib.go b/ethereal/ui_lib.go
similarity index 99%
rename from ethereal/ui/ui_lib.go
rename to ethereal/ui_lib.go
index 892c1f065..997a3391a 100644
--- a/ethereal/ui/ui_lib.go
+++ b/ethereal/ui_lib.go
@@ -1,4 +1,4 @@
-package ethui
+package main
import (
"github.com/ethereum/eth-go"
--
GitLab