move error generator to common

common/buf/buf.go

@@ -1,3 +1,3 @@
 package buf
 
-//go:generate go run $GOPATH/src/v2ray.com/core/tools/generrorgen/main.go -pkg buf -path Buf
+//go:generate go run $GOPATH/src/v2ray.com/core/common/errors/errorgen/main.go -pkg buf -path Buf

common/common.go

@@ -2,7 +2,7 @@
 // See each sub-package for detail.
 package common
 
-//go:generate go run $GOPATH/src/v2ray.com/core/tools/generrorgen/main.go -pkg common -path Common
+//go:generate go run $GOPATH/src/v2ray.com/core/common/errors/errorgen/main.go -pkg common -path Common
 
 // Must panics if err is not nil.
 func Must(err error) {

common/crypto/crypto.go

@@ -1,4 +1,4 @@
 // Package crypto provides common crypto libraries for V2Ray.
 package crypto
 
-//go:generate go run $GOPATH/src/v2ray.com/core/tools/generrorgen/main.go -pkg crypto -path Crypto
+//go:generate go run $GOPATH/src/v2ray.com/core/common/errors/errorgen/main.go -pkg crypto -path Crypto

common/errors/errorgen/main.go

@@ -0,0 +1,47 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"log"
+	"os"
+	"strings"
+
+	"v2ray.com/core/common"
+)
+
+var (
+	pkg  = flag.String("pkg", "", "Target package")
+	path = flag.String("path", "", "Path")
+)
+
+func main() {
+	flag.Parse()
+
+	if len(*pkg) == 0 {
+		panic("Package is not specified.")
+	}
+
+	if len(*path) == 0 {
+		panic("Path is not specified.")
+	}
+
+	paths := strings.Split(*path, ",")
+	for i := range paths {
+		paths[i] = "\"" + paths[i] + "\""
+	}
+	pathStr := strings.Join(paths, ", ")
+
+	file, err := os.OpenFile("errors.generated.go", os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0644)
+	if err != nil {
+		log.Fatalf("Failed to generate errors.generated.go: %v", err)
+	}
+
+	common.Must2(fmt.Fprintln(file, "package", *pkg))
+	common.Must2(fmt.Fprintln(file, ""))
+	common.Must2(fmt.Fprintln(file, "import \"v2ray.com/core/common/errors\""))
+	common.Must2(fmt.Fprintln(file, ""))
+	common.Must2(fmt.Fprintln(file, "func newError(values ...interface{}) *errors.Error { return errors.New(values...).Path("+pathStr+") }"))
+
+	common.Must(file.Close())
+}

common/net/net.go

@@ -1,4 +1,4 @@
 // Package net is a drop-in replacement to Golang's net package, with some more functionalities.
 package net
 
-//go:generate go run $GOPATH/src/v2ray.com/core/tools/generrorgen/main.go -pkg net -path Net
+//go:generate go run $GOPATH/src/v2ray.com/core/common/errors/errorgen/main.go -pkg net -path Net

common/protocol/protocol.go

@@ -1,3 +1,3 @@
 package protocol
 
-//go:generate go run $GOPATH/src/v2ray.com/core/tools/generrorgen/main.go -pkg protocol -path Protocol
+//go:generate go run $GOPATH/src/v2ray.com/core/common/errors/errorgen/main.go -pkg protocol -path Protocol

common/retry/retry.go

@@ -1,6 +1,6 @@
 package retry
 
-//go:generate go run $GOPATH/src/v2ray.com/core/tools/generrorgen/main.go -pkg retry -path Retry
+//go:generate go run $GOPATH/src/v2ray.com/core/common/errors/errorgen/main.go -pkg retry -path Retry
 
 import (
 	"time"