Merge pull request #1250 from tendermint/ditch-glide

Ditch glide

docs/abci-cli.rst

@@ -16,15 +16,15 @@ Next, install the ``abci-cli`` tool and example applications:
 
     go get -u github.com/tendermint/abci/cmd/abci-cli
 
-If this fails, you may need to use ``glide`` to get vendored
+If this fails, you may need to use `dep <https://github.com/golang/dep>`__ to get vendored
 dependencies:
 
 ::
 
-    go get github.com/Masterminds/glide
     cd $GOPATH/src/github.com/tendermint/abci
-    glide install
-    go install ./cmd/abci-cli
+    make get_tools
+    make get_vendor_deps
+    make install
 
 Now run ``abci-cli`` to see the list of commands:
 

docs/getting-started.rst

@@ -27,15 +27,15 @@ Then run
 
     go get -u github.com/tendermint/abci/cmd/abci-cli
 
-If there is an error, install and run the ``glide`` tool to pin the
+If there is an error, install and run the `dep <https://github.com/golang/dep>`__ tool to pin the
 dependencies:
 
 ::
 
-    go get github.com/Masterminds/glide
     cd $GOPATH/src/github.com/tendermint/abci
-    glide install
-    go install ./cmd/abci-cli
+    make get_tools
+    make get_vendor_deps
+    make install
 
 Now you should have the ``abci-cli`` installed; you'll see
 a couple of commands (``counter`` and ``kvstore``) that are

docs/install.rst

@@ -9,7 +9,7 @@ To download pre-built binaries, see the `Download page <https://tendermint.com/d
 From Source
 -----------
 
-You'll need ``go``, maybe ``glide``, and the Tendermint source code.
+You'll need ``go``, maybe `dep <https://github.com/golang/dep>`__, and the Tendermint source code.
 
 Install Go
 ^^^^^^^^^^
@@ -31,21 +31,21 @@ installation worked.
 
 If the installation failed, a dependency may have been updated and become
 incompatible with the latest Tendermint master branch. We solve this
-using the ``glide`` tool for dependency management.
+using the ``dep`` tool for dependency management.
 
-First, install ``glide``:
+First, install ``dep``:
 
 ::
 
-    go get github.com/Masterminds/glide
+    make get_tools
 
 Now we can fetch the correct versions of each dependency by running:
 
 ::
 
     cd $GOPATH/src/github.com/tendermint/tendermint
-    glide install
-    go install ./cmd/tendermint
+    make get_vendor_deps
+    make install
 
 Note that even though ``go get`` originally failed, the repository was
 still cloned to the correct location in the ``$GOPATH``.
@@ -60,7 +60,7 @@ If you already have Tendermint installed, and you make updates, simply
 ::
 
     cd $GOPATH/src/github.com/tendermint/tendermint
-    go install ./cmd/tendermint
+    make install
 
 To upgrade, there are a few options:
 
@@ -72,18 +72,18 @@ To upgrade, there are a few options:
    its dependencies
 -  fetch and checkout the latest master branch in
    ``$GOPATH/src/github.com/tendermint/tendermint``, and then run
-   ``glide install && go install ./cmd/tendermint`` as above.
+   ``make get_vendor_deps && make install`` as above.
 
 Note the first two options should usually work, but may fail. If they
-do, use ``glide``, as above:
+do, use ``dep``, as above:
 
 ::
 
     cd $GOPATH/src/github.com/tendermint/tendermint
-    glide install
-    go install ./cmd/tendermint
+    make get_vendor_deps
+    make install
 
-Since the third option just uses ``glide`` right away, it should always
+Since the third option just uses ``dep`` right away, it should always
 work.
 
 Troubleshooting
@@ -96,8 +96,8 @@ If ``go get`` failing bothers you, fetch the code using ``git``:
     mkdir -p $GOPATH/src/github.com/tendermint
     git clone https://github.com/tendermint/tendermint $GOPATH/src/github.com/tendermint/tendermint
     cd $GOPATH/src/github.com/tendermint/tendermint
-    glide install
-    go install ./cmd/tendermint
+    make get_vendor_deps
+    make install
 
 Run
 ^^^