Skip to content

Commit 0d6f273

Browse files
authored
Merge pull request #226 from cbusbey/clean_vendor
remove vendor source
2 parents af01b95 + 2a70fd5 commit 0d6f273

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+28
-222021
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
*~
22
*.swp
33
*.swo
4+
vendor/*/
45
_test/test
56
_test/echo_server
67
_test/tmp

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ matrix:
2020
allow_failures:
2121
- go: tip
2222

23-
install:
23+
install:
24+
- go get -u github.com/kardianos/govendor
25+
- govendor sync
2426

2527
script: if [ -z "$FIX_TEST" ]; then make generate && make build && make; else make build_accept && make $FIX_TEST; fi

README.md

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ All documentation is available on [GoDoc](https://godoc.org/github.com/quickfixg
1717

1818
To install QuickFIX/Go, use `go get`:
1919

20-
```
21-
go get github.com/quickfixgo/quickfix
20+
```sh
21+
$ go get github.com/quickfixgo/quickfix
2222
```
2323

2424
### Staying up to date
@@ -42,15 +42,33 @@ If you wish to work on QuickFIX/Go itself, you will first need [Go](http://www.g
4242

4343
For local dev first make sure Go is properly installed, including setting up a [GOPATH](http://golang.org/doc/code.html#GOPATH).
4444

45-
Next, using [Git](https://git-scm.com/), clone this repository into `$GOPATH/src/github.com/quickfixgo/quickfix`. All the necessary dependencies are either vendored, so you just need to type `make`. This will verify the code and run the unit tests. If this exits with exit status 0, then everything is working!
45+
Next, using [Git](https://git-scm.com/), clone this repository into `$GOPATH/src/github.com/quickfixgo/quickfix`.
46+
47+
### Installing Dependencies
48+
49+
QuickFIX/Go uses [govendor](https://github.com/kardianos/govendor) to manage the vendored dependencies. Install govendor with `go get`:
50+
51+
```sh
52+
$ go get github.com/kardianos/govendor
53+
```
54+
55+
Run `govendor sync` to install the correct versioned dependencies into `vendor/, which Go 1.6+ automatically recognizes and loads.
56+
57+
```sh
58+
$ $GOPATH/bin/govendor sync
59+
```
60+
61+
**Note:** No vendored dependencies are included in the QuickFIX/Go source.
4662

4763
### Build and Test
4864

65+
The default make target runs [go vet](https://godoc.org/golang.org/x/tools/cmd/vet) and unit tests.
66+
4967
```sh
5068
$ make
5169
```
5270

53-
The default make target runs [go vet](https://godoc.org/golang.org/x/tools/cmd/vet) and unit tests.
71+
If this exits with exit status 0, then everything is working!
5472

5573
### Acceptance Tests
5674

@@ -78,14 +96,11 @@ If you are making changes to the generated code, you will need to include the ge
7896

7997
### Dependencies
8098

81-
QuickFIX/Go stores its dependencies under `vendor/`, which Go 1.6+ automatically recognize and load. We use [govendor](https://github.com/kardianos/govendor) to manage the vendored dependencies.
82-
83-
84-
If you are developing QuickFIX/Go, there are a few tasks you might need to perform.
99+
If you are developing QuickFIX/Go, there are a few tasks you might need to perform related to dependencies.
85100

86101
#### Adding a dependency
87102

88-
If you are adding a dependency, you will need to vendor it in the same Pull Request as the code that depends on it. You should do this in a separate commit from your code, as this makes PR review easier and Git history simpler to read in the future.
103+
If you are adding a dependency, you will need update the govendor manifest in the same Pull Request as the code that depends on it. You should do this in a separate commit from your code, as this makes PR review easier and Git history simpler to read in the future.
89104

90105
To add a dependency:
91106

vendor/github.com/davecgh/go-spew/LICENSE

Lines changed: 0 additions & 13 deletions
This file was deleted.

vendor/github.com/davecgh/go-spew/spew/bypass.go

Lines changed: 0 additions & 151 deletions
This file was deleted.

vendor/github.com/davecgh/go-spew/spew/bypasssafe.go

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)