Skip to content

Commit 72f9cfc

Browse files
Use a file as make evidence for fomantic instead of a directory (#10032)
* Use evidence file as dependency instead of dir * fix eol * Update .gitignore Co-Authored-By: silverwind <[email protected]> * Use FOMANTIC_SOURCES to establish dependencies as per @silverwind Co-authored-by: silverwind <[email protected]>
1 parent ce7062a commit 72f9cfc

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,6 @@ prime/
8383
*.snap-build
8484
*_source.tar.bz2
8585
.DS_Store
86+
87+
# Make evidence files
88+
/.make_evidence

Makefile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ GOFLAGS := -v
2929
EXTRA_GOFLAGS ?=
3030

3131
MAKE_VERSION := $(shell $(MAKE) -v | head -n 1)
32+
MAKE_EVIDENCE_DIR := .make_evidence
3233

3334
ifneq ($(RACE_ENABLED),)
3435
GOTESTFLAGS ?= -race
@@ -58,7 +59,10 @@ BINDATA_DEST := modules/public/bindata.go modules/options/bindata.go modules/tem
5859
BINDATA_HASH := $(addsuffix .hash,$(BINDATA_DEST))
5960

6061
WEBPACK_DEST_DIRS := public/js public/css
62+
63+
FOMANTIC_SOURCES ?= $(shell find web_src/fomantic -type f)
6164
FOMANTIC_DEST_DIR := public/fomantic
65+
FOMANTIC_EVIDENCE := $(MAKE_EVIDENCE_DIR)/fomantic
6266

6367
TAGS ?=
6468

@@ -139,7 +143,7 @@ node-check:
139143

140144
.PHONY: clean-all
141145
clean-all: clean
142-
rm -rf $(WEBPACK_DEST_DIRS) $(FOMANTIC_DEST_DIR)
146+
rm -rf $(WEBPACK_DEST_DIRS) $(FOMANTIC_DEST_DIR) $(FOMANTIC_EVIDENCE)
143147

144148
.PHONY: clean
145149
clean:
@@ -498,13 +502,13 @@ css:
498502
$(MAKE) webpack
499503

500504
.PHONY: fomantic
501-
fomantic: node-check $(FOMANTIC_DEST_DIR)
505+
fomantic: node-check $(FOMANTIC_EVIDENCE)
502506

503-
$(FOMANTIC_DEST_DIR): semantic.json web_src/fomantic/theme.config.less | node_modules
507+
$(FOMANTIC_EVIDENCE): semantic.json $(FOMANTIC_SOURCES) | node_modules
504508
cp web_src/fomantic/theme.config.less node_modules/fomantic-ui/src/theme.config
505509
cp web_src/fomantic/_site/globals/* node_modules/fomantic-ui/src/_site/globals/
506510
npx gulp -f node_modules/fomantic-ui/gulpfile.js build
507-
@touch $(FOMANTIC_DEST_DIR)
511+
@mkdir -p $(MAKE_EVIDENCE_DIR) && touch $(FOMANTIC_EVIDENCE)
508512

509513
.PHONY: webpack
510514
webpack: node-check $(WEBPACK_DEST)

0 commit comments

Comments
 (0)