Makefile,Golang*mk: migrating to v0.2.0 build system

Author: kckrinke

Golang.cdk.mk

@@ -14,9 +14,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-GOLANG_MAKEFILE_KEYS += CDK
+MAKEFILE_KEYS += GOLANG_CDK
+GOLANG_CDK_MK_FILE := Golang.cdk.mk
+GOLANG_CDK_MK_VERSION := v0.2.0
+GOLANG_CDK_MK_DESCRIPTION := go-curses support
 
-GOLANG_CDK_MK_VERSION := v0.1.2
+CDK_GO_PACKAGE ?= github.com/go-curses/cdk
+CDK_LOCAL_PATH ?= ../cdk
+
+CTK_GO_PACKAGE ?= github.com/go-curses/ctk
+CTK_LOCAL_PATH ?= ../ctk
 
 CUSTOM_HELP_SECTIONS += CDK_HELP
 

Golang.def.mk

@@ -14,10 +14,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-GOLANG_MAKEFILE_KEYS += DEF
-GOLANG_DEF_MK_VERSION := v0.1.5
+MAKEFILE_KEYS += GOLANG_DEF
+GOLANG_DEF_MK_FILE := Golang.def.mk
+GOLANG_DEF_MK_VERSION := v0.2.0
+GOLANG_DEF_MK_DESCRIPTION := make target definitions
 
-.PHONY: all help
+.PHONY: help
 .PHONY: clean distclean realclean
 .PHONY: local unlocal deps tidy fmt be-update generate
 .PHONY: debug build build-all build-amd64 build-arm64
@@ -34,20 +36,20 @@ ifeq (${INCLUDE_DEFAULT_AUTOCOMPLETE_FILE},true)
 AUTOCOMPLETE_FILES += ${INSTALL_AUTOCOMPLETE_PATH}/${BIN_NAME}
 endif
 
-all: help
-
 help:
 	@echo "usage: make [target]"
 	@echo
 	@echo "golang qa targets:"
 	@echo "  test           - perform all available tests"
 	@echo "  coverage       - generate coverage reports"
+	@echo "  goconvey       - start goconvey http://${GOCONVEY_HOST}:${GOCONVEY_PORT}"
 	@echo "  reportcard     - run sanity checks"
 
 	@echo
 	@echo "cleanup targets:"
-	@echo "  clean       - cleans package and built files"
-	@echo "  distclean   - clean and removes extraneous files"
+	@echo "  clean       - removes CLEAN_FILES (${CLEAN_FILES})"
+	@echo "  distclean   - clean and DISTCLEAN_FILES (${DISTCLEAN_FILES})"
+	@echo "  realclean   - distclean REALCLEAN_FILES (${REALCLEAN_FILES})"
 
 	@echo
 	@echo "build targets:"
@@ -69,11 +71,10 @@ help:
 	@echo "  install       - installs ${BUILD_NAME} to ${DESTDIR}${prefix}/bin/${BIN_NAME}"
 	@echo "  install-arm64 - installs ${BIN_NAME}.${BUILD_OS}.arm64 to ${DESTDIR}${prefix}/bin/${BIN_NAME}"
 	@echo "  install-amd64 - installs ${BIN_NAME}.${BUILD_OS}.amd64 to ${DESTDIR}${prefix}/bin/${BIN_NAME}"
-
 ifneq (${AUTOCOMPLETE_FILES},)
-	@echo
-	@echo "extra install targets:"
-	@echo "  install-autocomplete - installs ${SRC_AUTOCOMPLETE_FILE} to ${AUTOCOMPLETE_FILES}"
+	@echo "  install-autocomplete"
+	@echo "                - installs ${SRC_AUTOCOMPLETE_FILE} to:"
+	@$(foreach dst,${AUTOCOMPLETE_FILES},echo "                    $(dst)";)
 endif
 
 ifdef help_custom_targets
