瀏覽代碼

move json config into a separate package

Darien Raymond 7 年之前
父節點
當前提交
ab9ca3b842

+ 3 - 0
main/distro/all/all.go

@@ -42,4 +42,7 @@ import (
 	_ "v2ray.com/core/transport/internet/headers/srtp"
 	_ "v2ray.com/core/transport/internet/headers/utp"
 	_ "v2ray.com/core/transport/internet/headers/wechat"
+
+	// JSON config format
+	_ "v2ray.com/core/main/json"
 )

+ 3 - 1
main/config_json.go → main/json/config_json.go

@@ -1,4 +1,6 @@
-package main
+package json
+
+//go:generate go run $GOPATH/src/v2ray.com/core/common/errors/errorgen/main.go -pkg json -path Main,Json
 
 import (
 	"context"

+ 1 - 1
main/config_json_other.go → main/json/config_json_other.go

@@ -1,6 +1,6 @@
 // +build !windows
 
-package main
+package json
 
 import "syscall"
 

+ 1 - 1
main/config_json_windows.go → main/json/config_json_windows.go

@@ -1,6 +1,6 @@
 // +build windows
 
-package main
+package json
 
 import "syscall"
 

+ 5 - 0
main/json/errors.generated.go

@@ -0,0 +1,5 @@
+package json
+
+import "v2ray.com/core/common/errors"
+
+func newError(values ...interface{}) *errors.Error { return errors.New(values...).Path("Main", "Json") }