lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-02-20 23:47:21 -05:00
Code Issues Releases Wiki Activity

relocate sample configs

Browse Source
This commit is contained in:
v2ray 2016-07-27 21:58:54 +02:00
parent 5cf36c4520
commit 1e9f4a1a08
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
7 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shell/point/config_json_test.go
View File

@ -18,7 +18,7 @@ func TestClientSampleConfig(t *testing.T) {
assert := assert.On(t) assert := assert.On(t)
GOPATH := os.Getenv("GOPATH") GOPATH := os.Getenv("GOPATH")
baseDir := filepath.Join(GOPATH, "src", "github.com", "v2ray", "v2ray-core", "release", "config") baseDir := filepath.Join(GOPATH, "src", "github.com", "v2ray", "v2ray-core", "tools", "release", "config")
pointConfig, err := LoadConfig(filepath.Join(baseDir, "vpoint_socks_vmess.json")) pointConfig, err := LoadConfig(filepath.Join(baseDir, "vpoint_socks_vmess.json"))
assert.Error(err).IsNil() assert.Error(err).IsNil()
@ -38,7 +38,7 @@ func TestServerSampleConfig(t *testing.T) {
assert := assert.On(t) assert := assert.On(t)
GOPATH := os.Getenv("GOPATH") GOPATH := os.Getenv("GOPATH")
baseDir := filepath.Join(GOPATH, "src", "github.com", "v2ray", "v2ray-core", "release", "config") baseDir := filepath.Join(GOPATH, "src", "github.com", "v2ray", "v2ray-core", "tools", "release", "config")
pointConfig, err := LoadConfig(filepath.Join(baseDir, "vpoint_vmess_freedom.json")) pointConfig, err := LoadConfig(filepath.Join(baseDir, "vpoint_vmess_freedom.json"))
assert.Error(err).IsNil() assert.Error(err).IsNil()

2
tools/build/config.go
View File

@ -25,7 +25,7 @@ func copyConfigFile(src, dest string, goOS GoOS, format bool) error {
func copyConfigFiles(dir string, goOS GoOS) error { func copyConfigFiles(dir string, goOS GoOS) error {
GOPATH := os.Getenv("GOPATH") GOPATH := os.Getenv("GOPATH")
srcDir := filepath.Join(GOPATH, "src", "github.com", "v2ray", "v2ray-core", "release", "config") srcDir := filepath.Join(GOPATH, "src", "github.com", "v2ray", "v2ray-core", "tools", "release", "config")
src := filepath.Join(srcDir, "vpoint_socks_vmess.json") src := filepath.Join(srcDir, "vpoint_socks_vmess.json")
dest := filepath.Join(dir, "vpoint_socks_vmess.json") dest := filepath.Join(dir, "vpoint_socks_vmess.json")
if goOS == Windows || goOS == MacOS { if goOS == Windows || goOS == MacOS {

2
tools/build/go_test.go
View File

@ -28,7 +28,7 @@ func TestBuildAndRun(t *testing.T) {
outBuffer := bytes.NewBuffer(make([]byte, 0, 1024)) outBuffer := bytes.NewBuffer(make([]byte, 0, 1024))
errBuffer := bytes.NewBuffer(make([]byte, 0, 1024)) errBuffer := bytes.NewBuffer(make([]byte, 0, 1024))
configFile := filepath.Join(gopath, "src", "github.com", "v2ray", "v2ray-core", "release", "config", "vpoint_socks_vmess.json") configFile := filepath.Join(gopath, "src", "github.com", "v2ray", "v2ray-core", "tools", "release", "config", "vpoint_socks_vmess.json")
cmd := exec.Command(target, "--config="+configFile) cmd := exec.Command(target, "--config="+configFile)
cmd.Stdout = outBuffer cmd.Stdout = outBuffer
cmd.Stderr = errBuffer cmd.Stderr = errBuffer

0
release/config/systemd/v2ray.service → tools/release/config/systemd/v2ray.service
View File

0
release/config/systemv/v2ray → tools/release/config/systemv/v2ray
View File

0
release/config/vpoint_socks_vmess.json → tools/release/config/vpoint_socks_vmess.json
View File

0
release/config/vpoint_vmess_freedom.json → tools/release/config/vpoint_vmess_freedom.json
View File