mirror of
https://gitlab.com/ric_harvey/MailHog.git
synced 2024-11-27 16:24:04 +00:00
Fix makefile bug
This commit is contained in:
Ian Kent
parent
2a6a063e17
commit
40a1071cb4
2 changed files with 133 additions and 60 deletions
13
Makefile
13
Makefile
|
|
@ -1,18 +1,23 @@
|
|||
DEPS = $(go list -f '{{range .TestImports}}{{.}} {{end}}' ./...)
|
||||
|
||||
all: deps
|
||||
go-bindata assets/...
|
||||
all: deps bindata fmt
|
||||
go install
|
||||
|
||||
bindata:
|
||||
go-bindata assets/...
|
||||
|
||||
test: test-deps
|
||||
go list ./... | xargs -n1 go test
|
||||
|
||||
release: release-deps
|
||||
gox
|
||||
|
||||
fmt:
|
||||
go fmt ./...
|
||||
|
||||
deps:
|
||||
go get github.com/ian-kent/gotcha/...
|
||||
go get github.com/ian-kent/go-log/...
|
||||
go get github.com/ian-kent/go-log/log
|
||||
go get github.com/jteeuwen/go-bindata/...
|
||||
go get labix.org/v2/mgo
|
||||
|
||||
|
|
@ -22,4 +27,4 @@ test-deps:
|
|||
release-deps:
|
||||
go get github.com/mitchellh/gox
|
||||
|
||||
.PNONY: all test deps
|
||||
.PNONY: all test deps bindata release fmt test-deps release-deps
|
||||
|
|
|
|||
180
bindata.go
180
bindata.go
|
|
@ -5,6 +5,7 @@ import (
|
|||
"compress/gzip"
|
||||
"fmt"
|
||||
"io"
|
||||
"strings"
|
||||
)
|
||||
|
||||
func bindata_read(data []byte, name string) ([]byte, error) {
|
||||
|
|
@ -24,6 +25,60 @@ func bindata_read(data []byte, name string) ([]byte, error) {
|
|||
return buf.Bytes(), nil
|
||||
}
|
||||
|
||||
func assets_images_ajax_loader_gif() ([]byte, error) {
|
||||
return bindata_read([]byte{
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x00, 0xff, 0x72, 0xf7,
|
||||
0x74, 0xb3, 0xb0, 0x4c, 0x14, 0x60, 0x10, 0x60, 0xf8, 0xc4, 0xc0, 0xf0,
|
||||
0xff, 0xff, 0x7f, 0x06, 0x06, 0x86, 0x43, 0x87, 0x0e, 0x39, 0x39, 0x39,
|
||||
0x01, 0x19, 0x49, 0x49, 0x49, 0x4d, 0x4d, 0x4d, 0x93, 0x26, 0x4d, 0x52,
|
||||
0xfc, 0xcf, 0xed, 0xe7, 0x1a, 0x12, 0xec, 0xec, 0x18, 0xe0, 0x6a, 0xa4,
|
||||
0x67, 0xc0, 0xcc, 0x08, 0x94, 0x53, 0xfc, 0x27, 0xe5, 0x5c, 0x94, 0x9a,
|
||||
0x58, 0x92, 0x9a, 0xa2, 0x50, 0x9e, 0x59, 0x92, 0xa1, 0x90, 0x98, 0x95,
|
||||
0x58, 0x91, 0x93, 0x9f, 0x98, 0xa2, 0x97, 0x99, 0x97, 0x96, 0xcf, 0xa0,
|
||||
0xf8, 0x93, 0x85, 0x93, 0x0b, 0xa8, 0x4a, 0x07, 0x88, 0x19, 0x40, 0x86,
|
||||
0x33, 0x30, 0x1b, 0x73, 0xec, 0xba, 0xf3, 0xcf, 0xe0, 0x94, 0x67, 0xb6,
|
||||
0x70, 0x32, 0x87, 0x15, 0x87, 0xe4, 0x1c, 0x76, 0xbf, 0x19, 0x69, 0x9c,
|
||||
0xae, 0x1b, 0x0d, 0x0f, 0xed, 0x12, 0x99, 0x79, 0x70, 0x9b, 0x5e, 0xc2,
|
||||
0x91, 0x43, 0x85, 0x17, 0x74, 0xa3, 0x25, 0x2c, 0xef, 0x2e, 0x63, 0xb7,
|
||||
0x94, 0xe0, 0x61, 0xf7, 0xca, 0x7e, 0xee, 0xc1, 0x80, 0xcd, 0x1c, 0x13,
|
||||
0x90, 0x39, 0x7e, 0x3d, 0x8a, 0x0a, 0xd2, 0x2d, 0x3c, 0xbb, 0x37, 0x3c,
|
||||
0xeb, 0x72, 0x29, 0x74, 0x0a, 0x0c, 0x49, 0x30, 0x94, 0x54, 0x48, 0xf0,
|
||||
0x71, 0x8d, 0x96, 0x5a, 0x51, 0x23, 0xb3, 0xb5, 0xf4, 0xfe, 0xdb, 0x44,
|
||||
0x09, 0xf6, 0x06, 0x85, 0xeb, 0x12, 0x8f, 0xda, 0x9c, 0x25, 0x37, 0xa9,
|
||||
0xaa, 0x68, 0x09, 0x61, 0x33, 0xc8, 0x8c, 0x63, 0x97, 0x91, 0xb2, 0xf6,
|
||||
0x29, 0xc7, 0x13, 0x13, 0xce, 0x4c, 0x09, 0xd3, 0x67, 0x6b, 0x4d, 0x96,
|
||||
0xe1, 0xfb, 0x22, 0xe9, 0xf7, 0xd1, 0xd3, 0x29, 0x71, 0xc6, 0xea, 0x02,
|
||||
0x99, 0x0f, 0x5c, 0x67, 0x36, 0xef, 0x95, 0x39, 0xb6, 0x42, 0x9b, 0x29,
|
||||
0xf2, 0xad, 0xf8, 0x1f, 0xc6, 0xe6, 0xc3, 0xfc, 0x46, 0x2b, 0x53, 0xa4,
|
||||
0xe6, 0xef, 0x67, 0xc1, 0xe1, 0xb7, 0x24, 0x55, 0xed, 0x53, 0x46, 0x6d,
|
||||
0x13, 0xdf, 0xcc, 0x09, 0x8b, 0x6f, 0xed, 0x5e, 0xc6, 0xd9, 0xaa, 0xc8,
|
||||
0xc3, 0x62, 0xe8, 0xd2, 0x9e, 0x28, 0x23, 0xb8, 0xca, 0xad, 0x69, 0xc3,
|
||||
0x45, 0x79, 0xe6, 0xa4, 0xa0, 0xd8, 0xcf, 0xb6, 0xf2, 0x06, 0x16, 0x3a,
|
||||
0x52, 0xfd, 0x27, 0x96, 0x14, 0x59, 0xfa, 0x60, 0xf5, 0x9b, 0x11, 0xc7,
|
||||
0xae, 0x22, 0x75, 0x6d, 0xaf, 0xe7, 0x29, 0x22, 0x1f, 0x24, 0x3e, 0xfb,
|
||||
0x34, 0xf2, 0xa8, 0x95, 0x1d, 0x4e, 0x88, 0x49, 0x0a, 0x99, 0xd2, 0xda,
|
||||
0xb2, 0x53, 0x2e, 0x23, 0xd2, 0x49, 0xf3, 0xfc, 0x29, 0x07, 0x01, 0x66,
|
||||
0xb9, 0x97, 0x36, 0xf2, 0x87, 0xd5, 0xc0, 0xe6, 0x04, 0x4d, 0xc2, 0x6a,
|
||||
0x0c, 0xd0, 0x39, 0x0a, 0x87, 0x26, 0x58, 0x8a, 0x3f, 0x2e, 0x79, 0xbe,
|
||||
0xe7, 0xd6, 0x3c, 0x03, 0xc9, 0xe3, 0x32, 0x0f, 0x14, 0xf5, 0x9c, 0xb6,
|
||||
0xcd, 0x3d, 0x15, 0xbe, 0x66, 0x91, 0x21, 0x0f, 0x1b, 0xb7, 0x48, 0x71,
|
||||
0xe2, 0xee, 0x0d, 0xa6, 0xdf, 0xa7, 0x32, 0x36, 0x1a, 0x6c, 0xe0, 0xec,
|
||||
0xdc, 0x3d, 0x3f, 0x57, 0xd3, 0x0b, 0x97, 0x73, 0xee, 0xfc, 0xfb, 0xc0,
|
||||
0x29, 0x78, 0x73, 0x4e, 0x68, 0xec, 0x2c, 0xc6, 0x77, 0xb7, 0x0a, 0x0b,
|
||||
0xa6, 0x26, 0x74, 0xdc, 0x4d, 0x9c, 0x73, 0xd7, 0x64, 0x5a, 0xab, 0xa3,
|
||||
0xdb, 0x51, 0x03, 0x91, 0x09, 0x09, 0xb3, 0xb7, 0x31, 0xf2, 0xb2, 0x1c,
|
||||
0x72, 0x10, 0x98, 0x6d, 0xd8, 0x70, 0xe8, 0xda, 0xb9, 0x89, 0xb8, 0x8d,
|
||||
0x01, 0xc6, 0xfc, 0xea, 0x54, 0xa7, 0x2b, 0x73, 0x34, 0xaf, 0xcb, 0x71,
|
||||
0x70, 0x1c, 0x56, 0xe8, 0x3b, 0x5e, 0xc8, 0xc7, 0x62, 0x68, 0xb0, 0xf2,
|
||||
0xd4, 0x86, 0x75, 0x01, 0x12, 0x87, 0x80, 0xd1, 0x15, 0x76, 0x6b, 0x29,
|
||||
0x93, 0x42, 0x69, 0x92, 0x44, 0xd3, 0xbc, 0x68, 0xc1, 0x09, 0x0c, 0x0c,
|
||||
0xd6, 0x0c, 0x30, 0x00, 0x08, 0x00, 0x00, 0xff, 0xff, 0xd9, 0x47, 0x25,
|
||||
0x03, 0xa1, 0x02, 0x00, 0x00,
|
||||
},
|
||||
"assets/images/ajax-loader.gif",
|
||||
)
|
||||
}
|
||||
|
||||
func assets_images_github_png() ([]byte, error) {
|
||||
return bindata_read([]byte{
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x00, 0xff, 0xea, 0x0c,
|
||||
|
|
@ -151,60 +206,6 @@ func assets_images_github_png() ([]byte, error) {
|
|||
)
|
||||
}
|
||||
|
||||
func assets_images_ajax_loader_gif() ([]byte, error) {
|
||||
return bindata_read([]byte{
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x00, 0xff, 0x72, 0xf7,
|
||||
0x74, 0xb3, 0xb0, 0x4c, 0x14, 0x60, 0x10, 0x60, 0xf8, 0xc4, 0xc0, 0xf0,
|
||||
0xff, 0xff, 0x7f, 0x06, 0x06, 0x86, 0x43, 0x87, 0x0e, 0x39, 0x39, 0x39,
|
||||
0x01, 0x19, 0x49, 0x49, 0x49, 0x4d, 0x4d, 0x4d, 0x93, 0x26, 0x4d, 0x52,
|
||||
0xfc, 0xcf, 0xed, 0xe7, 0x1a, 0x12, 0xec, 0xec, 0x18, 0xe0, 0x6a, 0xa4,
|
||||
0x67, 0xc0, 0xcc, 0x08, 0x94, 0x53, 0xfc, 0x27, 0xe5, 0x5c, 0x94, 0x9a,
|
||||
0x58, 0x92, 0x9a, 0xa2, 0x50, 0x9e, 0x59, 0x92, 0xa1, 0x90, 0x98, 0x95,
|
||||
0x58, 0x91, 0x93, 0x9f, 0x98, 0xa2, 0x97, 0x99, 0x97, 0x96, 0xcf, 0xa0,
|
||||
0xf8, 0x93, 0x85, 0x93, 0x0b, 0xa8, 0x4a, 0x07, 0x88, 0x19, 0x40, 0x86,
|
||||
0x33, 0x30, 0x1b, 0x73, 0xec, 0xba, 0xf3, 0xcf, 0xe0, 0x94, 0x67, 0xb6,
|
||||
0x70, 0x32, 0x87, 0x15, 0x87, 0xe4, 0x1c, 0x76, 0xbf, 0x19, 0x69, 0x9c,
|
||||
0xae, 0x1b, 0x0d, 0x0f, 0xed, 0x12, 0x99, 0x79, 0x70, 0x9b, 0x5e, 0xc2,
|
||||
0x91, 0x43, 0x85, 0x17, 0x74, 0xa3, 0x25, 0x2c, 0xef, 0x2e, 0x63, 0xb7,
|
||||
0x94, 0xe0, 0x61, 0xf7, 0xca, 0x7e, 0xee, 0xc1, 0x80, 0xcd, 0x1c, 0x13,
|
||||
0x90, 0x39, 0x7e, 0x3d, 0x8a, 0x0a, 0xd2, 0x2d, 0x3c, 0xbb, 0x37, 0x3c,
|
||||
0xeb, 0x72, 0x29, 0x74, 0x0a, 0x0c, 0x49, 0x30, 0x94, 0x54, 0x48, 0xf0,
|
||||
0x71, 0x8d, 0x96, 0x5a, 0x51, 0x23, 0xb3, 0xb5, 0xf4, 0xfe, 0xdb, 0x44,
|
||||
0x09, 0xf6, 0x06, 0x85, 0xeb, 0x12, 0x8f, 0xda, 0x9c, 0x25, 0x37, 0xa9,
|
||||
0xaa, 0x68, 0x09, 0x61, 0x33, 0xc8, 0x8c, 0x63, 0x97, 0x91, 0xb2, 0xf6,
|
||||
0x29, 0xc7, 0x13, 0x13, 0xce, 0x4c, 0x09, 0xd3, 0x67, 0x6b, 0x4d, 0x96,
|
||||
0xe1, 0xfb, 0x22, 0xe9, 0xf7, 0xd1, 0xd3, 0x29, 0x71, 0xc6, 0xea, 0x02,
|
||||
0x99, 0x0f, 0x5c, 0x67, 0x36, 0xef, 0x95, 0x39, 0xb6, 0x42, 0x9b, 0x29,
|
||||
0xf2, 0xad, 0xf8, 0x1f, 0xc6, 0xe6, 0xc3, 0xfc, 0x46, 0x2b, 0x53, 0xa4,
|
||||
0xe6, 0xef, 0x67, 0xc1, 0xe1, 0xb7, 0x24, 0x55, 0xed, 0x53, 0x46, 0x6d,
|
||||
0x13, 0xdf, 0xcc, 0x09, 0x8b, 0x6f, 0xed, 0x5e, 0xc6, 0xd9, 0xaa, 0xc8,
|
||||
0xc3, 0x62, 0xe8, 0xd2, 0x9e, 0x28, 0x23, 0xb8, 0xca, 0xad, 0x69, 0xc3,
|
||||
0x45, 0x79, 0xe6, 0xa4, 0xa0, 0xd8, 0xcf, 0xb6, 0xf2, 0x06, 0x16, 0x3a,
|
||||
0x52, 0xfd, 0x27, 0x96, 0x14, 0x59, 0xfa, 0x60, 0xf5, 0x9b, 0x11, 0xc7,
|
||||
0xae, 0x22, 0x75, 0x6d, 0xaf, 0xe7, 0x29, 0x22, 0x1f, 0x24, 0x3e, 0xfb,
|
||||
0x34, 0xf2, 0xa8, 0x95, 0x1d, 0x4e, 0x88, 0x49, 0x0a, 0x99, 0xd2, 0xda,
|
||||
0xb2, 0x53, 0x2e, 0x23, 0xd2, 0x49, 0xf3, 0xfc, 0x29, 0x07, 0x01, 0x66,
|
||||
0xb9, 0x97, 0x36, 0xf2, 0x87, 0xd5, 0xc0, 0xe6, 0x04, 0x4d, 0xc2, 0x6a,
|
||||
0x0c, 0xd0, 0x39, 0x0a, 0x87, 0x26, 0x58, 0x8a, 0x3f, 0x2e, 0x79, 0xbe,
|
||||
0xe7, 0xd6, 0x3c, 0x03, 0xc9, 0xe3, 0x32, 0x0f, 0x14, 0xf5, 0x9c, 0xb6,
|
||||
0xcd, 0x3d, 0x15, 0xbe, 0x66, 0x91, 0x21, 0x0f, 0x1b, 0xb7, 0x48, 0x71,
|
||||
0xe2, 0xee, 0x0d, 0xa6, 0xdf, 0xa7, 0x32, 0x36, 0x1a, 0x6c, 0xe0, 0xec,
|
||||
0xdc, 0x3d, 0x3f, 0x57, 0xd3, 0x0b, 0x97, 0x73, 0xee, 0xfc, 0xfb, 0xc0,
|
||||
0x29, 0x78, 0x73, 0x4e, 0x68, 0xec, 0x2c, 0xc6, 0x77, 0xb7, 0x0a, 0x0b,
|
||||
0xa6, 0x26, 0x74, 0xdc, 0x4d, 0x9c, 0x73, 0xd7, 0x64, 0x5a, 0xab, 0xa3,
|
||||
0xdb, 0x51, 0x03, 0x91, 0x09, 0x09, 0xb3, 0xb7, 0x31, 0xf2, 0xb2, 0x1c,
|
||||
0x72, 0x10, 0x98, 0x6d, 0xd8, 0x70, 0xe8, 0xda, 0xb9, 0x89, 0xb8, 0x8d,
|
||||
0x01, 0xc6, 0xfc, 0xea, 0x54, 0xa7, 0x2b, 0x73, 0x34, 0xaf, 0xcb, 0x71,
|
||||
0x70, 0x1c, 0x56, 0xe8, 0x3b, 0x5e, 0xc8, 0xc7, 0x62, 0x68, 0xb0, 0xf2,
|
||||
0xd4, 0x86, 0x75, 0x01, 0x12, 0x87, 0x80, 0xd1, 0x15, 0x76, 0x6b, 0x29,
|
||||
0x93, 0x42, 0x69, 0x92, 0x44, 0xd3, 0xbc, 0x68, 0xc1, 0x09, 0x0c, 0x0c,
|
||||
0xd6, 0x0c, 0x30, 0x00, 0x08, 0x00, 0x00, 0xff, 0xff, 0xd9, 0x47, 0x25,
|
||||
0x03, 0xa1, 0x02, 0x00, 0x00,
|
||||
},
|
||||
"assets/images/ajax-loader.gif",
|
||||
)
|
||||
}
|
||||
|
||||
func assets_images_hog_png() ([]byte, error) {
|
||||
return bindata_read([]byte{
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x00, 0xff, 0x8c, 0x96,
|
||||
|
|
@ -969,18 +970,85 @@ func assets_templates_layout_html() ([]byte, error) {
|
|||
// It returns an error if the asset could not be found or
|
||||
// could not be loaded.
|
||||
func Asset(name string) ([]byte, error) {
|
||||
if f, ok := _bindata[name]; ok {
|
||||
cannonicalName := strings.Replace(name, "\\", "/", -1)
|
||||
if f, ok := _bindata[cannonicalName]; ok {
|
||||
return f()
|
||||
}
|
||||
return nil, fmt.Errorf("Asset %s not found", name)
|
||||
}
|
||||
|
||||
// AssetNames returns the names of the assets.
|
||||
func AssetNames() []string {
|
||||
names := make([]string, 0, len(_bindata))
|
||||
for name := range _bindata {
|
||||
names = append(names, name)
|
||||
}
|
||||
return names
|
||||
}
|
||||
|
||||
// _bindata is a table, holding each asset generator, mapped to its name.
|
||||
var _bindata = map[string]func() ([]byte, error){
|
||||
"assets/images/github.png": assets_images_github_png,
|
||||
"assets/images/ajax-loader.gif": assets_images_ajax_loader_gif,
|
||||
"assets/images/github.png": assets_images_github_png,
|
||||
"assets/images/hog.png": assets_images_hog_png,
|
||||
"assets/js/controllers.js": assets_js_controllers_js,
|
||||
"assets/templates/index.html": assets_templates_index_html,
|
||||
"assets/templates/layout.html": assets_templates_layout_html,
|
||||
}
|
||||
|
||||
// AssetDir returns the file names below a certain
|
||||
// directory embedded in the file by go-bindata.
|
||||
// For example if you run go-bindata on data/... and data contains the
|
||||
// following hierarchy:
|
||||
// data/
|
||||
// foo.txt
|
||||
// img/
|
||||
// a.png
|
||||
// b.png
|
||||
// then AssetDir("data") would return []string{"foo.txt", "img"}
|
||||
// AssetDir("data/img") would return []string{"a.png", "b.png"}
|
||||
// AssetDir("foo.txt") and AssetDir("notexist") would return an error
|
||||
// AssetDir("") will return []string{"data"}.
|
||||
func AssetDir(name string) ([]string, error) {
|
||||
node := _bintree
|
||||
if len(name) != 0 {
|
||||
cannonicalName := strings.Replace(name, "\\", "/", -1)
|
||||
pathList := strings.Split(cannonicalName, "/")
|
||||
for _, p := range pathList {
|
||||
node = node.Children[p]
|
||||
if node == nil {
|
||||
return nil, fmt.Errorf("Asset %s not found", name)
|
||||
}
|
||||
}
|
||||
}
|
||||
if node.Func != nil {
|
||||
return nil, fmt.Errorf("Asset %s not found", name)
|
||||
}
|
||||
rv := make([]string, 0, len(node.Children))
|
||||
for name := range node.Children {
|
||||
rv = append(rv, name)
|
||||
}
|
||||
return rv, nil
|
||||
}
|
||||
|
||||
type _bintree_t struct {
|
||||
Func func() ([]byte, error)
|
||||
Children map[string]*_bintree_t
|
||||
}
|
||||
|
||||
var _bintree = &_bintree_t{nil, map[string]*_bintree_t{
|
||||
"assets": &_bintree_t{nil, map[string]*_bintree_t{
|
||||
"templates": &_bintree_t{nil, map[string]*_bintree_t{
|
||||
"index.html": &_bintree_t{assets_templates_index_html, map[string]*_bintree_t{}},
|
||||
"layout.html": &_bintree_t{assets_templates_layout_html, map[string]*_bintree_t{}},
|
||||
}},
|
||||
"images": &_bintree_t{nil, map[string]*_bintree_t{
|
||||
"ajax-loader.gif": &_bintree_t{assets_images_ajax_loader_gif, map[string]*_bintree_t{}},
|
||||
"github.png": &_bintree_t{assets_images_github_png, map[string]*_bintree_t{}},
|
||||
"hog.png": &_bintree_t{assets_images_hog_png, map[string]*_bintree_t{}},
|
||||
}},
|
||||
"js": &_bintree_t{nil, map[string]*_bintree_t{
|
||||
"controllers.js": &_bintree_t{assets_js_controllers_js, map[string]*_bintree_t{}},
|
||||
}},
|
||||
}},
|
||||
}}
|
||||
|
|
|
|||
Loading…
Reference in a new issue