Skip to content

Commit

Permalink
Merge 9c16047 into ca61eac
Browse files Browse the repository at this point in the history
  • Loading branch information
jacobgreenleaf committed Dec 13, 2018
2 parents ca61eac + 9c16047 commit 4b76044
Show file tree
Hide file tree
Showing 54 changed files with 59 additions and 198 deletions.
7 changes: 4 additions & 3 deletions Makefile
Expand Up @@ -21,6 +21,7 @@ EXAMPLE_BASE_DIR = examples/example-gateway/
EXAMPLE_SERVICES_DIR = $(EXAMPLE_BASE_DIR)build/services/
EXAMPLE_SERVICES = $(sort $(dir $(wildcard $(EXAMPLE_SERVICES_DIR)*/)))
GOIMPORTS = "$(PWD)/vendor/golang.org/x/tools/cmd/goimports"
GOBINDATA = "$(PWD)/vendor/github.com/jteeuwen/go-bindata/go-bindata"

.PHONY: install
install:
Expand All @@ -31,6 +32,7 @@ install:
glide --version || go get -u -f github.com/Masterminds/glide
glide install
go build -o $(GOIMPORTS)/goimports ./vendor/golang.org/x/tools/cmd/goimports/
go build -o $(GOBINDATA)/go-bindata ./vendor/github.com/jteeuwen/go-bindata/go-bindata/

.PHONY: check-licence
check-licence:
Expand Down Expand Up @@ -101,13 +103,12 @@ lint: check-licence eclint-check

.PHONY: generate
generate:
@go get -u github.com/jteeuwen/go-bindata/...
@ls ./node_modules/.bin/uber-licence >/dev/null 2>&1 || npm i uber-licence
@chmod 644 ./codegen/templates/*.tmpl
@chmod 644 $(ENV_CONFIG)
@go-bindata -pkg config -nocompress -modtime 1 -prefix config -o config/production.gen.go $(ENV_CONFIG)
@$(GOBINDATA)/go-bindata -pkg config -nocompress -modtime 1 -prefix config -o config/production.gen.go $(ENV_CONFIG)
@./node_modules/.bin/uber-licence --file "production.gen.go" --dir "config" > /dev/null
@go-bindata -pkg templates -nocompress -modtime 1 -prefix codegen/templates -o codegen/template_bundle/template_files.go codegen/templates/...
@$(GOBINDATA)/go-bindata -pkg templates -nocompress -modtime 1 -prefix codegen/templates -o codegen/template_bundle/template_files.go codegen/templates/...
@gofmt -w -e -s "codegen/template_bundle/template_files.go"
@PATH=$(GOIMPORTS):$(PATH) bash ./scripts/generate.sh

Expand Down

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 4b76044

Please sign in to comment.