Skip to content

Bindata is optional and over-writable on restart #354

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 13 commits into from
Dec 22, 2016
Merged

Bindata is optional and over-writable on restart #354

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d71fc28
Moved conf assets into options folder
Dec 2, 2016
c4e6064
Dropped old bindata
Dec 2, 2016
a8b4245
Started to integrate options bindata and accessors
Dec 2, 2016
82b9924
Do not enforce a builtin app.ini
Dec 2, 2016
921501e
Replaced bindata calls with options
Dec 2, 2016
2180db9
Dropped bindata task from makefile, it's the generate task now
Dec 5, 2016
a410e9d
Always embedd app.ini to provide sane config defaults
tboerger Dec 6, 2016
fe1f7ec
Use sane defaults for the configuration
tboerger Dec 21, 2016
76a73ed
Defined default value for SSH_KEYGEN_PATH
tboerger Dec 21, 2016
8157688
Dropped "NEVER EVER MODIFY THIS FILE" header from app.ini
tboerger Dec 21, 2016
08e6ed0
Fixed new paths in latest test additions
Dec 22, 2016
b91b0a9
Drop bindata with make clean task
tboerger Dec 22, 2016
bb52aed
Set more proper default values
tboerger Dec 22, 2016
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
Prev Previous commit
Next Next commit
Dropped bindata task from makefile, it's the generate task now
  • Loading branch information
Thomas Boerger committed Dec 22, 2016
commit 2180db989c04249de2f3e027a46ca2c5de8b5e77
16 changes: 1 addition & 15 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 :=

Expand Down Expand Up @@ -119,19 +118,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 [email protected]

.PHONY: javascripts
javascripts: public/js/index.js

Expand All @@ -147,4 +133,4 @@ public/css/index.css: $(STYLESHEETS)
lessc $< $@

.PHONY: assets
assets: bindata javascripts stylesheets
assets: javascripts stylesheets