yujunjun/v2ray-core
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-06-26 21:29:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Chore: support the new versioning scheme of Protobuf

Browse Source 
Protobuf has changed their versioning scheme to language-specific one. For Golang, the first version applied the scheme would be 4.21.0 which followed the preceding version,3.20.1. Basically the major part is language-specific and no longer important.
Check more:
https://protobuf.dev/news/2022-05-06/
https://github.com/protocolbuffers/protobuf/issues/11440
https://github.com/protocolbuffers/protobuf/issues/11123
This commit is contained in:
pathC 2023-08-04 17:54:28 +08:00 committed by Xiaokang Wang (Shelikhoo)
parent be8e8accb8
commit 1ef0ee170d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
infra/vprotogen/main.go
View File

@ -119,7 +119,7 @@ func getInstalledProtocVersion(protocPath string) (string, error) {
if cmdErr != nil { if cmdErr != nil {
return "", cmdErr return "", cmdErr
} }
versionRegexp := regexp.MustCompile(`protoc\s*(\d+\.\d+\.\d+)`) versionRegexp := regexp.MustCompile(`protoc\s*(\d+\.\d+(\.\d)*)`)
matched := versionRegexp.FindStringSubmatch(string(output)) matched := versionRegexp.FindStringSubmatch(string(output))
return matched[1], nil return matched[1], nil
} }
@ -128,6 +128,9 @@ func parseVersion(s string, width int) int64 {
strList := strings.Split(s, ".") strList := strings.Split(s, ".")
format := fmt.Sprintf("%%s%%0%ds", width) format := fmt.Sprintf("%%s%%0%ds", width)
v := "" v := ""
if len(strList) == 2 {
strList = append([]string{"4"}, strList...)
}
for _, value := range strList { for _, value := range strList {
v = fmt.Sprintf(format, v, value) v = fmt.Sprintf(format, v, value)
} }