github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

relocate point main

pull/2034/head
v2ray 2016-07-27 21:55:01 +02:00
parent d2233136ba
commit 5cf36c4520
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
release/server/main.go → shell/point/main/main.go
View File

2
testing/scenarios/server_env.go
View File

@ -41,7 +41,7 @@ func BuildV2Ray() error {
if runtime.GOOS == "windows" { if runtime.GOOS == "windows" {
binaryPath += ".exe" binaryPath += ".exe"
} }
cmd := exec.Command("go", "build", "-tags=json", "-o="+binaryPath, filepath.Join("github.com", "v2ray", "v2ray-core", "release", "server")) cmd := exec.Command("go", "build", "-tags=json", "-o="+binaryPath, filepath.Join("github.com", "v2ray", "v2ray-core", "shell", "point", "main"))
return cmd.Run() return cmd.Run()
} }

2
tools/build/go.go
View File

@ -14,7 +14,7 @@ func buildV2Ray(targetFile string, version string, goOS GoOS, goArch GoArch) err
today := fmt.Sprintf("%04d%02d%02d", year, int(month), day) today := fmt.Sprintf("%04d%02d%02d", year, int(month), day)
ldFlags = ldFlags + " -X github.com/v2ray/v2ray-core.version=" + version + " -X github.com/v2ray/v2ray-core.build=" + today ldFlags = ldFlags + " -X github.com/v2ray/v2ray-core.version=" + version + " -X github.com/v2ray/v2ray-core.build=" + today
} }
cmd := exec.Command("go", "build", "-tags", "json", "-o", targetFile, "-compiler", "gc", "-ldflags", ldFlags, "github.com/v2ray/v2ray-core/release/server") cmd := exec.Command("go", "build", "-tags", "json", "-o", targetFile, "-compiler", "gc", "-ldflags", ldFlags, "github.com/v2ray/v2ray-core/shell/point/main")
cmd.Env = append(cmd.Env, "GOOS="+string(goOS), "GOARCH="+string(goArch)) cmd.Env = append(cmd.Env, "GOOS="+string(goOS), "GOARCH="+string(goArch))
cmd.Env = append(cmd.Env, os.Environ()...) cmd.Env = append(cmd.Env, os.Environ()...)
output, err := cmd.CombinedOutput() output, err := cmd.CombinedOutput()