summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Carr <[email protected]>2024-11-29 12:00:19 -0600
committerJeff Carr <[email protected]>2024-11-29 12:00:19 -0600
commit69093ef5de0eb6a5f78ff55e3e28c416224e8232 (patch)
tree16fd9906fbe58f65ac75380920e22f04a69b86a0
parentdc640a6ccb70fa15a7d0cf3132aa0d484ea3b0f4 (diff)
standard header
Signed-off-by: Jeff Carr <[email protected]>
-rw-r--r--main.go8
-rw-r--r--marshal.go5
-rw-r--r--testautogen/Makefile2
3 files changed, 8 insertions, 7 deletions
diff --git a/main.go b/main.go
index 312843b..ddd39f8 100644
--- a/main.go
+++ b/main.go
@@ -85,8 +85,7 @@ func main() {
marshal(sortmap)
}
-func header(w io.Writer, names map[string]string) {
- fmt.Fprintln(w, "package "+names["package"])
+func headerComment(w io.Writer) {
fmt.Fprintln(w, "")
fmt.Fprintln(w, "// this file was autogenerated with autogenpb")
fmt.Fprintln(w, "//")
@@ -94,6 +93,11 @@ func header(w io.Writer, names map[string]string) {
fmt.Fprintln(w, "//")
fmt.Fprintln(w, "// go install go.wit.com/apps/autogenpb@latest")
fmt.Fprintln(w, "")
+}
+
+func header(w io.Writer, names map[string]string) {
+ fmt.Fprintln(w, "package "+names["package"])
+ headerComment(w)
fmt.Fprintln(w, "import (")
fmt.Fprintln(w, " \"fmt\"")
fmt.Fprintln(w, " \"os\"")
diff --git a/marshal.go b/marshal.go
index 462468c..9f01cae 100644
--- a/marshal.go
+++ b/marshal.go
@@ -20,10 +20,7 @@ func marshal(names map[string]string) {
w, _ := os.OpenFile(names["protobase"]+".marshal.pb.go", os.O_WRONLY|os.O_CREATE, 0600)
fmt.Fprintln(w, "package "+names["package"])
- fmt.Fprintln(w, "")
- fmt.Fprintln(w, "// todo: autogen this")
- fmt.Fprintln(w, "// functions to import and export the protobuf")
- fmt.Fprintln(w, "")
+ headerComment(w)
fmt.Fprintln(w, "import (")
fmt.Fprintln(w, " \"google.golang.org/protobuf/encoding/protojson\"")
fmt.Fprintln(w, " \"google.golang.org/protobuf/encoding/prototext\"")
diff --git a/testautogen/Makefile b/testautogen/Makefile
index 4cde6ea..576ea95 100644
--- a/testautogen/Makefile
+++ b/testautogen/Makefile
@@ -3,7 +3,7 @@ BUILDTIME = $(shell date +%Y.%m.%d)
test: vet
-all: clean test.pb.go run goimports vet
+all: clean test.pb.go run vet
run:
../autogenpb --proto test.proto --lobase gitTag --upbase GitTag --sort "ByPath,Refname"