From c777ac05daea6f7c2f915c2d104b881d2c5b20e7 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 4 May 2016 07:04:40 +0200 Subject: [PATCH 1/2] Makefile: update gx and gx-go versions License: MIT Signed-off-by: Christian Couder --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 537aa1e06..21eba540a 100644 --- a/Makefile +++ b/Makefile @@ -27,8 +27,8 @@ path_check: @bin/check_go_path $(realpath $(shell pwd)) $(realpath $(GOPATH)/src/github.com/ipfs/go-ipfs) gx_check: - @bin/check_gx_program "gx" "0.3" 'Upgrade or install gx using your package manager or run `make gx_upgrade`' - @bin/check_gx_program "gx-go" "0.2" 'Upgrade or install gx-go using your package manager or run `make gxgo_upgrade`' + @bin/check_gx_program "gx" "0.6" 'Upgrade or install gx using your package manager or run `make gx_upgrade`' + @bin/check_gx_program "gx-go" "1.1" 'Upgrade or install gx-go using your package manager or run `make gxgo_upgrade`' deps: go_check gx_check path_check gx --verbose install --global From f24aa85c8eca2c290d186f18ad62572ff306aa47 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 4 May 2016 20:25:17 +0200 Subject: [PATCH 2/2] Makefile: add variables for min versions of go, gx and gx-go License: MIT Signed-off-by: Christian Couder --- Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 21eba540a..014eb74dd 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,7 @@ +# Minimum version numbers for software required to build IPFS +IPFS_MIN_GO_VERSION = 1.5.2 +IPFS_MIN_GX_VERSION = 0.6 +IPFS_MIN_GX_GO_VERSION = 1.1 ifeq ($(TEST_NO_FUSE),1) go_test=go test -tags nofuse @@ -15,7 +19,7 @@ godep: toolkit_upgrade: gx_upgrade gxgo_upgrade go_check: - @bin/check_go_version "1.5.2" + @bin/check_go_version $(IPFS_MIN_GO_VERSION) gx_upgrade: go get -u github.com/whyrusleeping/gx @@ -27,8 +31,8 @@ path_check: @bin/check_go_path $(realpath $(shell pwd)) $(realpath $(GOPATH)/src/github.com/ipfs/go-ipfs) gx_check: - @bin/check_gx_program "gx" "0.6" 'Upgrade or install gx using your package manager or run `make gx_upgrade`' - @bin/check_gx_program "gx-go" "1.1" 'Upgrade or install gx-go using your package manager or run `make gxgo_upgrade`' + @bin/check_gx_program "gx" $(IPFS_MIN_GX_VERSION) 'Upgrade or install gx using your package manager or run `make gx_upgrade`' + @bin/check_gx_program "gx-go" $(IPFS_MIN_GX_GO_VERSION) 'Upgrade or install gx-go using your package manager or run `make gxgo_upgrade`' deps: go_check gx_check path_check gx --verbose install --global