update makefiles

Author: hedzr

.env

@@ -1,41 +1,3 @@
-# GOPROXY_CUSTOM   := https://goproxy.cn
-# GOPROXY_CUSTOM?=https://gocenter.io
-# GOPROXY_CUSTOM?=https://athens.azurefd.net
-
-# tc01: 192.168.0.13
-# TC01_LAN?=192.168.0.13
-
-# Redirect error output to a file, so we can show it in development mode.
-# STDERR_CUSTOM?=/tmp/.$(PROJECTNAME)-stderr.txt
-
-# PID file will keep the process id of the server
-# PID_CUSTOM?=/tmp/.$(PROJECTNAME).pid
-
-# CGO_ENABLED = $(shell go env CGO_ENABLED)
-CGO_ENABLED ?= 0
-
-COVER_TEST_TARGETS ?= ./...
-
-# DOCKER_ORG_NAME ?= mut-cli
-DOCKER_ORG_NAME ?= hedzr
-DOCKER_APP_NAMES ?= is
-
-DEFAULT_DOC_NAME ?= ./examples/small/doc.go
-# DEFAULT_SUBAPP_DOC_NAME ?= cmd/doc.go
-BUILDER_COMMENT ?=
-MAIN_BUILD_PKG ?= .
-MAIN_APPS ?= ./examples
-SUB_APPS ?= small
-MAIN_ENTRY_FILE ?= .
-# Or: MAIN_ENTRY_FILE ?= main.go
-
-# --
-#
-#
-# MAIN_APPS = fluent demo ffdemo short wget-demo
-# MAIN_BUILD_PKG = ./examples
-# MAIN_ENTRY_FILE = .
-#
-# # MAIN_APPS = cli
-# # MAIN_BUILD_PKG = .
-# # MAIN_ENTRY_FILE = .
+NAME := myservice
+PACKAGE_NAME := github.com/hedzr/cmdr-addons
+ENTRY_PKG := ./examples/myservice

Makefile

@@ -7,47 +7,25 @@ $(V).SILENT:
 # SUB_APPS        ?= cmdr-cli loop
 # MAIN_ENTRY_FILE ?= .                 # Or: "main.go"
 
+# NAME           := blueprint
+# PACKAGE_NAME   := github.com/hedzr/cmdr/v2
+# ENTRY_PKG      := ./examples/blueprint
+
+# PLATFORM       ?= linux
+# ARCH           ?= amd64
+# BUILD_DIR      ?= bin
+# LOGS_DIR       ?= ./logs
+
 -include ./ci/mk/env.mk
 -include ./ci/mk/cc.mk
 -include ./ci/mk/git.mk
 
 -include .env
 -include .env.local
 
+-include ./ci/mk/vars.mk
 
-NAME           := myservice
-PACKAGE_NAME   := github.com/hedzr/cmdr-addons
-ENTRY_PKG      := ./examples/myservice
-
-PLATFORM       := linux
-ARCH           := amd64
-BUILD_DIR      := bin
-LOGS_DIR       := ./logs
-
-GO             := $(shell which go)
-GOOS           := $(shell go env GOOS)
-GOARCH         := $(shell go env GOARCH)
-GOPROXY        := $(shell go env GOPROXY)
-GOVERSION      := $(shell go version)
-DEFAULT_TARGET := $(GOOS)-$(GOARCH)
-W_PKG          := github.com/hedzr/cmdr/v2/conf
-CMDR_SETTING   := \
-	-X '$(W_PKG).Buildstamp=$(TIMESTAMP)' \
-	-X '$(W_PKG).Githash=$(GIT_REVISION)' \
-	-X '$(W_PKG).GitSummary=$(GIT_SUMMARY)' \
-	-X '$(W_PKG).GitDesc=$(GIT_DESC)' \
-	-X '$(W_PKG).BuilderComments=$(BUILDER_COMMENT)' \
-	-X '$(W_PKG).GoVersion=$(GOVERSION)' \
-	-X '$(W_PKG).Version=$(GIT_VERSION)' \
-	-X '$(W_PKG).AppName=$(NAME)'
-GOBUILD := CGO_ENABLED=0 \
-	$(GO) build \
-	-tags "cmdr hzstudio sec antonal" \
-	-trimpath \
-	-ldflags="-s -w $(CMDR_SETTING)" \
-	-o $(BUILD_DIR)
-
-.PHONY: all $(BUILD_DIR)/$(NAME) release release-all test build
+.PHONY: all $(BUILD_DIR)/$(NAME) release release-all test build primary-target main
 all: build
 normal: clean $(BUILD_DIR)/$(NAME)
 
@@ -78,10 +56,10 @@ build: $(BUILD_DIR)/$(NAME)
 build-default: $(DEFAULT_TARGET)
 	@echo BUILD OK
 
-# myservice: build executable for current GOOS & GOARCH
-myservice: my-service
-# my-service: build executable for the TARGET GOOS & GOARCH (see also PLATFORM & ARCH vars)
-my-service:
+# primary-target: build executable for current GOOS & GOARCH
+primary-target: main
+# main: build executable for the TARGET GOOS & GOARCH (see also PLATFORM & ARCH vars)
+main:
 	@-$(MAKE) $(BUILD_DIR)/$(NAME) GOOS=$(PLATFORM) GOARCH=$(ARCH) 
 
 # bin/cmdr is the default executable for running under your current GOOS & GOARCH.

ci/mk/vars.mk

@@ -0,0 +1,30 @@
+
+PLATFORM       ?= linux
+ARCH           ?= amd64
+BUILD_DIR      ?= bin
+LOGS_DIR       ?= ./logs
+
+
+GO             := $(shell which go)
+GOOS           := $(shell go env GOOS)
+GOARCH         := $(shell go env GOARCH)
+GOPROXY        := $(shell go env GOPROXY)
+GOVERSION      := $(shell go version)
+DEFAULT_TARGET := $(GOOS)-$(GOARCH)
+W_PKG          := github.com/hedzr/cmdr/v2/conf
+CMDR_SETTING   := \
+	-X '$(W_PKG).Buildstamp=$(TIMESTAMP)' \
+	-X '$(W_PKG).Githash=$(GIT_REVISION)' \
+	-X '$(W_PKG).GitSummary=$(GIT_SUMMARY)' \
+	-X '$(W_PKG).GitDesc=$(GIT_DESC)' \
+	-X '$(W_PKG).BuilderComments=$(BUILDER_COMMENT)' \
+	-X '$(W_PKG).GoVersion=$(GOVERSION)' \
+	-X '$(W_PKG).Version=$(GIT_VERSION)' \
+	-X '$(W_PKG).AppName=$(NAME)'
+GOBUILD := CGO_ENABLED=0 \
+	$(GO) build \
+	-tags "cmdr hzstudio sec antonal" \
+	-trimpath \
+	-ldflags="-s -w $(CMDR_SETTING)" \
+	-o $(BUILD_DIR)
+