Browse Source

all: modify import path, change version to v0.8.0

fatedier 8 years ago
parent
commit
d4ecc2218d

+ 3 - 3
Makefile

@@ -1,5 +1,5 @@
 export PATH := $(GOPATH)/bin:$(PATH)
-export GOPATH := $(shell pwd)/Godeps/_workspace:$(shell pwd):$(GOPATH)
+export GOPATH := $(shell pwd)/Godeps/_workspace:$(GOPATH)
 
 all: build
 
@@ -14,11 +14,11 @@ fmt:
 	@go fmt ./test/func_test.go
 
 frps:
-	go build -o bin/frps ./src/frp/cmd/frps
+	go build -o bin/frps ./src/cmd/frps
 	cp -rf ./assets ./bin
 
 frpc:
-	go build -o bin/frpc ./src/frp/cmd/frpc
+	go build -o bin/frpc ./src/cmd/frpc
 
 echo_server:
 	go build -o test/bin/echo_server ./test/echo_server.go

+ 1 - 1
Makefile.cross-compiles

@@ -1,6 +1,6 @@
 export PATH := $(GOPATH)/bin:$(PATH)
 export OLDGOPATH := $(GOPATH)
-export GOPATH := $(shell pwd)/Godeps/_workspace:$(shell pwd):$(GOPATH)
+export GOPATH := $(shell pwd)/Godeps/_workspace:$(GOPATH)
 
 all: build
 

+ 6 - 6
src/frp/cmd/frpc/control.go → src/cmd/frpc/control.go

