summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkali kaneko (leap communications) <kali@leap.se>2020-06-16 22:05:10 +0200
committerkali kaneko (leap communications) <kali@leap.se>2020-06-26 12:13:38 +0200
commitd41ddde8f2541c50425dc62a7931a1c4e54188b9 (patch)
tree192982f991fd9a04d81583e857f0e11759693dac
parentf174e76156759cf28cbe067d1270395cee425758 (diff)
[pkg] add generation of vendored config again
-rw-r--r--Makefile2
-rw-r--r--gui/backend.go2
-rw-r--r--pkg/config/config.go2
3 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 9c2180f..18434d0 100644
--- a/Makefile
+++ b/Makefile
@@ -138,7 +138,7 @@ ifeq (${SKIP_CACHECK}, no)
endif
generate:
- @go generate cmd/bitmask-vpn/main.go
+ @go generate gui/backend.go
relink_default:
ifneq (,$(wildcard ${DEFAULT_PROVIDER}))
diff --git a/gui/backend.go b/gui/backend.go
index ab96edb..edb2b17 100644
--- a/gui/backend.go
+++ b/gui/backend.go
@@ -1,5 +1,7 @@
package main
+//go:generate python3 ../branding/scripts/vendorize.py ../branding/templates/bitmaskvpn/config.go ../branding/config/vendor.conf ../pkg/config/config.go
+
/* a wrapper around bitmask that exposes status to a QtQml gui.
Have a look at the pkg/backend module for further enlightment. */
diff --git a/pkg/config/config.go b/pkg/config/config.go
index 4228dae..ad159a1 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -1,6 +1,6 @@
// Code generated by go generate; DO NOT EDIT.
// This file was generated by vendorize.py
-// At 2020-04-14 18:42:06
+// At 2020-06-16 21:44:41
package config