mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 08:30:25 +08:00 
			
		
		
		
	Dropped bindata task from makefile, it's the generate task now
This commit is contained in:
		
							
								
								
									
										16
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										16
									
								
								Makefile
									
									
									
									
									
								
							@@ -5,7 +5,6 @@ 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')
 | 
			
		||||
STYLESHEETS := $(wildcard public/less/index.less public/less/_*.less)
 | 
			
		||||
JAVASCRIPTS :=
 | 
			
		||||
 | 
			
		||||
@@ -115,19 +114,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
 | 
			
		||||
 | 
			
		||||
@@ -143,4 +129,4 @@ public/css/index.css: $(STYLESHEETS)
 | 
			
		||||
	lessc $< $@
 | 
			
		||||
 | 
			
		||||
.PHONY: assets
 | 
			
		||||
assets: bindata javascripts stylesheets
 | 
			
		||||
assets: javascripts stylesheets
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user