Merge pull request #2701 from ipfs/fix-toolkit_upgrade-removal

Fix toolkit_upgrade Makefile target removal

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 ''

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
@@ -97,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.

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</dev/null; export PATH=$GOPATH/bin:$PATH; make toolkit_upgrade; make nofuse"'
+  - '%BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; export PATH=$GOPATH/bin:$PATH; make nofuse"'
   
 test_script:
   - '%BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; export PATH=$GOPATH/bin:$PATH; export GOFLAGS=''-tags nofuse''; export TEST_NO_FUSE=1; export TEST_VERBOSE=1; export TEST_SUITE=test_sharness_expensive; make $TEST_SUITE"'