internal/gen: use new DO NOT EDIT comment standard.

See proposal golang/go#13560. Also updated gen.go to include all packages using internal/gen and to update the “Copy” comment. Change-Id: Iad084642af3700a112b4305aef0c55b475893106 Reviewed-on: https://go-review.googlesource.com/38368 Run-TryBot: Marcel van Lohuizen <[email protected]> Reviewed-by: Brad Fitzpatrick <[email protected]>
golang · Mar 23, 2017 · fc7fa09 · fc7fa09
1 parent 08e2be0
commit fc7fa09
Show file tree

Hide file tree

Showing 34 changed files with 43 additions and 36 deletions.
diff --git a/cases/tables.go b/cases/tables.go
diff --git a/cases/tables_test.go b/cases/tables_test.go
diff --git a/cases/trieval.go b/cases/trieval.go
diff --git a/collate/tables.go b/collate/tables.go
diff --git a/currency/common.go b/currency/common.go
diff --git a/currency/tables.go b/currency/tables.go
diff --git a/encoding/htmlindex/tables.go b/encoding/htmlindex/tables.go
diff --git a/encoding/ianaindex/tables.go b/encoding/ianaindex/tables.go
diff --git a/encoding/internal/identifier/mib.go b/encoding/internal/identifier/mib.go
diff --git a/gen.go b/gen.go
@@ -104,8 +104,10 @@ func main() {
 		cases      = generate("./cases", unicode, norm, language, rangetable)
 		width      = generate("./width", unicode)
 		bidi       = generate("./unicode/bidi", unicode, norm, rangetable)
+		mib        = generate("./encoding/internal/identifier", unicode)
+		_          = generate("./encoding/htmlindex", unicode, language, mib)
+		_          = generate("./encoding/ianaindex", unicode, language, mib)
 		_          = generate("./secure/precis", unicode, norm, rangetable, cases, width, bidi)
-		_          = generate("./encoding/htmlindex", unicode, language)
 		_          = generate("./currency", unicode, cldr, language, internal)
 		_          = generate("./internal/number", unicode, cldr, language, internal)
 		_          = generate("./internal/export/idna", unicode, bidi, norm)
@@ -254,8 +256,13 @@ func copyPackage(dirSrc, dirDst, search, replace string) {
 		b = bytes.Replace(b, []byte(search), []byte(replace), -1)
 		// Remove go:generate lines.
 		b = goGenRE.ReplaceAllLiteral(b, nil)
-		const comment = "// Copied from the golang.org/x/text repo; DO NOT EDIT\n\n"
-		b = append([]byte(comment), b...)
+		comment := "// Code generated by running \"go generate\" in golang.org/x/text. DO NOT EDIT.\n\n"
+		if *doCore {
+			comment = "// Code generated by running \"go run gen.go -core\" in golang.org/x/text. DO NOT EDIT.\n\n"
+		}
+		if !bytes.HasPrefix(b, []byte(comment)) {
+			b = append([]byte(comment), b...)
+		}
 		if b, err = format.Source(b); err != nil {
 			fmt.Println("Failed to format file:", err)
 			os.Exit(1)

diff --git a/internal/export/idna/common_test.go b/internal/export/idna/common_test.go
diff --git a/internal/export/idna/tables.go b/internal/export/idna/tables.go
diff --git a/internal/export/idna/trieval.go b/internal/export/idna/trieval.go
diff --git a/internal/gen/gen.go b/internal/gen/gen.go
@@ -67,7 +67,7 @@ func Init() {
 	flag.Parse()
 }
 
-const header = `// This file was generated by go generate; DO NOT EDIT
+const header = `// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
 
 package %s
 

diff --git a/internal/tables.go b/internal/tables.go
diff --git a/language/common.go b/language/common.go
diff --git a/language/display/tables.go b/language/display/tables.go
diff --git a/language/index.go b/language/index.go
diff --git a/language/tables.go b/language/tables.go
diff --git a/search/tables.go b/search/tables.go
diff --git a/secure/precis/tables.go b/secure/precis/tables.go
diff --git a/secure/precis/trieval.go b/secure/precis/trieval.go
diff --git a/unicode/bidi/ranges_test.go b/unicode/bidi/ranges_test.go
diff --git a/unicode/bidi/tables.go b/unicode/bidi/tables.go
diff --git a/unicode/bidi/trieval.go b/unicode/bidi/trieval.go
diff --git a/unicode/cldr/xml.go b/unicode/cldr/xml.go
diff --git a/unicode/norm/tables.go b/unicode/norm/tables.go
diff --git a/unicode/rangetable/tables.go b/unicode/rangetable/tables.go
diff --git a/unicode/runenames/bits.go b/unicode/runenames/bits.go
diff --git a/unicode/runenames/tables.go b/unicode/runenames/tables.go
diff --git a/width/common_test.go b/width/common_test.go
diff --git a/width/runes_test.go b/width/runes_test.go
diff --git a/width/tables.go b/width/tables.go
diff --git a/width/trieval.go b/width/trieval.go