TudbuT/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

move fomantic target, update 'make help' (#9945)

Browse source 
I'd like to run webpack without fomantic in the prereqs so move it to
the `generate` target.

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
silverwind 2020-01-23 06:53:57 +01:00 • committed by techknowlogick
parent c8d7ae1ee3
commit bfdfa9a8b3
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Makefile
View file

@ -103,10 +103,11 @@ help:
@echo " - clean-all delete all generated files (integration test, build, css and js files)" @echo " - clean-all delete all generated files (integration test, build, css and js files)"
@echo " - css rebuild only css files" @echo " - css rebuild only css files"
@echo " - js rebuild only js files" @echo " - js rebuild only js files"
@echo " - generate run \"make css js\" and \"go generate\"" @echo " - fomantic rebuild fomantic-ui files"
@echo " - generate run \"make fomantic css js\" and \"go generate\""
@echo " - fmt format the code" @echo " - fmt format the code"
@echo " - generate-swagger generate the swagger spec from code comments" @echo " - generate-swagger generate the swagger spec from code comments"
@echo " - swagger-validate check if the swagger spec is valide" @echo " - swagger-validate check if the swagger spec is valid"
@echo " - revive run code linter revive" @echo " - revive run code linter revive"
@echo " - misspell check if a word is written wrong" @echo " - misspell check if a word is written wrong"
@echo " - vet examines Go source code and reports suspicious constructs" @echo " - vet examines Go source code and reports suspicious constructs"
@ -159,7 +160,7 @@ vet:
$(GO) vet $(PACKAGES) $(GO) vet $(PACKAGES)
.PHONY: generate .PHONY: generate
generate: js css generate: fomantic js css
GO111MODULE=on $(GO) generate -mod=vendor $(PACKAGES) GO111MODULE=on $(GO) generate -mod=vendor $(PACKAGES)
.PHONY: generate-swagger .PHONY: generate-swagger
@ -475,7 +476,7 @@ npm-update: node-check node_modules
npm install --package-lock npm install --package-lock
.PHONY: js .PHONY: js
js: node-check fomantic $(JS_DEST) js: node-check $(JS_DEST)
$(JS_DEST): node_modules $(JS_SOURCES) $(JS_DEST): node_modules $(JS_SOURCES)
npx eslint web_src/js webpack.config.js npx eslint web_src/js webpack.config.js
@ -489,7 +490,7 @@ $(FOMANTIC_DEST_DIR): node_modules semantic.json web_src/fomantic/theme.config.l
npx gulp -f node_modules/fomantic-ui/gulpfile.js build npx gulp -f node_modules/fomantic-ui/gulpfile.js build
.PHONY: css .PHONY: css
css: node-check fomantic $(CSS_DEST) css: node-check $(CSS_DEST)
$(CSS_DEST): node_modules $(CSS_SOURCES) $(CSS_DEST): node_modules $(CSS_SOURCES)
npx stylelint web_src/less npx stylelint web_src/less