From 5cf36c45200ec3650146507f5bf90552ce429a67 Mon Sep 17 00:00:00 2001
From: v2ray <admin@v2ray.com>
Date: Wed, 27 Jul 2016 21:55:01 +0200
Subject: [PATCH] relocate point main
---
{release/server => shell/point/main}/main.go | 0
testing/scenarios/server_env.go | 2 +-
tools/build/go.go | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
rename {release/server => shell/point/main}/main.go (100%)
diff --git a/release/server/main.go b/shell/point/main/main.go
similarity index 100%
rename from release/server/main.go
rename to shell/point/main/main.go
diff --git a/testing/scenarios/server_env.go b/testing/scenarios/server_env.go
index 39b32a2b..7e49112b 100644
--- a/testing/scenarios/server_env.go
+++ b/testing/scenarios/server_env.go
@@ -41,7 +41,7 @@ func BuildV2Ray() error {
if runtime.GOOS == "windows" {
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()
}
diff --git a/tools/build/go.go b/tools/build/go.go
index 187a507f..9ba846b3 100644
--- a/tools/build/go.go
+++ b/tools/build/go.go
@@ -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)
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, os.Environ()...)
output, err := cmd.CombinedOutput()