build-sys: update build sys to darvaza.org/x's latest
Signed-off-by: Alejandro Mery <amery@jpi.io>
This commit is contained in:
@@ -6,20 +6,20 @@ GOFMT ?= gofmt
|
||||
GOFMT_FLAGS = -w -l -s
|
||||
GOGENERATE_FLAGS = -v
|
||||
|
||||
GOPATH ?= $(shell $(GO) env GOPATH)
|
||||
GOBIN ?= $(GOPATH)/bin
|
||||
|
||||
TOOLSDIR := $(CURDIR)/pkg/tools
|
||||
TMPDIR ?= .tmp
|
||||
TMPDIR ?= $(CURDIR)/.tmp
|
||||
OUTDIR ?= $(TMPDIR)
|
||||
|
||||
GOLANGCI_LINT_VERSION ?= v1.59.1
|
||||
REVIVE_VERSION ?= v1.3.7
|
||||
|
||||
GOLANGCI_LINT_URL ?= github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION)
|
||||
GOLANGCI_LINT ?= $(GO) run $(GOLANGCI_LINT_URL)
|
||||
|
||||
REVIVE ?= $(GOBIN)/revive
|
||||
REVIVE_CONF ?= $(TOOLSDIR)/revive.toml
|
||||
REVIVE_RUN_ARGS ?= -config $(REVIVE_CONF) -formatter friendly
|
||||
REVIVE_VERSION ?= v1.3.7
|
||||
REVIVE_INSTALL_URL ?= github.com/mgechev/revive@$(REVIVE_VERSION)
|
||||
|
||||
GO_INSTALL_URLS = \
|
||||
$(REVIVE_INSTALL_URL) \
|
||||
REVIVE_URL ?= github.com/mgechev/revive@$(REVIVE_VERSION)
|
||||
REVIVE ?= $(GO) run $(REVIVE_URL)
|
||||
|
||||
V = 0
|
||||
Q = $(if $(filter 1,$V),,@)
|
||||
@@ -30,12 +30,13 @@ GO_BUILD_CMD = $(GO_BUILD) -o "$(OUTDIR)"
|
||||
|
||||
all: get generate tidy build
|
||||
|
||||
install:
|
||||
$Q $(GO) install -v ./cmd/...
|
||||
|
||||
clean: ; $(info $(M) cleaning…)
|
||||
rm -rf $(TMPDIR)
|
||||
|
||||
install: ; $(info $(M) cleaning…)
|
||||
$Q $(GO) install -v ./cmd/...
|
||||
|
||||
|
||||
$(TMPDIR)/index: $(TOOLSDIR)/gen_index.sh Makefile FORCE ; $(info $(M) generating index…)
|
||||
$Q mkdir -p $(@D)
|
||||
$Q $< > $@~
|
||||
@@ -55,6 +56,3 @@ tidy: fmt
|
||||
|
||||
generate: ; $(info $(M) running go:generate…)
|
||||
$Q git grep -l '^//go:generate' | sort -uV | xargs -r -n1 $(GO) generate $(GOGENERATE_FLAGS)
|
||||
|
||||
$(REVIVE):
|
||||
$Q $(GO) install -v $(REVIVE_INSTALL_URL)
|
||||
|
||||
@@ -1,19 +1,25 @@
|
||||
module git.jpi.io/amery/jpictl
|
||||
|
||||
go 1.19
|
||||
go 1.21
|
||||
|
||||
require (
|
||||
asciigoat.org/core v0.3.9 // indirect
|
||||
asciigoat.org/ini v0.2.5
|
||||
darvaza.org/cache/x/simplelru v0.1.8 // indirect
|
||||
darvaza.org/core v0.14.2
|
||||
darvaza.org/resolver v0.9.2
|
||||
darvaza.org/sidecar v0.4.0
|
||||
darvaza.org/slog v0.5.7
|
||||
darvaza.org/slog/handlers/discard v0.4.11
|
||||
darvaza.org/slog/handlers/filter v0.4.9 // indirect
|
||||
darvaza.org/slog/handlers/zerolog v0.4.9 // indirect
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/gofrs/uuid/v5 v5.2.0
|
||||
github.com/hack-pad/hackpadfs v0.2.1
|
||||
github.com/libdns/cloudflare v0.1.1
|
||||
github.com/libdns/libdns v0.2.2
|
||||
github.com/mgechev/revive v1.3.7
|
||||
github.com/spf13/cobra v1.8.0
|
||||
golang.org/x/crypto v0.25.0
|
||||
golang.org/x/net v0.27.0
|
||||
@@ -21,28 +27,13 @@ require (
|
||||
)
|
||||
|
||||
require (
|
||||
asciigoat.org/core v0.3.9 // indirect
|
||||
darvaza.org/cache/x/simplelru v0.1.8 // indirect
|
||||
darvaza.org/slog/handlers/filter v0.4.9 // indirect
|
||||
darvaza.org/slog/handlers/zerolog v0.4.9 // indirect
|
||||
github.com/BurntSushi/toml v1.4.0 // indirect
|
||||
github.com/chavacava/garif v0.1.0 // indirect
|
||||
github.com/fatih/color v1.17.0 // indirect
|
||||
github.com/fatih/structtag v1.2.0 // indirect
|
||||
github.com/inconshreveable/mousetrap v1.1.0 // indirect
|
||||
github.com/kr/pretty v0.3.1 // indirect
|
||||
github.com/mattn/go-colorable v0.1.13 // indirect
|
||||
github.com/mattn/go-isatty v0.0.20 // indirect
|
||||
github.com/mattn/go-runewidth v0.0.15 // indirect
|
||||
github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517 // indirect
|
||||
github.com/miekg/dns v1.1.59 // indirect
|
||||
github.com/mitchellh/go-homedir v1.1.0 // indirect
|
||||
github.com/olekukonko/tablewriter v0.0.5 // indirect
|
||||
github.com/pkg/errors v0.9.1 // indirect
|
||||
github.com/rivo/uniseg v0.4.7 // indirect
|
||||
github.com/rogpeppe/go-internal v1.11.0 // indirect
|
||||
github.com/rs/zerolog v1.33.0 // indirect
|
||||
github.com/spf13/afero v1.11.0 // indirect
|
||||
github.com/spf13/pflag v1.0.5 // indirect
|
||||
golang.org/x/mod v0.17.0 // indirect
|
||||
golang.org/x/sync v0.7.0 // indirect
|
||||
|
||||
@@ -18,20 +18,9 @@ darvaza.org/slog/handlers/filter v0.4.9 h1:xD8OBwlJytpiwTSDDZqUuNSOsJuaManXQiOj9
|
||||
darvaza.org/slog/handlers/filter v0.4.9/go.mod h1:t+sjcf1c46kAdf1TRiQmop91xlkteZrC4WDXoVwHgP8=
|
||||
darvaza.org/slog/handlers/zerolog v0.4.9 h1:08FjRnwRGtJsLLBnbgxVorb/bkgm5QEM/LXD2cxeCbM=
|
||||
darvaza.org/slog/handlers/zerolog v0.4.9/go.mod h1:PZYfx6eOxQfD+cXJQp52iwKgcD30QVYHoXxOCojAOdw=
|
||||
github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
|
||||
github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
|
||||
github.com/chavacava/garif v0.1.0 h1:2JHa3hbYf5D9dsgseMKAmc/MZ109otzgNFk5s87H9Pc=
|
||||
github.com/chavacava/garif v0.1.0/go.mod h1:XMyYCkEL58DF0oyW4qDjjnPWONs2HBqYKI+UIPD+Gww=
|
||||
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
|
||||
github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
|
||||
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
|
||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4=
|
||||
github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI=
|
||||
github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4=
|
||||
github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
|
||||
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
|
||||
github.com/gofrs/uuid/v5 v5.2.0 h1:qw1GMx6/y8vhVsx626ImfKMuS5CvJmhIKKtuyvfajMM=
|
||||
github.com/gofrs/uuid/v5 v5.2.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
|
||||
@@ -53,27 +42,10 @@ github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/
|
||||
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
||||
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
|
||||
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
||||
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
|
||||
github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
|
||||
github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
|
||||
github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517 h1:zpIH83+oKzcpryru8ceC6BxnoG8TBrhgAvRg8obzup0=
|
||||
github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517/go.mod h1:KQ7+USdGKfpPjXk4Ga+5XxQM4Lm4e3gAogrreFAYpOg=
|
||||
github.com/mgechev/revive v1.3.7 h1:502QY0vQGe9KtYJ9FpxMz9rL+Fc/P13CI5POL4uHCcE=
|
||||
github.com/mgechev/revive v1.3.7/go.mod h1:RJ16jUbF0OWC3co/+XTxmFNgEpUPwnnA0BRllX2aDNA=
|
||||
github.com/miekg/dns v1.1.59 h1:C9EXc/UToRwKLhK5wKU/I4QVsBUc8kE6MkHBkeypWZs=
|
||||
github.com/miekg/dns v1.1.59/go.mod h1:nZpewl5p6IvctfgrckopVx2OlSEHPRO/U4SYkRklrEk=
|
||||
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
|
||||
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
|
||||
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
|
||||
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
|
||||
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
|
||||
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
||||
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
|
||||
github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
|
||||
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
|
||||
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
|
||||
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
|
||||
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
|
||||
@@ -81,19 +53,10 @@ github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
|
||||
github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
|
||||
github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
|
||||
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
|
||||
github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8=
|
||||
github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY=
|
||||
github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
|
||||
github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho=
|
||||
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
|
||||
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
|
||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
|
||||
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
|
||||
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
|
||||
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
|
||||
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
|
||||
golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
|
||||
golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
|
||||
golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
|
||||
@@ -113,6 +76,6 @@ golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJ
|
||||
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
|
||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
|
||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
|
||||
@@ -5,8 +5,7 @@ set -eu
|
||||
: ${GO:=go}
|
||||
|
||||
MODULES=$(find * -name go.mod -exec dirname '{}' \;)
|
||||
GROUPS="pkg cmd"
|
||||
BASE="$PWD"
|
||||
GROUPS=""
|
||||
|
||||
mod() {
|
||||
local d="${1:-.}"
|
||||
|
||||
+102
-40
@@ -7,6 +7,12 @@ INDEX="$1"
|
||||
PROJECTS="$(cut -d':' -f1 "$INDEX")"
|
||||
COMMANDS="tidy get build test up"
|
||||
|
||||
TAB=$(printf "\t")
|
||||
|
||||
escape_dir() {
|
||||
echo "$1" | sed -e 's|/|\\/|g' -e 's|\.|\\.|g'
|
||||
}
|
||||
|
||||
expand() {
|
||||
local prefix="$1" suffix="$2"
|
||||
local x= out=
|
||||
@@ -41,12 +47,6 @@ packed_oneline() {
|
||||
packed | tr '\n' ';' | sed -e 's|;$||' -e 's|then;|then |g' -e 's|;[ \t]*|; |g'
|
||||
}
|
||||
|
||||
gen_install_tools() {
|
||||
cat <<EOT
|
||||
for url in \$(GO_INSTALL_URLS); do \$(GO) install -v \$\$url; done
|
||||
EOT
|
||||
}
|
||||
|
||||
gen_revive_exclude() {
|
||||
local self="$1"
|
||||
local dirs= d=
|
||||
@@ -61,36 +61,71 @@ gen_revive_exclude() {
|
||||
done
|
||||
}
|
||||
|
||||
for cmd in $COMMANDS; do
|
||||
all="$(prefixed $cmd $PROJECTS)"
|
||||
depsx=
|
||||
gen_var_name() {
|
||||
local x=
|
||||
for x; do
|
||||
echo "$x" | tr 'a-z-' 'A-Z_'
|
||||
done
|
||||
}
|
||||
|
||||
# generate files lists
|
||||
#
|
||||
gen_files_lists() {
|
||||
local name= dir= mod= deps=
|
||||
local files= files_cmd=
|
||||
local filter= out_pat=
|
||||
|
||||
cat <<EOT
|
||||
.PHONY: $cmd $all
|
||||
$cmd: $all
|
||||
GO_FILES = \$(shell find * \\
|
||||
-type d -name node_modules -prune -o \\
|
||||
-type f -name '*.go' -print )
|
||||
|
||||
EOT
|
||||
|
||||
while IFS=: read name dir mod deps; do
|
||||
files=GO_FILES_$(gen_var_name "$name")
|
||||
filter="-e '/^\.$/d;'"
|
||||
[ "x$dir" = "x." ] || filter="$filter -e '/^$(escape_dir "$dir")$/d;'"
|
||||
out_pat="$(cut -d: -f2 "$INDEX" | eval "sed $filter -e 's|$|/%|'" | tr '\n' ' ' | sed -e 's| \+$||')"
|
||||
|
||||
if [ "x$dir" = "x." ]; then
|
||||
# root
|
||||
files_cmd="\$(GO_FILES)"
|
||||
files_cmd="\$(filter-out $out_pat, $files_cmd)"
|
||||
else
|
||||
files_cmd="\$(filter $dir/%, \$(GO_FILES))"
|
||||
files_cmd="\$(filter-out $out_pat, $files_cmd)"
|
||||
files_cmd="\$(patsubst $dir/%,%,$files_cmd)"
|
||||
fi
|
||||
|
||||
cat <<-EOT
|
||||
$files$TAB=$TAB$files_cmd
|
||||
EOT
|
||||
done < "$INDEX" | column -t -s "$TAB" -o " "
|
||||
}
|
||||
|
||||
gen_make_targets() {
|
||||
local cmd="$1" name="$2" dir="$3" mod="$4" deps="$5"
|
||||
local call= callu= callx=
|
||||
local depsx= cmdx=
|
||||
local sequential=
|
||||
|
||||
# default calls
|
||||
case "$cmd" in
|
||||
tidy)
|
||||
call="$(cat <<-EOT | packed
|
||||
\$(GO) mod tidy
|
||||
# unconditional
|
||||
callu="\$(GO) mod tidy"
|
||||
|
||||
# go vet and revive only if there are .go files
|
||||
#
|
||||
$(cat <<-EOL | packed_oneline
|
||||
set -e
|
||||
FILES="\$\$(\$(GO) list -f '{{len .GoFiles}}' ./...)"
|
||||
if [ -n "\$\$FILES" ]; then
|
||||
\$(GO) vet ./...
|
||||
\$(REVIVE) \$(REVIVE_RUN_ARGS) ./...
|
||||
fi
|
||||
EOL
|
||||
)
|
||||
call="$(cat <<-EOT | packed
|
||||
\$(GO) vet ./...
|
||||
\$(GOLANGCI_LINT) run
|
||||
\$(REVIVE) \$(REVIVE_RUN_ARGS) ./...
|
||||
EOT
|
||||
)"
|
||||
depsx="fmt \$(REVIVE)"
|
||||
|
||||
depsx="fmt"
|
||||
;;
|
||||
up)
|
||||
call="\$(GO) get -u -v ./...
|
||||
@@ -111,10 +146,6 @@ EOT
|
||||
sequential=false ;;
|
||||
esac
|
||||
|
||||
while IFS=: read name dir mod deps; do
|
||||
|
||||
deps=$(echo "$deps" | tr ',' ' ')
|
||||
|
||||
# cd $dir
|
||||
if [ "." = "$dir" ]; then
|
||||
# root
|
||||
@@ -123,7 +154,6 @@ EOT
|
||||
cd="cd '$dir'; "
|
||||
fi
|
||||
|
||||
callx="$call"
|
||||
if [ "$name" = root ]; then
|
||||
# special case
|
||||
case "$cmd" in
|
||||
@@ -140,17 +170,20 @@ EOT
|
||||
|
||||
[ -z "$cmdx" ] || cmdx="\$(GO) $cmdx -v ./..."
|
||||
|
||||
if [ "up" = "$cmd" ]; then
|
||||
case "$cmd" in
|
||||
up)
|
||||
callx="$cmdx
|
||||
\$(GO) mod tidy
|
||||
$(gen_install_tools)"
|
||||
elif [ "get" = "$cmd" ]; then
|
||||
callx="$cmdx
|
||||
$(gen_install_tools)"
|
||||
elif [ -n "$cmdx" ]; then
|
||||
classx="$cmdx"
|
||||
fi
|
||||
|
||||
\$(GO) mod tidy"
|
||||
;;
|
||||
get)
|
||||
callx="$cmdx"
|
||||
;;
|
||||
*)
|
||||
callx="$call"
|
||||
;;
|
||||
esac
|
||||
else
|
||||
callx="$call"
|
||||
fi
|
||||
|
||||
if [ "build" = "$cmd" ]; then
|
||||
@@ -181,16 +214,45 @@ $(gen_install_tools)"
|
||||
deps=
|
||||
fi
|
||||
|
||||
files=GO_FILES_$(gen_var_name "$name")
|
||||
cat <<EOT
|
||||
$cmd-$name:${deps:+ $(prefixed $cmd $deps)}${depsx:+ | $depsx} ; \$(info \$(M) $cmd: $name)
|
||||
$(echo "$callx" | sed -e "/^$/d;" -e "s|^|\t\$(Q) $cd|")
|
||||
|
||||
$cmd-$name:${deps:+ $(prefixed $cmd $deps)}${depsx:+ | $depsx} ; \$(info \$(M) $cmd: $name)
|
||||
EOT
|
||||
if [ -n "$callu" ]; then
|
||||
# unconditionally
|
||||
echo "$callu" | sed -e "/^$/d;" -e "s|^|\t\$(Q) $cd|"
|
||||
fi
|
||||
if [ -n "$callx" ]; then
|
||||
# only if there are files
|
||||
echo "ifneq (\$($files),)"
|
||||
echo "$callx" | sed -e "/^$/d;" -e "s|^|\t\$(Q) $cd|"
|
||||
echo "endif"
|
||||
fi
|
||||
}
|
||||
|
||||
gen_files_lists
|
||||
|
||||
for cmd in $COMMANDS; do
|
||||
all="$(prefixed $cmd $PROJECTS)"
|
||||
depsx=
|
||||
|
||||
cat <<EOT
|
||||
|
||||
.PHONY: $cmd $all
|
||||
$cmd: $all
|
||||
EOT
|
||||
|
||||
while IFS=: read name dir mod deps; do
|
||||
deps=$(echo "$deps" | tr ',' ' ')
|
||||
|
||||
gen_make_targets "$cmd" "$name" "$dir" "$mod" "$deps"
|
||||
done < "$INDEX"
|
||||
done
|
||||
|
||||
for x in $PROJECTS; do
|
||||
cat <<EOT
|
||||
|
||||
$x: $(suffixed $x get build tidy)
|
||||
EOT
|
||||
done
|
||||
|
||||
@@ -17,7 +17,7 @@ enableAllRules = true
|
||||
[rule.cyclomatic]
|
||||
arguments = [10]
|
||||
[rule.line-length-limit]
|
||||
arguments = [100]
|
||||
arguments = [120]
|
||||
severity = "warning"
|
||||
[rule.comment-spacings]
|
||||
severity = "warning"
|
||||
|
||||
+1
-5
@@ -1,7 +1,3 @@
|
||||
//go:build tools
|
||||
|
||||
package tools
|
||||
|
||||
import (
|
||||
_ "github.com/mgechev/revive"
|
||||
)
|
||||
package build
|
||||
|
||||
Reference in New Issue
Block a user