lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-27 04:27:20 -05:00
Code Issues Releases Wiki Activity

Make variables of vprotogen easier to find

Browse Source
This commit is contained in:
loyalsoldier 2020-10-04 10:05:00 +08:00
parent edefca7932
commit 9b249f912b
No known key found for this signature in database
GPG Key ID: 23829BBC1ACF2C90
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
infra/vprotogen/main.go
View File

@ -8,17 +8,10 @@ import (
"runtime" "runtime"
"strings" "strings"
"v2ray.com/core"
"v2ray.com/core/common" "v2ray.com/core/common"
) )
var protoFilesUsingProtocGenGoFast = map[string]bool{"proxy/vless/encoding/addons.proto": true}
var protocMap = map[string]string{
"windows": filepath.Join(".dev", "protoc", "windows", "protoc.exe"),
"darwin": filepath.Join(".dev", "protoc", "macos", "protoc"),
"linux": filepath.Join(".dev", "protoc", "linux", "protoc"),
}
func main() { func main() {
pwd, wdErr := os.Getwd() pwd, wdErr := os.Getwd()
if wdErr != nil { if wdErr != nil {
@ -27,7 +20,7 @@ func main() {
} }
GOBIN := common.GetGOBIN() GOBIN := common.GetGOBIN()
protoc := protocMap[runtime.GOOS] protoc := core.ProtocMap[runtime.GOOS]
protoFilesMap := make(map[string][]string) protoFilesMap := make(map[string][]string)
walkErr := filepath.Walk("./", func(path string, info os.FileInfo, err error) error { walkErr := filepath.Walk("./", func(path string, info os.FileInfo, err error) error {
@ -56,7 +49,7 @@ func main() {
for _, files := range protoFilesMap { for _, files := range protoFilesMap {
for _, relProtoFile := range files { for _, relProtoFile := range files {
var args []string var args []string
if protoFilesUsingProtocGenGoFast[relProtoFile] { if core.ProtoFilesUsingProtocGenGoFast[relProtoFile] {
args = []string{"--gofast_out", pwd, "--plugin", "protoc-gen-gofast=" + GOBIN + "/protoc-gen-gofast"} args = []string{"--gofast_out", pwd, "--plugin", "protoc-gen-gofast=" + GOBIN + "/protoc-gen-gofast"}
} else { } else {
args = []string{"--go_out", pwd, "--go-grpc_out", pwd, "--plugin", "protoc-gen-go=" + GOBIN + "/protoc-gen-go", "--plugin", "protoc-gen-go-grpc=" + GOBIN + "/protoc-gen-go-grpc"} args = []string{"--go_out", pwd, "--go-grpc_out", pwd, "--plugin", "protoc-gen-go=" + GOBIN + "/protoc-gen-go", "--plugin", "protoc-gen-go-grpc=" + GOBIN + "/protoc-gen-go-grpc"}

13
proto.go
View File

@ -4,3 +4,16 @@ package core
//go:generate go install -v google.golang.org/grpc/cmd/protoc-gen-go-grpc //go:generate go install -v google.golang.org/grpc/cmd/protoc-gen-go-grpc
//go:generate go install -v github.com/gogo/protobuf/protoc-gen-gofast //go:generate go install -v github.com/gogo/protobuf/protoc-gen-gofast
//go:generate go run ./infra/vprotogen/main.go //go:generate go run ./infra/vprotogen/main.go
import "path/filepath"
// ProtoFilesUsingProtocGenGoFast is the map of Proto files
// that use `protoc-gen-gofast` to generate pb.go files
var ProtoFilesUsingProtocGenGoFast = map[string]bool{"proxy/vless/encoding/addons.proto": true}
// ProtocMap is the map of paths to `protoc` binary excutable files of specific platform
var ProtocMap = map[string]string{
"windows": filepath.Join(".dev", "protoc", "windows", "protoc.exe"),
"darwin": filepath.Join(".dev", "protoc", "macos", "protoc"),
"linux": filepath.Join(".dev", "protoc", "linux", "protoc"),
}