From 0b6769c807b6f4e4ebd0e8fc7d14f26a7f7759df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Tue, 22 Mar 2022 22:38:48 +0000 Subject: [PATCH] remove duplicate go:generate directive I hadn't noticed that cmd/bundle prints its own go:generate directive. I guess that makes sense for the average user running it directly, but that doesn't apply to us, and we end up with duplicate directives. Before: $ go generate -n bundle -o cmdgo_quoted.go -prefix cmdgoQuoted cmd/internal/quoted go run golang.org/x/tools/cmd/bundle@v0.1.9 -o cmdgo_quoted.go -prefix cmdgoQuoted cmd/internal/quoted After: $ go generate -n go run golang.org/x/tools/cmd/bundle@v0.1.9 -o cmdgo_quoted.go -prefix cmdgoQuoted cmd/internal/quoted sed -i /go:generate/d cmdgo_quoted.go While here, I made a typo in the last release notes, because of course. I already edited that out in the GitHub release. --- CHANGELOG.md | 2 +- cmdgo_quoted.go | 1 - main.go | 4 ++++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9bb0f6c..2482c91 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ Noteworthy changes include: * Obfuscation is now fully deterministic with a fixed `-seed` - [#449] * Improve support for type aliases to fix some build failures - [#466] * Add support for quotes in `-ldflags` as per `go help build` - [#492] -* Fail if the current Go version is newer than what build garble - [#269] +* Fail if the current Go version is newer than what built garble - [#269] * Various optimizations resulting in builds being up to 5% faster - [#456] ## [v0.5.1] - 2022-01-18 diff --git a/cmdgo_quoted.go b/cmdgo_quoted.go index e2cea81..ead4ed9 100644 --- a/cmdgo_quoted.go +++ b/cmdgo_quoted.go @@ -1,5 +1,4 @@ // Code generated by golang.org/x/tools/cmd/bundle. DO NOT EDIT. -//go:generate bundle -o cmdgo_quoted.go -prefix cmdgoQuoted cmd/internal/quoted // Package quoted provides string manipulation utilities. // diff --git a/main.go b/main.go index 9b6a85d..0a4eba5 100644 --- a/main.go +++ b/main.go @@ -1157,7 +1157,11 @@ func (tf *transformer) findReflectFunctions(files []*ast.File) { } } +// cmd/bundle will include a go:generate directive in its output by default. +// Ours specifies a version and doesn't assume bundle is in $PATH, so drop it. + //go:generate go run golang.org/x/tools/cmd/bundle@v0.1.9 -o cmdgo_quoted.go -prefix cmdgoQuoted cmd/internal/quoted +//go:generate sed -i /go:generate/d cmdgo_quoted.go // prefillObjectMaps collects objects which should not be obfuscated, // such as those used as arguments to reflect.TypeOf or reflect.ValueOf.