From ab9ca3b842fd11c136c8cb990145caba54d745e7 Mon Sep 17 00:00:00 2001
From: Darien Raymond <admin@v2ray.com>
Date: Sat, 17 Feb 2018 21:22:51 +0100
Subject: [PATCH] move json config into a separate package

---
 main/distro/all/all.go                 | 3 +++
 main/{ => json}/config_json.go         | 4 +++-
 main/{ => json}/config_json_other.go   | 2 +-
 main/{ => json}/config_json_windows.go | 2 +-
 main/json/errors.generated.go          | 5 +++++
 5 files changed, 13 insertions(+), 3 deletions(-)
 rename main/{ => json}/config_json.go (93%)
 rename main/{ => json}/config_json_other.go (88%)
 rename main/{ => json}/config_json_windows.go (91%)
 create mode 100644 main/json/errors.generated.go

diff --git a/main/distro/all/all.go b/main/distro/all/all.go
index 8f5524beb..321c60150 100644
--- a/main/distro/all/all.go
+++ b/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"
 )
diff --git a/main/config_json.go b/main/json/config_json.go
similarity index 93%
rename from main/config_json.go
rename to main/json/config_json.go
index dfc2db674..a98e1ca7c 100644
--- a/main/config_json.go
+++ b/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"
diff --git a/main/config_json_other.go b/main/json/config_json_other.go
similarity index 88%
rename from main/config_json_other.go
rename to main/json/config_json_other.go
index b1502710e..2c52fd109 100644
--- a/main/config_json_other.go
+++ b/main/json/config_json_other.go
@@ -1,6 +1,6 @@
 // +build !windows
 
-package main
+package json
 
 import "syscall"
 
diff --git a/main/config_json_windows.go b/main/json/config_json_windows.go
similarity index 91%
rename from main/config_json_windows.go
rename to main/json/config_json_windows.go
index 01c2b53ba..78f63c795 100644
--- a/main/config_json_windows.go
+++ b/main/json/config_json_windows.go
@@ -1,6 +1,6 @@
 // +build windows
 
-package main
+package json
 
 import "syscall"
 
diff --git a/main/json/errors.generated.go b/main/json/errors.generated.go
new file mode 100644
index 000000000..faf694b90
--- /dev/null
+++ b/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") }