invert the behavior of the build flag for the webui

Michael Muré created 7 years ago

Now produce by default a build with the packed webui, to make it go gettable properly.

fix #33

Change summary

Makefile               | 10 +++++++---
webui/debug_assets.go  |  2 +-
webui/pack_webui.go    |  2 +-
webui/packed_assets.go | 10 +++++-----
4 files changed, 14 insertions(+), 10 deletions(-)

Detailed changes

Makefile

@@ -2,11 +2,11 @@ all: build
 
 build:
 	go generate
-	go build -tags=deploy_build .
+	go build .
 
 install:
 	go generate
-	go install -tags=deploy_build .
+	go install .
 
 test:
 	go test -bench=. ./...
@@ -15,6 +15,10 @@ pack-webui:
 	npm run --prefix webui build
 	go run webui/pack_webui.go
 
+# produce a build that will fetch the web UI from the filesystem instead of from the binary
+debug-webui:
+	go build -tags=debugwebui
+
 clean-local-bugs:
 	git for-each-ref refs/bugs/ | cut -f 2 | xargs -r -n 1 git update-ref -d
 	git for-each-ref refs/remotes/origin/bugs/ | cut -f 2 | xargs -r -n 1 git update-ref -d
@@ -22,4 +26,4 @@ clean-local-bugs:
 clean-remote-bugs:
 	git ls-remote origin "refs/bugs/*" | cut -f 2 | xargs -r git push origin -d
 
-.PHONY: build install test pack-webui clean-local-bugs clean-remote-bugs
+.PHONY: build install test pack-webui debug-webui clean-local-bugs clean-remote-bugs

webui/debug_assets.go

@@ -1,4 +1,4 @@
-// +build !deploy_build
+// +build debugwebui
 
 package webui
 

webui/pack_webui.go

@@ -28,7 +28,7 @@ func main() {
 	err := vfsgen.Generate(webUIAssets, vfsgen.Options{
 		Filename:     "webui/packed_assets.go",
 		PackageName:  "webui",
-		BuildTags:    "deploy_build",
+		BuildTags:    "!debugwebui",
 		VariableName: "WebUIAssets",
 	})
 

webui/packed_assets.go

@@ -1,6 +1,6 @@
 // Code generated by vfsgen; DO NOT EDIT.
 
-// +build deploy_build
+// +build !debugwebui
 
 package webui
 
@@ -21,57 +21,57 @@ var WebUIAssets = func() http.FileSystem {
 	fs := vfsgen۰FS{
 		"/": &vfsgen۰DirInfo{
 			name:    "/",
-			modTime: time.Date(2018, 8, 17, 11, 20, 44, 389618349, time.UTC),
+			modTime: time.Date(2018, 9, 1, 22, 4, 2, 592936474, time.UTC),
 		},
 		"/asset-manifest.json": &vfsgen۰CompressedFileInfo{
 			name:             "asset-manifest.json",
-			modTime:          time.Date(2018, 8, 17, 11, 20, 44, 281619771, time.UTC),
+			modTime:          time.Date(2018, 9, 1, 22, 4, 2, 444935452, time.UTC),
 			uncompressedSize: 96,
 
-			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xaa\xe6\x52\x50\x50\xca\x4d\xcc\xcc\xd3\xcb\x2a\x56\xb2\x52\x50\x2a\x2e\x49\x2c\xc9\x4c\xd6\xcf\x2a\xd6\x07\x0b\x9a\x58\x26\x5b\x58\xa6\x18\xa6\x80\x64\x75\x90\x94\xea\xe5\x26\x16\xe0\x57\x0e\x56\xc1\x55\x0b\x08\x00\x00\xff\xff\x63\x92\xa7\xbd\x60\x00\x00\x00"),
+			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xaa\xe6\x52\x50\x50\xca\x4d\xcc\xcc\xd3\xcb\x2a\x56\xb2\x52\x50\x2a\x2e\x49\x2c\xc9\x4c\xd6\xcf\x2a\xd6\x07\x0b\xa6\x9a\x19\x5a\x58\x98\xa7\x9a\x81\x64\x75\x90\x94\xea\xe5\x26\x16\xe0\x57\x0e\x56\xc1\x55\x0b\x08\x00\x00\xff\xff\x18\x4b\x33\x4e\x60\x00\x00\x00"),
 		},
 		"/favicon.ico": &vfsgen۰CompressedFileInfo{
 			name:             "favicon.ico",
-			modTime:          time.Date(2018, 8, 17, 11, 20, 27, 285843739, time.UTC),
+			modTime:          time.Date(2018, 9, 1, 22, 3, 49, 112843421, time.UTC),
 			uncompressedSize: 3870,