From b5c6a62e63368f74d9ea64ce9dff071f2075b9cf Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Mon, 16 May 2016 06:23:04 +0200 Subject: [PATCH 1/4] Makefile: remove toolkit_upgrade target License: MIT Signed-off-by: Christian Couder --- Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 496002174..de0c573f3 100644 --- a/Makefile +++ b/Makefile @@ -22,8 +22,6 @@ all: help godep: go get github.com/tools/godep -toolkit_upgrade: gx_upgrade gxgo_upgrade - go_check: @bin/check_go_version $(IPFS_MIN_GO_VERSION) @@ -68,7 +66,7 @@ clean: uninstall: make -C cmd/ipfs uninstall -PHONY += all help godep toolkit_upgrade gx_check +PHONY += all help godep gx_check PHONY += go_check deps vendor install build nofuse clean uninstall ############################################################## @@ -125,7 +123,7 @@ PHONY += test test_short test_expensive help: @echo 'DEPENDENCY TARGETS:' @echo '' - @echo ' toolkit_upgrade - Installs or upgrades gx' + @echo ' gx_check - Installs or upgrades gx and gx-go' @echo ' deps - Download dependencies using gx' @echo ' vendor - Create a Godep workspace of 3rd party dependencies' @echo '' From 255992873ba26d887aafbbf3d5ddc56dd5ce9308 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Mon, 16 May 2016 06:23:30 +0200 Subject: [PATCH 2/4] README: remove reference to toolkit_upgrade License: MIT Signed-off-by: Christian Couder --- README.md | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 931d1f7ac..5ae229b76 100644 --- a/README.md +++ b/README.md @@ -72,8 +72,7 @@ export PATH=$PATH:$GOPATH/bin go-ipfs differs from the vanilla `go get` flow: it uses [gx](https://github.com/whyrusleeping/gx)/[gx-go](https://github.com/whyrusleeping/gx-go) -for dependency management. This means you'll need to perform download and -install steps separately. +for dependency management. First download `go-ipfs` without installing: @@ -83,13 +82,7 @@ $ go get -d github.com/ipfs/go-ipfs $ cd $GOPATH/src/github.com/ipfs/go-ipfs ``` -If you don't already have them on your system, install `gx` and `gx-go`: - -```sh -$ make toolkit_upgrade -``` - -Finally, install `go-ipfs`: +Then install `go-ipfs` and its dependencies, including `gx` and `gx-go`: ``` $ make install From b0b4a57357fb847718c628d9bb5001f73eeecd40 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Mon, 16 May 2016 06:24:40 +0200 Subject: [PATCH 3/4] appveyor: remove 'make toolkit_upgrade' License: MIT Signed-off-by: Christian Couder --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 66bea3e8d..696102ffc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -40,7 +40,7 @@ install: # default file handles. Ensure a dummy file descriptor is opened with 'exec'. # build_script: - - '%BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0 Date: Mon, 16 May 2016 06:37:45 +0200 Subject: [PATCH 4/4] README: points to Windows doc License: MIT Signed-off-by: Christian Couder --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 5ae229b76..224bff40d 100644 --- a/README.md +++ b/README.md @@ -90,6 +90,7 @@ $ make install #### Troubleshooting +* Separate [instructions are available for building on Windows](docs/windows.md). * `git` is required in order for `go get` to fetch all dependencies. * Package managers often contain out-of-date `golang` packages. Ensure that `go version` reports at least 1.5.2. See above for how to install go.