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

This commit is contained in:
fatedier 2016-08-11 16:10:44 +08:00
parent 9c0ca8675d
commit d4ecc2218d
32 changed files with 59 additions and 59 deletions

View File

@ -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

View File

@ -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

View File

@ -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) {

View File

@ -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 (

View File

@ -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) {

View File

@ -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

View File

@ -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 {

View File

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

View File

@ -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

View File

@ -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

View File

@ -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 {

View File

@ -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) {

View File

@ -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 {

View File

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

View File

@ -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 {

View File

@ -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 (

View File

@ -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)

View File

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

View File

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