Skip to content

Commit

Permalink
vendoring in deps to prevent future issues :(
Browse files Browse the repository at this point in the history
  • Loading branch information
weavenet committed Sep 20, 2014
1 parent 0579439 commit e7d3f36
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 6 deletions.
18 changes: 13 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
base_dir = `pwd`
gopath = "$(base_dir)/vendor:$(GOPATH)"

all: fmt deps test
@echo "Building."
@mkdir -p bin/
go build -v -o bin/gosync .
@env GOPATH=$(gopath) go build -v -o bin/gosync .
clean:
@echo "Cleaning."
@rm -rf bin pkg vendor/pkg
deps:
@echo "Getting Dependencies."
go get -d -v ./...
test: deps
@echo "Testing."
go test ./...
@env GOPATH=$(gopath) go get -d -v ./...
fmt:
@echo "Formatting."
gofmt -w .
test: deps
@echo "Testing."
@env GOPATH=$(gopath) go test ./gosync/...

.PHONY: all clean deps fmt test
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func main() {

func validateArgs(c *cli.Context) error {
if len(c.Args()) != 2 {
return fmt.Errorf("S3 URL and local directory required.")
return fmt.Errorf("Source and target required.")
}
return nil
}
Expand Down
1 change: 1 addition & 0 deletions vendor/src/github.com/cihub/seelog
Submodule seelog added at d233b7
1 change: 1 addition & 0 deletions vendor/src/github.com/codegangsta/cli
Submodule cli added at 7381bc
1 change: 1 addition & 0 deletions vendor/src/github.com/mitchellh/goamz
Submodule goamz added at 6f49d3
1 change: 1 addition & 0 deletions vendor/src/github.com/motain/gocheck
Submodule gocheck added at 9beb27
1 change: 1 addition & 0 deletions vendor/src/github.com/vaughan0/go-ini
Submodule go-ini added at a98ad7

0 comments on commit e7d3f36

Please sign in to comment.