From ea95b3c48e672bbb0ab1f17786f8d588f272e9c4 Mon Sep 17 00:00:00 2001 From: Guillermo Prandi Date: Mon, 27 Jan 2020 22:45:08 -0300 Subject: [PATCH 1/4] Use evidence file as dependency instead of dir --- .gitignore | 3 +++ Makefile | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 903e226ca9b19..413da9f4b398e 100644 --- a/.gitignore +++ b/.gitignore @@ -83,3 +83,6 @@ prime/ *.snap-build *_source.tar.bz2 .DS_Store + +# Make evidence files +/.make_evidence/* \ No newline at end of file diff --git a/Makefile b/Makefile index ecdc5dac3a07d..9e06a44cc7ab7 100644 --- a/Makefile +++ b/Makefile @@ -28,6 +28,7 @@ GOFLAGS := -v EXTRA_GOFLAGS ?= MAKE_VERSION := $(shell $(MAKE) -v | head -n 1) +MAKE_EVIDENCE_DIR := .make_evidence ifneq ($(DRONE_TAG),) VERSION ?= $(subst v,,$(DRONE_TAG)) @@ -57,6 +58,7 @@ BINDATA_HASH := $(addsuffix .hash,$(BINDATA_DEST)) JS_DEST_DIR := public/js CSS_DEST_DIR := public/css FOMANTIC_DEST_DIR := public/fomantic +FOMANTIC_EVIDENCE := $(MAKE_EVIDENCE_DIR)/fomantic TAGS ?= @@ -141,7 +143,7 @@ node-check: .PHONY: clean-all clean-all: clean - rm -rf $(JS_DEST_DIR) $(CSS_DEST_DIR) $(FOMANTIC_DEST_DIR) + rm -rf $(JS_DEST_DIR) $(CSS_DEST_DIR) $(FOMANTIC_DEST_DIR) $(FOMANTIC_EVIDENCE) .PHONY: clean clean: @@ -497,13 +499,13 @@ $(JS_DEST): $(JS_SOURCES) | node_modules @touch $(JS_DEST) .PHONY: fomantic -fomantic: node-check $(FOMANTIC_DEST_DIR) +fomantic: node-check $(FOMANTIC_EVIDENCE) -$(FOMANTIC_DEST_DIR): semantic.json web_src/fomantic/theme.config.less | node_modules +$(FOMANTIC_EVIDENCE): semantic.json web_src/fomantic/theme.config.less web_src/fomantic/_site/globals/* | node_modules cp web_src/fomantic/theme.config.less node_modules/fomantic-ui/src/theme.config cp web_src/fomantic/_site/globals/* node_modules/fomantic-ui/src/_site/globals/ npx gulp -f node_modules/fomantic-ui/gulpfile.js build - @touch $(FOMANTIC_DEST_DIR) + @mkdir -p $(MAKE_EVIDENCE_DIR) && touch $(FOMANTIC_EVIDENCE) .PHONY: css css: node-check $(CSS_DEST) From 1021a3449384ce6b2139fea79c16cde15f42d674 Mon Sep 17 00:00:00 2001 From: Guillermo Prandi Date: Mon, 27 Jan 2020 22:50:51 -0300 Subject: [PATCH 2/4] fix eol --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 413da9f4b398e..695f53a66d8ef 100644 --- a/.gitignore +++ b/.gitignore @@ -85,4 +85,4 @@ prime/ .DS_Store # Make evidence files -/.make_evidence/* \ No newline at end of file +/.make_evidence/* From 8f2160726386d007f3c29c8bdaed45f31b637e18 Mon Sep 17 00:00:00 2001 From: guillep2k <18600385+guillep2k@users.noreply.github.com> Date: Tue, 28 Jan 2020 17:12:40 -0300 Subject: [PATCH 3/4] Update .gitignore Co-Authored-By: silverwind --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 695f53a66d8ef..0a1d2e3b23c25 100644 --- a/.gitignore +++ b/.gitignore @@ -85,4 +85,4 @@ prime/ .DS_Store # Make evidence files -/.make_evidence/* +/.make_evidence From 5cf192198b0d69d59565eb72a2c44ef5ddd6bb60 Mon Sep 17 00:00:00 2001 From: Guillermo Prandi Date: Tue, 28 Jan 2020 17:25:50 -0300 Subject: [PATCH 4/4] Use FOMANTIC_SOURCES to establish dependencies as per @silverwind --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 50085dbc04fed..699867ffc8825 100644 --- a/Makefile +++ b/Makefile @@ -54,6 +54,8 @@ BINDATA_DEST := modules/public/bindata.go modules/options/bindata.go modules/tem BINDATA_HASH := $(addsuffix .hash,$(BINDATA_DEST)) WEBPACK_DEST_DIRS := public/js public/css + +FOMANTIC_SOURCES ?= $(shell find web_src/fomantic -type f) FOMANTIC_DEST_DIR := public/fomantic FOMANTIC_EVIDENCE := $(MAKE_EVIDENCE_DIR)/fomantic @@ -497,7 +499,7 @@ css: .PHONY: fomantic fomantic: node-check $(FOMANTIC_EVIDENCE) -$(FOMANTIC_EVIDENCE): semantic.json web_src/fomantic/theme.config.less web_src/fomantic/_site/globals/* | node_modules +$(FOMANTIC_EVIDENCE): semantic.json $(FOMANTIC_SOURCES) | node_modules cp web_src/fomantic/theme.config.less node_modules/fomantic-ui/src/theme.config cp web_src/fomantic/_site/globals/* node_modules/fomantic-ui/src/_site/globals/ npx gulp -f node_modules/fomantic-ui/gulpfile.js build