diff options
| author | Thomas Boerger <thomas@webhippie.de> | 2016-12-22 19:12:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-22 19:12:23 +0100 |
| commit | b33078fa33441c33c5d018b1b9a248c646549842 (patch) | |
| tree | 0f890f88987764c1409c6c9d90edd8e727f3219e /Makefile | |
| parent | c21e2c4151b5bc13e54de902f59e7b4c46b47540 (diff) | |
| download | gitea-b33078fa33441c33c5d018b1b9a248c646549842.tar.gz gitea-b33078fa33441c33c5d018b1b9a248c646549842.zip | |
Bindata is optional and over-writable on restart (#354)
* Moved conf assets into options folder
* Dropped old bindata
* Started to integrate options bindata and accessors
* Do not enforce a builtin app.ini
* Replaced bindata calls with options
* Dropped bindata task from makefile, it's the generate task now
* Always embedd app.ini to provide sane config defaults
* Use sane defaults for the configuration
* Defined default value for SSH_KEYGEN_PATH
* Dropped "NEVER EVER MODIFY THIS FILE" header from app.ini
* Fixed new paths in latest test additions
* Drop bindata with make clean task
* Set more proper default values
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 22 |
1 files changed, 3 insertions, 19 deletions
@@ -2,10 +2,7 @@ DIST := dist EXECUTABLE := gitea IMPORT := code.gitea.io/gitea -SHA := $(shell git rev-parse --short HEAD) -DATE := $(shell date -u '+%Y-%m-%d %I:%M:%S %Z') - -BINDATA := $(shell find conf | sed 's/ /\\ /g') +BINDATA := modules/{options,public,templates}/bindata.go STYLESHEETS := $(wildcard public/less/index.less public/less/_*.less) JAVASCRIPTS := @@ -33,7 +30,7 @@ all: build .PHONY: clean clean: go clean -i ./... - rm -rf $(EXECUTABLE) $(DIST) + rm -rf $(EXECUTABLE) $(DIST) $(BINDATA) .PHONY: fmt fmt: @@ -119,19 +116,6 @@ release-copy: release-check: cd $(DIST)/release; $(foreach file,$(wildcard $(DIST)/release/$(EXECUTABLE)-*),sha256sum $(notdir $(file)) > $(notdir $(file)).sha256;) -.PHONY: bindata -bindata: modules/bindata/bindata.go - -.IGNORE: modules/bindata/bindata.go -modules/bindata/bindata.go: $(BINDATA) - @which go-bindata > /dev/null; if [ $$? -ne 0 ]; then \ - go get -u github.com/jteeuwen/go-bindata/...; \ - fi - go-bindata -o=$@ -ignore="\\.go|README.md|TRANSLATORS" -pkg=bindata conf/... - go fmt $@ - sed -i.bak 's/confLocaleLocale_/confLocaleLocale/' $@ - rm $@.bak - .PHONY: javascripts javascripts: public/js/index.js @@ -147,4 +131,4 @@ public/css/index.css: $(STYLESHEETS) lessc $< $@ .PHONY: assets -assets: bindata javascripts stylesheets +assets: javascripts stylesheets |