@@ -99,13 +100,18 @@ $(foreach key,$($(section)_KEYS),; echo "  $($(section)_$(key)_TARGET)	- $($(sec
 	@echo "  be-update   - get latest GOPKG_KEYS dependencies"
 
 	@echo
-	@echo "Notes:"
-	@echo "  GOPKG_KEYS are go packages managed by this Makefile and the following"
-	@echo "  are the included packages:" \
-		$(if ${GOPKG_KEYS},$(foreach key,${GOPKG_KEYS},; echo "    $(key): $($(key)_GO_PACKAGE) ($($(key)_LOCAL_PATH))"))
-
-	@echo $(foreach key,${GOLANG_MAKEFILE_KEYS},$(shell \
-	echo ";echo \"Golang.$(shell perl -e 'print lc("$(key)");').mk: $(GOLANG_$(key)_MK_VERSION)\"" \
+	@echo "build system details:"
+	@echo
+	@printf "  %-15s %-40s %s\n" GOPKG_KEYS GO_PACKAGE LOCAL_PATH
+	@printf "  %-15s %-40s %s\n" ---------- ---------- ----------
+	@$(foreach key,${GOPKG_KEYS},$(shell \
+		echo "printf \"  %-15s %-40s %s\\n\" \"$(key)\" \"$($(key)_GO_PACKAGE)\" \"$($(key)_LOCAL_PATH)\";" \
+))
+	@echo
+	@printf "  %-20s %-10s %s\n" MAKEFILE VERSION DESCRIPTION
+	@printf "  %-20s %-10s %s\n" -------- ------- -----------
+	@$(foreach key,${MAKEFILE_KEYS},$(shell \
+		echo "printf \"  %-20s %-10s %-10s\\n\" \"$($(key)_MK_FILE)\" \"$($(key)_MK_VERSION)\" \"$($(key)_MK_DESCRIPTION)\";" \
 ))
 
 clean:

Golang.lib.mk

@@ -14,18 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-GOLANG_MAKEFILE_KEYS += LIB
-GOLANG_LIB_MK_VERSION := v0.1.4
-
-#
-#: Go-Curses Packages
-#
-
-CDK_GO_PACKAGE ?= github.com/go-curses/cdk
-CDK_LOCAL_PATH ?= ../cdk
-
-CTK_GO_PACKAGE ?= github.com/go-curses/ctk
-CTK_LOCAL_PATH ?= ../ctk
+MAKEFILE_KEYS += GOLANG_LIB
+GOLANG_LIB_MK_FILE := Golang.lib.mk
+GOLANG_LIB_MK_VERSION := v0.2.0
+GOLANG_LIB_MK_DESCRIPTION := go-corelibs support
 
 #
 #: Core Library Packages

Golang.cmd.mk renamed to Golang.mk

@@ -14,11 +14,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-GOLANG_MAKEFILE_KEYS += CMD
-GOLANG_CMD_MK_VERSION := v0.1.11
+MAKEFILE_KEYS += GOLANG
+GOLANG_MK_FILE := Golang.mk
+GOLANG_MK_VERSION := v0.2.0
+GOLANG_MK_DESCRIPTION := globals, functions and internal targets
 
-.PHONY: __golang __tidy __local __unlocal __be_update
-.PHONY: __vet __test __cover __generate
+.PHONY: __golang __deps __generate
+.PHONY: __vet __test __coverage
+.PHONY: __tidy __fmt __reportcard
+.PHONY: __local __unlocal __be_update
 
 PWD := $(shell pwd)
 SHELL := /bin/bash
@@ -66,6 +70,8 @@ endif
 _INTERNAL_BUILD_LOG_ ?= /dev/null
 
 -include Golang.lib.mk
+-include Golang.cdk.mk
+-include Golang.def.mk
 
 _BUILD_TAGS ?= $(call __build_tags)
 

Makefile

@@ -18,7 +18,6 @@
 #CMD=echo
 
 -include .env
-#export
 
 .PHONY: install-niseroku install-niseroku-logrotate
 .PHONY: install-niseroku-systemd install-niseroku-sysv-init
@@ -65,9 +64,9 @@ SRC_AUTOCOMPLETE_FILE := _templates/bash_autocomplete
 INCLUDE_DEFAULT_AUTOCOMPLETE_FILE := true
 AUTOCOMPLETE_FILES += ${INSTALL_AUTOCOMPLETE_PATH}/niseroku
 
-include Golang.def.mk
-include Golang.cmd.mk
-include Golang.cdk.mk
+all: help
+
+include Golang.mk
 
 define _profile_run
 	@if [ -f "${BIN_NAME}.${BUILD_OS}.${BUILD_ARCH}" ]; then \