From e8cad4a1260929642c3aeed361f67dfeccef0a73 Mon Sep 17 00:00:00 2001 From: Darien Raymond Date: Sat, 23 Dec 2017 23:46:24 +0100 Subject: [PATCH] remove old protogen --- tools/genproto/genproto.go | 7 --- tools/genproto/main.go | 96 -------------------------------------- 2 files changed, 103 deletions(-) delete mode 100644 tools/genproto/genproto.go delete mode 100644 tools/genproto/main.go diff --git a/tools/genproto/genproto.go b/tools/genproto/genproto.go deleted file mode 100644 index 7e9599c27..000000000 --- a/tools/genproto/genproto.go +++ /dev/null @@ -1,7 +0,0 @@ -// +build windows darwin linux - -package genproto - -//go:generate go get -u "github.com/golang/protobuf/protoc-gen-go" -//go:generate go get -u "github.com/golang/protobuf/proto" -//go:generate go run main.go diff --git a/tools/genproto/main.go b/tools/genproto/main.go deleted file mode 100644 index 276260f9c..000000000 --- a/tools/genproto/main.go +++ /dev/null @@ -1,96 +0,0 @@ -// +build generate - -package main - -import ( - "bytes" - "fmt" - "io/ioutil" - "os" - "os/exec" - "path/filepath" - "runtime" - "strings" - - "v2ray.com/core/common" -) - -var protocMap = map[string]string{ - "windows": filepath.Join(os.Getenv("GOPATH"), "src", "v2ray.com", "core", ".dev", "protoc", "windows", "protoc.exe"), - "darwin": filepath.Join(os.Getenv("GOPATH"), "src", "v2ray.com", "core", ".dev", "protoc", "macos", "protoc"), - "linux": filepath.Join(os.Getenv("GOPATH"), "src", "v2ray.com", "core", ".dev", "protoc", "linux", "protoc"), -} - -func sdkPath(lang string) string { - path := filepath.Join(os.Getenv("GOPATH"), "src", "github.com", "v2ray", "sdk-"+lang, "proto") - os.MkdirAll(path, os.ModePerm) - return path -} - -func main() { - protofiles := make(map[string][]string) - protoc := protocMap[runtime.GOOS] - gosrc := filepath.Join(os.Getenv("GOPATH"), "src") - reporoot := filepath.Join(gosrc, "v2ray.com", "core") - - filepath.Walk(reporoot, func(path string, info os.FileInfo, err error) error { - if err != nil { - fmt.Println(err) - return err - } - - if info.IsDir() { - return nil - } - - dir := filepath.Dir(path) - filename := filepath.Base(path) - if strings.HasSuffix(filename, ".proto") { - protofiles[dir] = append(protofiles[dir], path) - } - - return nil - }) - - for _, files := range protofiles { - args := []string{"--proto_path", gosrc, "--go_out", gosrc, "--java_out", sdkPath("java")} - args = append(args, files...) - cmd := exec.Command(protoc, args...) - cmd.Env = append(cmd.Env, os.Environ()...) - output, err := cmd.CombinedOutput() - if len(output) > 0 { - fmt.Println(string(output)) - } - if err != nil { - fmt.Println(err) - } - } - - common.Must(filepath.Walk(reporoot, func(path string, info os.FileInfo, err error) error { - if err != nil { - fmt.Println(err) - return err - } - - if info.IsDir() { - return nil - } - - if !strings.HasSuffix(info.Name(), ".pb.go") { - return nil - } - - content, err := ioutil.ReadFile(path) - if err != nil { - return err - } - pos := bytes.Index(content, []byte("\npackage")) - if pos > 0 { - if err := ioutil.WriteFile(path, content[pos+1:], info.Mode()); err != nil { - return err - } - } - - return nil - })) -}