all: improve the method of import for internal packages

1. Change directory structure and Makefile to let GOPATH=`pwd`, so wherever the project directory is, just use make to build.
fatedier · Feb 25, 2016 · 09127a3 · 09127a3
1 parent f32cc7a
commit 09127a3
Show file tree

Hide file tree

Showing 17 changed files with 28 additions and 27 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,5 @@
 export PATH := $(GOPATH)/bin:$(PATH)
+export NEW_GOPATH := $(shell pwd)
 
 all: build
 
@@ -9,13 +10,13 @@ godep:
 	godep restore
 
 fmt:
-	@godep go fmt ./...
+	@GOPATH=$(NEW_GOPATH) godep go fmt ./...
 
 frps:
-	godep go build -o bin/frps ./cmd/frps
+	GOPATH=$(NEW_GOPATH) godep go build -o bin/frps ./src/frp/cmd/frps
 
 frpc:
-	godep go build -o bin/frpc ./cmd/frpc
+	GOPATH=$(NEW_GOPATH) godep go build -o bin/frpc ./src/frp/cmd/frpc
 
 test:
-	@godep go test ./...
+	@GOPATH=$(NEW_GOPATH) godep go test ./...
diff --git a/cmd/frpc/control.go → src/frp/cmd/frpc/control.go b/cmd/frpc/control.go → src/frp/cmd/frpc/control.go
@@ -7,11 +7,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/fatedier/frp/models/client"
-	"github.com/fatedier/frp/models/consts"
-	"github.com/fatedier/frp/models/msg"
-	"github.com/fatedier/frp/utils/conn"
-	"github.com/fatedier/frp/utils/log"
+	"frp/models/client"
+	"frp/models/consts"
+	"frp/models/msg"
+	"frp/utils/conn"
+	"frp/utils/log"
 )
 
 func ControlProcess(cli *client.ProxyClient, wait *sync.WaitGroup) {

diff --git a/cmd/frpc/main.go → src/frp/cmd/frpc/main.go b/cmd/frpc/main.go → src/frp/cmd/frpc/main.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"sync"
 
-	"github.com/fatedier/frp/models/client"
-	"github.com/fatedier/frp/utils/log"
+	"frp/models/client"
+	"frp/utils/log"
 )
 
 func main() {

diff --git a/cmd/frps/control.go → src/frp/cmd/frps/control.go b/cmd/frps/control.go → src/frp/cmd/frps/control.go
@@ -6,11 +6,11 @@ import (
 	"io"
 	"time"
 
-	"github.com/fatedier/frp/models/consts"
-	"github.com/fatedier/frp/models/msg"
-	"github.com/fatedier/frp/models/server"
-	"github.com/fatedier/frp/utils/conn"
-	"github.com/fatedier/frp/utils/log"
+	"frp/models/consts"
+	"frp/models/msg"
+	"frp/models/server"
+	"frp/utils/conn"
+	"frp/utils/log"
 )
 
 func ProcessControlConn(l *conn.Listener) {

diff --git a/cmd/frps/main.go → src/frp/cmd/frps/main.go b/cmd/frps/main.go → src/frp/cmd/frps/main.go
@@ -3,9 +3,9 @@ package main
 import (
 	"os"
 
-	"github.com/fatedier/frp/models/server"
-	"github.com/fatedier/frp/utils/conn"
-	"github.com/fatedier/frp/utils/log"
+	"frp/models/server"
+	"frp/utils/conn"
+	"frp/utils/log"
 )
 
 func main() {

diff --git a/models/client/client.go → src/frp/models/client/client.go b/models/client/client.go → src/frp/models/client/client.go
@@ -3,10 +3,10 @@ package client
 import (
 	"encoding/json"
 
-	"github.com/fatedier/frp/models/consts"
-	"github.com/fatedier/frp/models/msg"
-	"github.com/fatedier/frp/utils/conn"
-	"github.com/fatedier/frp/utils/log"
+	"frp/models/consts"
+	"frp/models/msg"
+	"frp/utils/conn"
+	"frp/utils/log"
 )
 
 type ProxyClient struct {

diff --git a/models/client/config.go → src/frp/models/client/config.go b/models/client/config.go → src/frp/models/client/config.go
diff --git a/models/consts/consts.go → src/frp/models/consts/consts.go b/models/consts/consts.go → src/frp/models/consts/consts.go
diff --git a/models/msg/msg.go → src/frp/models/msg/msg.go b/models/msg/msg.go → src/frp/models/msg/msg.go
diff --git a/models/server/config.go → src/frp/models/server/config.go b/models/server/config.go → src/frp/models/server/config.go
diff --git a/models/server/server.go → src/frp/models/server/server.go b/models/server/server.go → src/frp/models/server/server.go
@@ -5,9 +5,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/fatedier/frp/models/consts"
-	"github.com/fatedier/frp/utils/conn"
-	"github.com/fatedier/frp/utils/log"
+	"frp/models/consts"
+	"frp/utils/conn"
+	"frp/utils/log"
 )
 
 type ProxyServer struct {

diff --git a/utils/broadcast/broadcast.go → src/frp/utils/broadcast/broadcast.go b/utils/broadcast/broadcast.go → src/frp/utils/broadcast/broadcast.go
diff --git a/utils/broadcast/broadcast_test.go → src/frp/utils/broadcast/broadcast_test.go b/utils/broadcast/broadcast_test.go → src/frp/utils/broadcast/broadcast_test.go
diff --git a/utils/conn/conn.go → src/frp/utils/conn/conn.go b/utils/conn/conn.go → src/frp/utils/conn/conn.go
@@ -7,7 +7,7 @@ import (
 	"net"
 	"sync"
 
-	"github.com/fatedier/frp/utils/log"
+	"frp/utils/log"
 )
 
 type Listener struct {

diff --git a/utils/log/log.go → src/frp/utils/log/log.go b/utils/log/log.go → src/frp/utils/log/log.go
diff --git a/utils/pcrypto/pcrypto.go → src/frp/utils/pcrypto/pcrypto.go b/utils/pcrypto/pcrypto.go → src/frp/utils/pcrypto/pcrypto.go
diff --git a/utils/pcrypto/pcrypto_test.go → src/frp/utils/pcrypto/pcrypto_test.go b/utils/pcrypto/pcrypto_test.go → src/frp/utils/pcrypto/pcrypto_test.go