From b84af7a54fd2863df4d509028fbe705aad7c5c69 Mon Sep 17 00:00:00 2001 From: borispovod Date: Thu, 15 Oct 2020 17:16:07 +0300 Subject: [PATCH 1/2] fix ledger dncli builds --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 71d72928..a8c5284c 100644 --- a/Makefile +++ b/Makefile @@ -83,8 +83,8 @@ swagger-ui-build: ## binaries builds (xgo required: https://github.com/karalabe/xgo) binaries: go.sum mkdir -p ./builds - GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 GO111MODULE=on go build --ldflags "$(tags)" -tags "$(build_tags)" -o ./builds/dncli-${git_tag}-darwin-amd64 ${dncli} - #GOOS=linux GOARCH=386 CGO_ENABLED=0 GO111MODULE=on go build --ldflags "$(tags)" -tags "$(build_tags)" -o ./builds/dncli-${git_tag}-linux-386 ${dncli} - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 GO111MODULE=on go build --ldflags "$(tags)" -tags "$(build_tags)" -o ./builds/dncli-${git_tag}-linux-amd64 ${dncli} - GOOS=windows GOARCH=amd64 CGO_ENABLED=0 GO111MODULE=on go build --ldflags "$(tags)" -tags "$(build_tags)" -o ./builds/dncli-${git_tag}-windows-amd64.exe ${dncli} - #GOOS=windows GOARCH=386 CGO_ENABLED=0 GO111MODULE=on go build --ldflags "$(tags)" -tags "$(build_tags)" -o ./builds/dncli-${git_tag}-windows-386.exe ${dncli} + GOOS=darwin GOARCH=amd64 GO111MODULE=on go build --ldflags "$(tags)" -tags "$(build_tags)" -o ./builds/dncli-${git_tag}-darwin-amd64 ${dncli} + #GOOS=linux GOARCH=386 GO111MODULE=on go build --ldflags "$(tags)" -tags "$(build_tags)" -o ./builds/dncli-${git_tag}-linux-386 ${dncli} + GOOS=linux GOARCH=amd64 GO111MODULE=on go build --ldflags "$(tags)" -tags "$(build_tags)" -o ./builds/dncli-${git_tag}-linux-amd64 ${dncli} + GOOS=windows GOARCH=amd64 GO111MODULE=on go build --ldflags "$(tags)" -tags "$(build_tags)" -o ./builds/dncli-${git_tag}-windows-amd64.exe ${dncli} + #GOOS=windows GOARCH=386 GO111MODULE=on go build --ldflags "$(tags)" -tags "$(build_tags)" -o ./builds/dncli-${git_tag}-windows-386.exe ${dncli} From 780babb9509f2d3da429dd4c7550f1723961cd8d Mon Sep 17 00:00:00 2001 From: Mikhail Kornilov Date: Fri, 23 Oct 2020 15:59:04 +0300 Subject: [PATCH 2/2] [DFI-924] Ledger cross-OS build using XGO --- Makefile | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index e784e9e2..f89d9573 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ include Makefile.ledger -git_tag=$(shell git describe --tags $(git rev-list --tags --max-count=1)) +git_tag=$(shell git describe --tags --abbrev=0) git_commit=$(shell git rev-list -1 HEAD) tags = -X github.com/cosmos/cosmos-sdk/version.Name=dfinance \ -X github.com/cosmos/cosmos-sdk/version.ServerName=dnode \ @@ -82,9 +82,15 @@ swagger-ui-build: ## binaries builds (xgo required: https://github.com/karalabe/xgo) binaries: go.sum + @echo ${git_tag} + @echo "Prepare XGO dependencies" mkdir -p ./builds - GOOS=darwin GOARCH=amd64 GO111MODULE=on go build --ldflags "$(tags)" -tags "$(build_tags)" -o ./builds/dncli-${git_tag}-darwin-amd64 ${dncli} - #GOOS=linux GOARCH=386 GO111MODULE=on go build --ldflags "$(tags)" -tags "$(build_tags)" -o ./builds/dncli-${git_tag}-linux-386 ${dncli} - GOOS=linux GOARCH=amd64 GO111MODULE=on go build --ldflags "$(tags)" -tags "$(build_tags)" -o ./builds/dncli-${git_tag}-linux-amd64 ${dncli} - GOOS=windows GOARCH=amd64 GO111MODULE=on go build --ldflags "$(tags)" -tags "$(build_tags)" -o ./builds/dncli-${git_tag}-windows-amd64.exe ${dncli} - #GOOS=windows GOARCH=386 GO111MODULE=on go build --ldflags "$(tags)" -tags "$(build_tags)" -o ./builds/dncli-${git_tag}-windows-386.exe ${dncli} + go get github.com/crazy-max/xgo + + @echo "Build targets (Go 1.14): windows/amd64, linux/amd64, darwin/amd64" + xgo -go 1.14.x --ldflags='$(tags)' --tags='ledger' --out='./builds/dncli-${git_tag}' -targets='windows/amd64,linux/amd64,darwin/amd64' ${dncli} + + ## Legacy builds (as a reference) + #GOOS=darwin GOARCH=amd64 GO111MODULE=on go build --ldflags "$(tags)" -tags "$(build_tags)" -o ./builds/dncli-${git_tag}-darwin-amd64 ${dncli} + #GOOS=linux GOARCH=amd64 GO111MODULE=on go build --ldflags "$(tags)" -tags "$(build_tags)" -o ./builds/dncli-${git_tag}-linux-amd64 ${dncli} + #GOOS=windows GOARCH=amd64 GO111MODULE=on go build --ldflags "$(tags)" -tags "$(build_tags)" -o ./builds/dncli-${git_tag}-windows-amd64.exe ${dncli}