Skip to content

Commit 9171e81

Browse files
committed
ビルドプラットフォームを拡充。
1 parent 144fcfa commit 9171e81

2 files changed

Lines changed: 20 additions & 23 deletions

File tree

Makefile

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
APP_NAME := devcontainer.vim
2-
GOARCH_AMD64 := amd64
3-
GOARCH_ARM64 := arm64
4-
WINDOWS_BINARY_NAME := ${APP_NAME}-windows-${GOARCH_AMD64}.exe
5-
LINUX_BINARY_NAME := ${APP_NAME}-linux-${GOARCH_AMD64}
6-
DARWIN_BINARY_NAME := ${APP_NAME}-darwin-${GOARCH_ARM64}
2+
3+
PLATFORMS := \
4+
darwin/amd64 \
5+
darwin/arm64 \
6+
linux/amd64 \
7+
linux/arm64 \
8+
windows/amd64 \
9+
windows/arm64
710

811
GO_BIN := ${GOPATH}/bin
912
VERSION := 3.7.0
@@ -48,19 +51,17 @@ build: build/devcontainer.vim
4851
build/devcontainer.vim: ${WATCH_SRC}
4952
go build -ldflags=${LD_FLAGS} -trimpath -o ./build/${APP_NAME}
5053

51-
build-all: build-windows build-linux build-darwin
52-
53-
build-windows: build/${WINDOWS_BINARY_NAME}
54-
build/${WINDOWS_BINARY_NAME}: ${WATCH_SRC}
55-
GOOS=windows GOARCH=${GOARCH_AMD64} go build -ldflags=${LD_FLAGS} -trimpath -o build/${WINDOWS_BINARY_NAME}
56-
57-
build-linux: build/${LINUX_BINARY_NAME}
58-
build/${LINUX_BINARY_NAME}: ${WATCH_SRC}
59-
GOOS=linux GOARCH=${GOARCH_AMD64} go build -ldflags=${LD_FLAGS} -trimpath -o build/${LINUX_BINARY_NAME}
54+
build-all:
55+
@mkdir -p $(DEST)
56+
@set -e; \
57+
for platform in $(PLATFORMS); do \
58+
GOOS=$${platform%/*}; GOARCH=$${platform#*/}; \
59+
ext=""; [ $$GOOS = "windows" ] && ext=".exe"; \
60+
out="$(DEST)/$(APP_NAME)-$${GOOS}-$${GOARCH}$$ext"; \
61+
echo "Building $$out"; \
62+
GOOS=$$GOOS GOARCH=$$GOARCH go build -ldflags "-s -w -X main.version=$(VERSION)" -o $$out $(PKG); \
63+
done
6064

61-
build-darwin: build/${DARWIN_BINARY_NAME}
62-
build/${DARWIN_BINARY_NAME}: ${WATCH_SRC}
63-
GOOS=darwin GOARCH=${GOARCH_ARM64} go build -ldflags=${LD_FLAGS} -trimpath -o build/${DARWIN_BINARY_NAME}
6465

6566
.PHONY: lint
6667
lint:

tools/tools.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -214,13 +214,9 @@ func SelfUpdate(services InstallerUseServices) error {
214214
}
215215

216216
// Construct the download URL for the latest release
217-
var downloadURL string
217+
downloadURL := fmt.Sprintf("https://github.com/mikoto2000/devcontainer.vim/releases/download/%s/devcontainer.vim-%s-%s", latestTagName, runtime.GOOS, runtime.GOARCH)
218218
if runtime.GOOS == "windows" {
219-
downloadURL = fmt.Sprintf("https://github.com/mikoto2000/devcontainer.vim/releases/download/%s/devcontainer.vim-windows-amd64.exe", latestTagName)
220-
} else if runtime.GOOS == "darwin" {
221-
downloadURL = fmt.Sprintf("https://github.com/mikoto2000/devcontainer.vim/releases/download/%s/devcontainer.vim-darwin-arm64", latestTagName)
222-
} else {
223-
downloadURL = fmt.Sprintf("https://github.com/mikoto2000/devcontainer.vim/releases/download/%s/devcontainer.vim-linux-amd64", latestTagName)
219+
downloadURL = downloadURL + ".exe"
224220
}
225221

226222
// Download the latest release

0 commit comments

Comments
 (0)