@@ -21,12 +21,12 @@ import (
 	"sync"
 	"time"
 
-	"frp/models/client"
-	"frp/models/consts"
-	"frp/models/msg"
-	"frp/utils/conn"
-	"frp/utils/log"
-	"frp/utils/pcrypto"
+	"github.com/fatedier/frp/src/models/client"
+	"github.com/fatedier/frp/src/models/consts"
+	"github.com/fatedier/frp/src/models/msg"
+	"github.com/fatedier/frp/src/utils/conn"
+	"github.com/fatedier/frp/src/utils/log"
+	"github.com/fatedier/frp/src/utils/pcrypto"
 )
 
 func ControlProcess(cli *client.ProxyClient, wait *sync.WaitGroup) {

+ 3 - 3
src/frp/cmd/frpc/main.go → src/cmd/frpc/main.go

@@ -23,9 +23,9 @@ import (
 
 	docopt "github.com/docopt/docopt-go"
 
-	"frp/models/client"
-	"frp/utils/log"
-	"frp/utils/version"
+	"github.com/fatedier/frp/src/models/client"
+	"github.com/fatedier/frp/src/utils/log"
+	"github.com/fatedier/frp/src/utils/version"
 )
 
 var (

+ 6 - 6
src/frp/cmd/frps/control.go → src/cmd/frps/control.go

@@ -20,12 +20,12 @@ import (
 	"io"
 	"time"
 
-	"frp/models/consts"
-	"frp/models/msg"
-	"frp/models/server"
-	"frp/utils/conn"
-	"frp/utils/log"
-	"frp/utils/pcrypto"
+	"github.com/fatedier/frp/src/models/consts"
+	"github.com/fatedier/frp/src/models/msg"
+	"github.com/fatedier/frp/src/models/server"
+	"github.com/fatedier/frp/src/utils/conn"
+	"github.com/fatedier/frp/src/utils/log"
+	"github.com/fatedier/frp/src/utils/pcrypto"
 )
 
 func ProcessControlConn(l *conn.Listener) {

+ 5 - 5
src/frp/cmd/frps/main.go → src/cmd/frps/main.go

@@ -26,11 +26,11 @@ import (
 
 	docopt "github.com/docopt/docopt-go"
 
-	"frp/models/server"
-	"frp/utils/conn"
-	"frp/utils/log"
-	"frp/utils/version"
-	"frp/utils/vhost"
+	"github.com/fatedier/frp/src/models/server"
+	"github.com/fatedier/frp/src/utils/conn"
+	"github.com/fatedier/frp/src/utils/log"
+	"github.com/fatedier/frp/src/utils/version"
+	"github.com/fatedier/frp/src/utils/vhost"
 )
 
 var usage string = `frps is the server of frp

+ 6 - 6
src/frp/models/client/client.go → src/models/client/client.go

@@ -19,12 +19,12 @@ import (
 	"fmt"
 	"time"
 
-	"frp/models/config"
-	"frp/models/consts"
-	"frp/models/msg"
-	"frp/utils/conn"
-	"frp/utils/log"
-	"frp/utils/pcrypto"
+	"github.com/fatedier/frp/src/models/config"
+	"github.com/fatedier/frp/src/models/consts"
+	"github.com/fatedier/frp/src/models/msg"
+	"github.com/fatedier/frp/src/utils/conn"
+	"github.com/fatedier/frp/src/utils/log"
+	"github.com/fatedier/frp/src/utils/pcrypto"
 )
 
 type ProxyClient struct {

+ 0 - 0
src/frp/models/client/config.go → src/models/client/config.go


+ 0 - 0
src/frp/models/config/config.go → src/models/config/config.go


+ 0 - 0
src/frp/models/consts/consts.go → src/models/consts/consts.go


+ 1 - 1
src/frp/models/metric/server.go → src/models/metric/server.go

@@ -19,7 +19,7 @@ import (
 	"sync"
 	"time"
 
-	"frp/models/consts"
+	"github.com/fatedier/frp/src/models/consts"
 )
 
 var (

+ 0 - 0
src/frp/models/msg/msg.go → src/models/msg/msg.go


+ 6 - 6
src/frp/models/msg/process.go → src/models/msg/process.go

@@ -21,12 +21,12 @@ import (
 	"io"
 	"sync"
 
-	"frp/models/config"
-	"frp/models/metric"
-	"frp/utils/conn"
-	"frp/utils/log"
-	"frp/utils/pcrypto"
-	"frp/utils/pool"
+	"github.com/fatedier/frp/src/models/config"
+	"github.com/fatedier/frp/src/models/metric"
+	"github.com/fatedier/frp/src/utils/conn"
+	"github.com/fatedier/frp/src/utils/log"
+	"github.com/fatedier/frp/src/utils/pcrypto"
+	"github.com/fatedier/frp/src/utils/pool"
 )
 
 // will block until connection close

+ 4 - 4
src/frp/models/server/config.go → src/models/server/config.go

@@ -22,10 +22,10 @@ import (
 
 	ini "github.com/vaughan0/go-ini"
 
-	"frp/models/consts"
-	"frp/models/metric"
-	"frp/utils/log"
-	"frp/utils/vhost"
+	"github.com/fatedier/frp/src/models/consts"
+	"github.com/fatedier/frp/src/models/metric"
+	"github.com/fatedier/frp/src/utils/log"
+	"github.com/fatedier/frp/src/utils/vhost"
 )
 
 // common config

+ 0 - 0
src/frp/models/server/dashboard.go → src/models/server/dashboard.go


+ 2 - 2
src/frp/models/server/dashboard_api.go → src/models/server/dashboard_api.go

@@ -19,8 +19,8 @@ import (
 	"fmt"
 	"net/http"
 
-	"frp/models/metric"
-	"frp/utils/log"
+	"github.com/fatedier/frp/src/models/metric"
+	"github.com/fatedier/frp/src/utils/log"
 )
 
 type GeneralResponse struct {

+ 2 - 2
src/frp/models/server/dashboard_view.go → src/models/server/dashboard_view.go

@@ -19,8 +19,8 @@ import (
 	"net/http"
 	"path"
 
-	"frp/models/metric"
-	"frp/utils/log"
+	"github.com/fatedier/frp/src/models/metric"
+	"github.com/fatedier/frp/src/utils/log"
 )
 
 func viewDashboard(w http.ResponseWriter, r *http.Request) {

+ 6 - 6
src/frp/models/server/server.go → src/models/server/server.go

@@ -19,12 +19,12 @@ import (
 	"sync"
 	"time"
 
-	"frp/models/config"
-	"frp/models/consts"
-	"frp/models/metric"
-	"frp/models/msg"
-	"frp/utils/conn"
-	"frp/utils/log"
+	"github.com/fatedier/frp/src/models/config"
+	"github.com/fatedier/frp/src/models/consts"
+	"github.com/fatedier/frp/src/models/metric"
+	"github.com/fatedier/frp/src/models/msg"
+	"github.com/fatedier/frp/src/utils/conn"
+	"github.com/fatedier/frp/src/utils/log"
 )
 
 type Listener interface {

+ 0 - 0
src/frp/utils/broadcast/broadcast.go → src/utils/broadcast/broadcast.go


+ 0 - 0
src/frp/utils/broadcast/broadcast_test.go → src/utils/broadcast/broadcast_test.go


+ 0 - 0
src/frp/utils/conn/conn.go → src/utils/conn/conn.go


+ 0 - 0
src/frp/utils/log/log.go → src/utils/log/log.go


+ 0 - 0
src/frp/utils/pcrypto/pcrypto.go → src/utils/pcrypto/pcrypto.go


+ 0 - 0
src/frp/utils/pcrypto/pcrypto_test.go → src/utils/pcrypto/pcrypto_test.go


+ 0 - 0
src/frp/utils/pool/pool.go → src/utils/pool/pool.go


+ 1 - 1
src/frp/utils/version/version.go → src/utils/version/version.go

@@ -19,7 +19,7 @@ import (
 	"strings"
 )
 
-var version string = "0.7.0"
+var version string = "0.8.0"
 
 func Full() string {
 	return version

+ 0 - 0
src/frp/utils/version/version_test.go → src/utils/version/version_test.go


+ 2 - 2
src/frp/utils/vhost/http.go → src/utils/vhost/http.go

@@ -25,8 +25,8 @@ import (
 	"strings"
 	"time"
 
-	"frp/utils/conn"
-	"frp/utils/pool"
+	"github.com/fatedier/frp/src/utils/conn"
+	"github.com/fatedier/frp/src/utils/pool"
 )
 
 type HttpMuxer struct {

+ 2 - 2
src/frp/utils/vhost/https.go → src/utils/vhost/https.go

@@ -21,8 +21,8 @@ import (
 	"strings"
 	"time"
 
-	"frp/utils/conn"
-	"frp/utils/pool"
+	"github.com/fatedier/frp/src/utils/conn"
+	"github.com/fatedier/frp/src/utils/pool"
 )
 
 const (

+ 1 - 1
src/frp/utils/vhost/vhost.go → src/utils/vhost/vhost.go

@@ -23,7 +23,7 @@ import (
 	"sync"
 	"time"
 
-	"frp/utils/conn"
+	"github.com/fatedier/frp/src/utils/conn"
 )
 
 type muxFunc func(*conn.Conn) (net.Conn, string, error)

+ 1 - 1
test/echo_server.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"io"
 
-	"frp/utils/conn"
+	"github.com/fatedier/frp/src/utils/conn"
 )
 
 var (

+ 1 - 1
test/func_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"frp/utils/conn"
+	"github.com/fatedier/frp/src/utils/conn"
 )
 
 var (