Merge pull request #310 from cosmos/develop

Develop

Dockerfile.dev

@@ -2,13 +2,13 @@ FROM golang:latest
 
 RUN apt-get update && apt-get install -y jq
 
-RUN mkdir -p /go/src/github.com/tendermint/basecoin
-WORKDIR /go/src/github.com/tendermint/basecoin
+RUN mkdir -p /go/src/github.com/cosmos/cosmos-sdk
+WORKDIR /go/src/github.com/cosmos/cosmos-sdk
 
-COPY Makefile /go/src/github.com/tendermint/basecoin/
-COPY glide.yaml /go/src/github.com/tendermint/basecoin/
-COPY glide.lock /go/src/github.com/tendermint/basecoin/
+COPY Makefile /go/src/github.com/cosmos/cosmos-sdk/
+COPY glide.yaml /go/src/github.com/cosmos/cosmos-sdk/
+COPY glide.lock /go/src/github.com/cosmos/cosmos-sdk/
 
 RUN make get_vendor_deps
 
-COPY . /go/src/github.com/tendermint/basecoin
+COPY . /go/src/github.com/cosmos/cosmos-sdk

Makefile

@@ -6,8 +6,9 @@ TUTORIALS=$(shell find docs/guide -name "*md" -type f)
 EXAMPLES := counter eyes basecoin
 INSTALL_EXAMPLES := $(addprefix install_,${EXAMPLES})
 TEST_EXAMPLES := $(addprefix testex_,${EXAMPLES})
-
-LINKER_FLAGS:="-X github.com/cosmos/cosmos-sdk/client/commands.CommitHash=`git rev-parse --short HEAD`"
+COMMIT_HASH := $(shell git rev-parse --short HEAD)
+LINKER_FLAGS:="-X github.com/cosmos/cosmos-sdk/client/commands.CommitHash=${COMMIT_HASH}"
+NOVENDOR := $(shell glide novendor)
 
 all: get_vendor_deps install test
 
@@ -21,7 +22,7 @@ $(TEST_EXAMPLES): testex_%:
 	cd ./examples/$* && make test_cli
 
 install: $(INSTALL_EXAMPLES)
-	@go install -ldflags $(LINKER_FLAGS) ./cmd/...
+	go install -ldflags $(LINKER_FLAGS) ./cmd/...
 
 dist:
 	@bash publish/dist.sh
@@ -34,7 +35,7 @@ benchmark:
 test: test_unit test_cli
 
 test_unit:
-	@go test `glide novendor`
+	@go test $(NOVENDOR)
 
 test_cli: $(TEST_EXAMPLES)
 	# sudo apt-get install jq

README.md

@@ -24,9 +24,11 @@ master    | [![CircleCI](https://circleci.com/gh/cosmos/cosmos-sdk/tree/master.s
 
 !!!!!!!!!!!!!!!!!!!!!
 
+**Note: Requires Go 1.8+**
+
 The Cosmos SDK is the middleware platform that the [Cosmos Hub](https://cosmos.network) is constructed from. The Hub is a blockchain (or, internet of blockchains) in which the Atom supply resides. The Atoms supply is defined at genesis and can change based on the rules of the Hub.
 
-Under the hood, the Cosmos SDK is an [ABCI application](https://github.com/tendermint/abci) designed to be used with the [Tendermint consensus engine](https://tendermint.com/) to form a Proof-of-Stake cryptocurrency. It also provides a general purpose framework
+Under the hood, the Cosmos SDK is an [ABCI application](https://github.com/tendermint/abci) designed to be used with the [Tendermint consensus engine](https://github.com/tendermint/tendermint) to form a Proof-of-Stake cryptocurrency. It also provides a general purpose framework
 for extending the feature-set of the cryptocurrency by implementing plugins.
 
 This SDK affords you all the tools you need to rapidly develop
@@ -43,23 +45,14 @@ Within this repository, the `basecoin` app serves as a reference implementation
 
 * [golang](https://golang.org/doc/install)
 
-## Installation
+## Installation and Documentation
 
 ```
 go get -u github.com/cosmos/cosmos-sdk/cmd/basecoin
 ```
 
-See the [install guide](/docs/guide/install.md) for more details.
-
-## Guides
-
-* Getting started with the [Basecoin basics](/docs/basecoin-basics.rst)
-* Learn to [use the plugin system](/docs/basecoin-plugins.rst)
-* More features of the [Basecoin tool](/docs/basecoin-tool.rst)
-* Learn how to use [Inter-Blockchain Communication (IBC)](/docs/ibc.rst)
-* See [more examples](https://github.com/cosmos/cosmos-academy)
+See the [Cosmos SDK Documentation](http://cosmos-sdk.readthedocs.io/en/latest/) for complete installation details and usage documentation. To deploy a testnet, see our [repository of deployment tools](https://github.com/tendermint/tools).
 
-To deploy a testnet, see our [repository of deployment tools](https://github.com/tendermint/tools).
 
 # Inspiration