guoswork/frp
1
0
Fork 0
mirror of https://gitee.com/IrisVega/frp.git synced 2024-11-01 22:31:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

build: remove godep command(can not download packages in golang.org used in latest godep version)

Browse Source
This commit is contained in:
fatedier 2016-06-07 22:17:37 +08:00
parent e8c830e5c8
commit 740fb05b21
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile
View File

@ -1,16 +1,12 @@
export PATH := $(GOPATH)/bin:$(PATH) export PATH := $(GOPATH)/bin:$(PATH)
export OLDGOPATH := $(GOPATH) export GOPATH := $(shell pwd)/Godeps/_workspace:$(shell pwd):$(GOPATH)
export GOPATH := $(shell pwd):$(GOPATH)
all: build all: build
build: godep fmt frps frpc build_test build: fmt frps frpc build_test
build_test: echo_server http_server build_test: echo_server http_server
godep:
GOPATH=$(OLDGOPATH) go get github.com/tools/godep
fmt: fmt:
go fmt ./src/... go fmt ./src/...
@go fmt ./test/echo_server.go @go fmt ./test/echo_server.go
@ -18,26 +14,26 @@ fmt:
@go fmt ./test/func_test.go @go fmt ./test/func_test.go
frps: frps:
godep go build -o bin/frps ./src/frp/cmd/frps go build -o bin/frps ./src/frp/cmd/frps
frpc: frpc:
godep go build -o bin/frpc ./src/frp/cmd/frpc go build -o bin/frpc ./src/frp/cmd/frpc
echo_server: echo_server:
godep go build -o test/bin/echo_server ./test/echo_server.go go build -o test/bin/echo_server ./test/echo_server.go
http_server: http_server:
godep go build -o test/bin/http_server ./test/http_server.go go build -o test/bin/http_server ./test/http_server.go
test: gotest test: gotest
gotest: gotest:
godep go test -v ./src/... go test -v ./src/...
alltest: alltest:
cd ./test && ./run_test.sh && cd - cd ./test && ./run_test.sh && cd -
godep go test -v ./src/... go test -v ./src/...
godep go test -v ./test/func_test.go go test -v ./test/func_test.go
cd ./test && ./clean_test.sh && cd - cd ./test && ./clean_test.sh && cd -
clean: clean:

4
Makefile.cross-compiles
View File

@ -4,9 +4,9 @@ export GOPATH := $(shell pwd)/Godeps/_workspace:$(shell pwd):$(GOPATH)
all: build all: build
build: godep app build: gox app
godep: gox:
GOPATH=$(OLDGOPATH) go get github.com/mitchellh/gox GOPATH=$(OLDGOPATH) go get github.com/mitchellh/gox
app: app: