diff options
| author | guillep2k <18600385+guillep2k@users.noreply.github.com> | 2020-02-01 17:15:32 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-01 20:15:32 +0000 |
| commit | 72f9cfc8f05e744befca63b9cc2a1b10c009621d (patch) | |
| tree | ad4eaf166645ce21ae36a11aaa1e3a176d35dd4c /Makefile | |
| parent | ce7062a422777c00aadf43ad67a90cc8aae689a5 (diff) | |
| download | gitea-72f9cfc8f05e744befca63b9cc2a1b10c009621d.tar.gz gitea-72f9cfc8f05e744befca63b9cc2a1b10c009621d.zip | |
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 <me@silverwind.io>
* Use FOMANTIC_SOURCES to establish dependencies as per @silverwind
Co-authored-by: silverwind <me@silverwind.io>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -29,6 +29,7 @@ GOFLAGS := -v EXTRA_GOFLAGS ?= MAKE_VERSION := $(shell $(MAKE) -v | head -n 1) +MAKE_EVIDENCE_DIR := .make_evidence ifneq ($(RACE_ENABLED),) GOTESTFLAGS ?= -race @@ -58,7 +59,10 @@ 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 TAGS ?= @@ -139,7 +143,7 @@ node-check: .PHONY: clean-all clean-all: clean - rm -rf $(WEBPACK_DEST_DIRS) $(FOMANTIC_DEST_DIR) + rm -rf $(WEBPACK_DEST_DIRS) $(FOMANTIC_DEST_DIR) $(FOMANTIC_EVIDENCE) .PHONY: clean clean: @@ -498,13 +502,13 @@ css: $(MAKE) webpack .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 $(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 - @touch $(FOMANTIC_DEST_DIR) + @mkdir -p $(MAKE_EVIDENCE_DIR) && touch $(FOMANTIC_EVIDENCE) .PHONY: webpack webpack: node-check $(WEBPACK_DEST) |