From 0eb5ce6b4154b8dea14ce39ba4374e3f4280e695 Mon Sep 17 00:00:00 2001 From: Wade Simmons Date: Sat, 21 Dec 2019 09:31:48 -0500 Subject: [PATCH] better windows targets in Makefile (#125) This restores `make bin-windows` and also adds `make build/nebula-windows-amd64.zip` to build the zip file. Co-authored-by: Ryan Huber --- Makefile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Makefile b/Makefile index ab83011..b71ff92 100644 --- a/Makefile +++ b/Makefile @@ -25,6 +25,12 @@ release: $(ALL:%=build/nebula-%.tar.gz) release-linux: $(ALL_LINUX:%=build/nebula-%.tar.gz) +bin-windows: build/windows-amd64/nebula.exe build/windows-amd64/nebula-cert.exe + mv $? . + +bin-darwin: build/darwin-amd64/nebula build/darwin-amd64/nebula-cert + mv $? . + bin: go build -trimpath -ldflags "-X main.Build=$(BUILD_NUMBER)" -o ./nebula ${NEBULA_CMD_PATH} go build -trimpath -ldflags "-X main.Build=$(BUILD_NUMBER)" -o ./nebula-cert ./cmd/nebula-cert @@ -45,9 +51,18 @@ build/%/nebula-cert: .FORCE GOARM=$(word 3, $(subst -, ,$*)) \ go build -trimpath -o $@ -ldflags "-X main.Build=$(BUILD_NUMBER)" ./cmd/nebula-cert +build/%/nebula.exe: build/%/nebula + mv $< $@ + +build/%/nebula-cert.exe: build/%/nebula-cert + mv $< $@ + build/nebula-%.tar.gz: build/%/nebula build/%/nebula-cert tar -zcv -C build/$* -f $@ nebula nebula-cert +build/nebula-%.zip: build/%/nebula.exe build/%/nebula-cert.exe + cd build/$* && zip ../nebula-$*.zip nebula.exe nebula-cert.exe + vet: go vet -v ./...