build-sys: import latest Makefile/gen_mk.sh from dardaza.org/x

Signed-off-by: Alejandro Mery <[email protected]>

.golangci.yml

@@ -0,0 +1,62 @@
+run:
+ deadline: 5m
+ allow-parallel-runners: true
+
+linters-settings:
+ govet:
+ enable=fieldalignment: true
+ revive:
+ rules:
+ # The following rules are recommended https://github.com/mgechev/revive#recommended-configuration
+ - name: blank-imports
+ - name: context-as-argument
+ - name: context-keys-type
+ - name: dot-imports
+ - name: error-return
+ - name: error-strings
+ - name: error-naming
+ - name: exported
+ - name: increment-decrement
+ - name: var-naming
+ - name: var-declaration
+ - name: package-comments
+ - name: range
+ - name: receiver-naming
+ - name: time-naming
+ - name: unexported-return
+ - name: indent-error-flow
+ - name: errorf
+ - name: empty-block
+ - name: superfluous-else
+ - name: unused-parameter
+ - name: unreachable-code
+ - name: redefines-builtin-id
+ #
+ # Rules in addition to the recommended configuration above.
+ #
+ - name: bool-literal-in-expr
+ - name: constant-logical-expr
+
+linters:
+ disable-all: true
+ enable:
+ - dupl
+ - errcheck
+ - exportloopref
+ - goconst
+ - gocyclo
+ - gofmt
+ - goimports
+ - gosimple
+ - govet
+ - ineffassign
+ - lll
+ - misspell
+ - nakedret
+ - prealloc
+ - revive
+ - staticcheck
+ - typecheck
+ - unconvert
+ - unparam
+ - unused

Makefile

@@ -11,24 +11,30 @@ GOBIN ?= $(GOPATH)/bin
 
 TOOLSDIR := $(CURDIR)/internal/build
 TMPDIR ?= .tmp
-OUTDIR ?= $(TMPDIR)
+
+GOLANGCI_LINT_VERSION ?= v1.55
+REVIVE_VERSION ?= v1.3.6
+
+GOLANGCI_LINT ?= $(GOBIN)/golangci-lint
+GOLANGCI_LINT_URL ?= github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION)
 
 REVIVE ?= $(GOBIN)/revive
 REVIVE_CONF ?= $(TOOLSDIR)/revive.toml
 REVIVE_RUN_ARGS ?= -config $(REVIVE_CONF) -formatter friendly
-REVIVE_INSTALL_URL ?= github.com/mgechev/revive
+REVIVE_INSTALL_URL ?= github.com/mgechev/revive@$(REVIVE_VERSION)
 
 GO_INSTALL_URLS = \
+ $(GOLANGCI_LINT_URL) \
  $(REVIVE_INSTALL_URL) \
 
 V = 0
 Q = $(if $(filter 1,$V),,@)
 M = $(shell if [ "$$(tput colors 2> /dev/null || echo 0)" -ge 8 ]; then printf "\033[34;1m▶\033[0m"; else printf "▶"; fi)
 
-all: get generate tidy build
-
 GO_BUILD = $(GO) build -v
-GO_BUILD_CMD = $(GO_BUILD) -o "$(OUTDIR)"
+GO_BUILD_CMD= $(GO_BUILD) -o "$(OUTDIR)"
+
+all: get generate tidy build
 
 clean: ; $(info $(M) cleaning…)
  rm -rf $(TMPDIR)

go.mod

@@ -7,25 +7,8 @@ require (
  darvaza.org/slog v0.5.6
 )
 
-require github.com/mgechev/revive v1.3.6
-
 require (
- github.com/BurntSushi/toml v1.3.2 // indirect
- github.com/chavacava/garif v0.1.0 // indirect
- github.com/fatih/color v1.16.0 // indirect
- github.com/fatih/structtag v1.2.0 // 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/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.4 // indirect
- github.com/spf13/afero v1.11.0 // indirect
  golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 // indirect
  golang.org/x/net v0.20.0 // indirect
- golang.org/x/sys v0.16.0 // indirect
  golang.org/x/text v0.14.0 // indirect
- golang.org/x/tools v0.17.0 // indirect
 )

go.sum

@@ -2,62 +2,9 @@ darvaza.org/core v0.11.3 h1:fS8FHic5YIFHcPkc0JScv56/dHEg4iMQZCQBnG/jH5A=
 darvaza.org/core v0.11.3/go.mod h1:FO8+vzGWkDfpAePsmx9w8BSiJPGob17dWSsae/QNeIw=
 darvaza.org/slog v0.5.6 h1:VZR+l8ZX507nwzyM108Qj4OxX82qGThyoaa4ffElkNw=
 darvaza.org/slog v0.5.6/go.mod h1:dUTP+hZ1vMwQ0vsUGPSTpvf7BmJsjkQxMTjwPslXeCE=
-github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
-github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
-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/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.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
-github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
-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/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-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.6 h1:ZNKZiHb/LciAqzwa/9HnwI8S/OJutYhMvaqgMT1Ylgo=
-github.com/mgechev/revive v1.3.6/go.mod h1:75Je+5jKBgdgADNzGhsq7H5J6CmyXSzEk9eLOU4i8Pg=
-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/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.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
-github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
-github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8=
-github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY=
-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/exp v0.0.0-20240112132812-db7319d0e0e3 h1:hNQpMuAJe5CtcUqCXaWga3FHu+kQvCqcsoVaQgSV60o=
 golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08=
 golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
 golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
-golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
-golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/build/gen_mk.sh

@@ -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=
@@ -61,35 +67,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 \\
+ -path internal/build -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 ./...
+ \$(REVIVE) \$(REVIVE_RUN_ARGS) ./...
+ \$(GOLANGCI_LINT) run
  EOT
  )"
+
  depsx="fmt \$(REVIVE)"
  ;;
  up)
@@ -111,10 +153,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 +161,6 @@ EOT
  cd="cd '$dir'; "
  fi
 
- callx="$call"
  if [ "$name" = root ]; then
  # special case
  case "$cmd" in
@@ -140,17 +177,24 @@ EOT
 
  [ -z "$cmdx" ] || cmdx="\$(GO) $cmdx -v ./..."
 
- if [ "up" = "$cmd" ]; then
- callx="$cmdx
+ case "$cmd" in
+ up)
+ # unconditional because of the tools
+ callu="$cmdx
 \$(GO) mod tidy
 $(gen_install_tools)"
- elif [ "get" = "$cmd" ]; then
- callx="$cmdx
+ ;;
+ get)
+ # unconditional because of the tools
+ callu="$cmdx
 $(gen_install_tools)"
- elif [ -n "$cmdx" ]; then
- classx="$cmdx"
- fi
-
+ ;;
+ *)
+ callx="$call"
+ ;;
+ esac
+ else
+ callx="$call"
  fi
 
  if [ "build" = "$cmd" ]; then
@@ -181,16 +225,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|")
+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

internal/build/tools.go

@@ -1,7 +1,3 @@
 //go:build tools
 
 package build
-
-import (
- _ "github.com/mgechev/revive"
-)