Merge branch 'embed-without-ruby'

coyim · Aug 1, 2017 · 7650390 · 7650390
2 parents 8285260 + 66a93ef
commit 7650390
Show file tree

Hide file tree

Showing 47 changed files with 3,729 additions and 4,763 deletions.
diff --git a/Makefile b/Makefile
@@ -15,7 +15,7 @@ build: build-cli build-gui
 # This should not be added as a requirement to build-gui because it may hide
 # build problems. build-gui is exactly what `go get` will do on a clean repo
 gen-ui-defs:
-	make -C ./gui/definitions
+	make -C ./gui
 
 gen-schema-defs:
 	make -C ./gui/settings/definitions
@@ -102,6 +102,7 @@ deps-dev:
 	go get -u github.com/golang/lint/golint
 	go get -u github.com/modocache/gover
 	go get -u github.com/tools/godep
+	go get -u github.com/rosatolen/esc
 
 deps: deps-dev
 

diff --git a/ci/Makefile b/ci/Makefile
@@ -28,7 +28,7 @@ endif
 
 # make sure the ui definitions checked in are in sync
 check-ui-defs:
-	make doctor -C ../gui/definitions
+	make doctor -C ../gui
 
 # send coverage data to coveralls
 coveralls:

diff --git a/gui/Makefile b/gui/Makefile
@@ -0,0 +1,8 @@
+generate:
+	go generate -x .
+
+touch:
+	ls definitions/*.xml | xargs -n1 touch
+
+doctor: touch generate
+	git diff --exit-code .
diff --git a/gui/definitions.go b/gui/definitions.go
diff --git a/gui/definitions/account_details.go b/gui/definitions/account_details.go
diff --git a/gui/definitions/account_registration.go b/gui/definitions/account_registration.go
diff --git a/gui/definitions/add_contact.go b/gui/definitions/add_contact.go