Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

build(Makefile): fix various bug with makefiles 

Fixes subdir ordering.
Works around issue with stringer not working with Go modules.
Fixes issues with generated code being ignored.

Fixes #2044
pull/10616/head
Nathaniel Cook 2018-12-19 16:43:45 -07:00
parent bb2efcc641
commit 89f4525841
9 changed files with 9294 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -13,7 +13,7 @@
# SUBDIRS are directories that have their own Makefile.
# It is required that all subdirs have the `all` and `clean` targets.
SUBDIRS := chronograf http ui query storage task
SUBDIRS := http ui chronograf query storage task
GO_ARGS=-tags '$(GO_TAGS)'
@ -75,9 +75,6 @@ chronograf_lint:
ui/node_modules:
make -C ui node_modules
ui/build:
mkdir -p ui/build
#
# Define action only targets
#

1
chronograf/.gitattributes vendored
View File

@ -1 +0,0 @@
CHANGELOG.md merge=union

26
chronograf/.gitignore vendored
View File

@ -1,26 +0,0 @@
# Directories
ui/reports/
build/
backup/
.vscode/
# Binaries
/chronograf
/chronoctl
# Dotfiles
.pull-request
.DS_Store
.godep
.jsdep
.jssrc
.dev-jssrc
.bindata
.eslintcache
# Files
chronograf*.db
*_gen.go
canned/apps_gen.go
npm-debug.log
npm-error.log

1401
chronograf/canned/bin_gen.go Normal file
View File

File diff suppressed because it is too large Load Diff

833
chronograf/dist/dist_gen.go vendored Normal file
View File

File diff suppressed because one or more lines are too long

7054
chronograf/server/swagger_gen.go Normal file
View File

File diff suppressed because it is too large Load Diff

2
go.mod
View File

@ -139,7 +139,7 @@ require (
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f
golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2
golang.org/x/tools v0.0.0-20181121193951-91f80e683c10 // indirect
golang.org/x/tools v0.0.0-20181121193951-91f80e683c10
google.golang.org/api v0.0.0-20181021000519-a2651947f503
google.golang.org/appengine v1.2.0 // indirect
google.golang.org/genproto v0.0.0-20181016170114-94acd270e44e // indirect

4
storage/reads/gen.go
View File

@ -4,4 +4,6 @@ package reads
//go:generate env GO111MODULE=on go run github.com/benbjohnson/tmpl -data=@array_cursor.gen.go.tmpldata response_writer.gen.go.tmpl
//go:generate env GO111MODULE=on go run github.com/benbjohnson/tmpl -data=@array_cursor.gen.go.tmpldata stream_reader.gen.go.tmpl
//go:generate env GO111MODULE=on go run github.com/benbjohnson/tmpl -data=@array_cursor.gen.go.tmpldata stream_reader_gen_test.go.tmpl
//go:generate stringer -type=readState -trimprefix=state
// Stringer is not compatible with Go modules, see https://github.com/influxdata/platform/issues/2017
// For now we are disabling the command. If it needs to be regenerated you must do so manually.
////go:generate stringer -type=readState -trimprefix=state

1
tools.go
View File

@ -9,6 +9,7 @@ import (
_ "github.com/goreleaser/goreleaser"
_ "github.com/kevinburke/go-bindata/go-bindata"
_ "github.com/mna/pigeon"
_ "golang.org/x/tools/cmd/stringer"
_ "honnef.co/go/tools/cmd/megacheck"
)