Browse Source

restructure code to isolate the environment and make the project easier to work on

Alan Shreve 12 years ago
parent
commit
2c2b8fbc71

+ 3 - 0
.gitignore

@@ -1,2 +1,5 @@
 *.swp
 *.swp
 bin/
 bin/
+pkg/
+src/code.google.com
+src/github.com

+ 13 - 8
Makefile

@@ -1,13 +1,18 @@
-.PHONY: default bindir server client
+.PHONY: default server client deps clean all
 
 
-default: client server
+default: all
 
 
-bindir:
-	mkdir -p bin
+deps:
+	GOPATH=`pwd` go get -v ngrok/...
 
 
-server: bindir
-	GOPATH=~ go build -o bin/ngrokd main/server.go
+server: deps
+	GOPATH=`pwd` go install main/ngrokd
 
 
-client: bindir
-	GOPATH=~ go build -o bin/ngrok main/client.go
+client: deps
+	GOPATH=`pwd` go install main/ngrok
 
 
+all: deps
+	GOPATH=`pwd` go install main/...
+
+clean:
+	GOPATH=`pwd` go clean ngrok/...

+ 0 - 0
main/client.go → src/main/ngrok/client.go


+ 0 - 0
main/server.go → src/main/ngrokd/server.go


+ 0 - 0
client/cli.go → src/ngrok/client/cli.go


+ 0 - 0
client/history.go → src/ngrok/client/history.go


+ 0 - 0
client/main.go → src/ngrok/client/main.go


+ 0 - 0
client/metrics.go → src/ngrok/client/metrics.go


+ 0 - 0
client/state.go → src/ngrok/client/state.go


+ 0 - 0
client/ui/broadcast.go → src/ngrok/client/ui/broadcast.go


+ 0 - 0
client/ui/http.go → src/ngrok/client/ui/http.go


+ 0 - 0
client/ui/interface.go → src/ngrok/client/ui/interface.go


+ 0 - 0
client/ui/terminal.go → src/ngrok/client/ui/terminal.go


+ 0 - 0
client/ui/ui.go → src/ngrok/client/ui/ui.go


+ 0 - 0
conn/conn.go → src/ngrok/conn/conn.go


+ 0 - 0
conn/http.go → src/ngrok/conn/http.go


+ 0 - 0
conn/tee.go → src/ngrok/conn/tee.go


+ 0 - 0
log/logger.go → src/ngrok/log/logger.go


+ 0 - 0
proto/conn.go → src/ngrok/proto/conn.go


+ 0 - 0
proto/msg.go → src/ngrok/proto/msg.go


+ 0 - 0
proto/pack.go → src/ngrok/proto/pack.go


+ 0 - 0
server/control.go → src/ngrok/server/control.go


+ 0 - 0
server/http.go → src/ngrok/server/http.go


+ 0 - 0
server/main.go → src/ngrok/server/main.go


+ 0 - 0
server/manager.go → src/ngrok/server/manager.go


+ 0 - 0
server/metrics.go → src/ngrok/server/metrics.go


+ 0 - 0
server/tunnel.go → src/ngrok/server/tunnel.go