Skip to content

Use a file as make evidence for fomantic instead of a directory #10032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Feb 1, 2020
Merged

Use a file as make evidence for fomantic instead of a directory #10032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ea95b3c
Use evidence file as dependency instead of dir
guillep2k Jan 28, 2020
1021a34
fix eol
guillep2k Jan 28, 2020
fa8b171
Merge branch 'master' into make-evidence
guillep2k Jan 28, 2020
8f21607
Update .gitignore
guillep2k Jan 28, 2020
5cf1921
Use FOMANTIC_SOURCES to establish dependencies as per @silverwind
guillep2k Jan 28, 2020
42b4fa9
Merge branch 'master' into make-evidence
zeripath Jan 28, 2020
70f82fd
Merge branch 'master' into make-evidence
guillep2k Jan 29, 2020
8efdd39
Merge branch 'master' into make-evidence
lafriks Jan 29, 2020
884519c
Merge branch 'master' into make-evidence
lunny Feb 1, 2020
8d78c5c
Merge branch 'master' into make-evidence
lunny Feb 1, 2020
d695120
Merge branch 'master' into make-evidence
zeripath Feb 1, 2020
1bdb0de
Merge branch 'master' into make-evidence
zeripath Feb 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,3 +83,6 @@ prime/
*.snap-build
*_source.tar.bz2
.DS_Store

# Make evidence files
/.make_evidence
12 changes: 8 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 ?=

Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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)
Expand Down