diff --git a/Makefile b/Makefile index 822be13..bc4f52c 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ else endif GOBIN ?= $(shell go env GOPATH)/bin -GOMAKE ?= github.com/tkrop/go-make@v0.0.17 +GOMAKE ?= github.com/tkrop/go-make@v0.0.18 TARGETS := $(shell command -v go-make >/dev/null || \ go install $(GOMAKE) && go-make targets) diff --git a/Makefile.base b/Makefile.base index 63b90ee..1ce49c3 100644 --- a/Makefile.base +++ b/Makefile.base @@ -542,13 +542,13 @@ $(TARGETS_INIT_CODACY):: init-%: chmod 700 $${FILE}; \ fi; \ -#@ initialize project by copying config makefile from template. -init-make:: $(TARGETS_INIT_MAKE) +#@ initialize project by copying config files from template. +init-make:: $(TARGETS_INIT_MAKE) $(TARGETS_UPDATE_MAKE) $(TARGETS_INIT_MAKE):: init/%: setup/base @DIR="$$(pwd)"; FILE="$*"; FILE="$${FILE##$(DIR_CONFIG)}"; \ cd "$(BASEDIR)"; git show HEAD:config/$${FILE} > $${DIR}/$${FILE} 2>/dev/null; \ -#@ initialize project by copying Makefile.base from template. +#@ initialize project by copying raw Makefile.base from template. init-make!:: setup/base @DIR="$$(pwd)"; cd $(BASEDIR); \ git show HEAD:config/Makefile.base > $${DIR}/Makefile 2>/dev/null; \ diff --git a/Makefile.ext b/Makefile.ext index f26415e..bee084e 100644 --- a/Makefile.ext +++ b/Makefile.ext @@ -4,6 +4,7 @@ clean:: bump:: @VERSION="$$(cat VERSION)"; \ sed -i -e "s#\(github.com/tkrop/go-make@v\)[^ ]*#\1$${VERSION}#" Makefile; + cp Makefile Makefile.base config; commit:: @for FILE in $$(find config -type f ! -name "Makefile.vars"); do \ diff --git a/VERSION b/VERSION index cd23180..32786aa 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.0.17 +0.0.18 diff --git a/config/Makefile b/config/Makefile index 822be13..bc4f52c 100644 --- a/config/Makefile +++ b/config/Makefile @@ -8,7 +8,7 @@ else endif GOBIN ?= $(shell go env GOPATH)/bin -GOMAKE ?= github.com/tkrop/go-make@v0.0.17 +GOMAKE ?= github.com/tkrop/go-make@v0.0.18 TARGETS := $(shell command -v go-make >/dev/null || \ go install $(GOMAKE) && go-make targets) diff --git a/config/Makefile.base b/config/Makefile.base index 63b90ee..1ce49c3 100644 --- a/config/Makefile.base +++ b/config/Makefile.base @@ -542,13 +542,13 @@ $(TARGETS_INIT_CODACY):: init-%: chmod 700 $${FILE}; \ fi; \ -#@ initialize project by copying config makefile from template. -init-make:: $(TARGETS_INIT_MAKE) +#@ initialize project by copying config files from template. +init-make:: $(TARGETS_INIT_MAKE) $(TARGETS_UPDATE_MAKE) $(TARGETS_INIT_MAKE):: init/%: setup/base @DIR="$$(pwd)"; FILE="$*"; FILE="$${FILE##$(DIR_CONFIG)}"; \ cd "$(BASEDIR)"; git show HEAD:config/$${FILE} > $${DIR}/$${FILE} 2>/dev/null; \ -#@ initialize project by copying Makefile.base from template. +#@ initialize project by copying raw Makefile.base from template. init-make!:: setup/base @DIR="$$(pwd)"; cd $(BASEDIR); \ git show HEAD:config/Makefile.base > $${DIR}/Makefile 2>/dev/null; \