unified import path

This commit is contained in:
v2ray committed 2016-08-20 20:55:45 +02:00
1 parent 6a878432dc
commit 07a86f549b
248 files changed
+759 -757

No files matched your search

+1 -1
View File
@@ -7,7 +7,7 @@ import (
"path/filepath"
"runtime"
"github.com/v2ray/v2ray-core/tools/git"
"v2ray.com/core/tools/git"
)
var (
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"path/filepath"
"testing"
"github.com/v2ray/v2ray-core/testing/assert"
"v2ray.com/core/testing/assert"
)
func cleanBinPath() {
+1 -1
View File
@@ -3,7 +3,7 @@ package main
import (
"testing"
"github.com/v2ray/v2ray-core/testing/assert"
"v2ray.com/core/testing/assert"
)
func TestParseOS(t *testing.T) {
+2 -2
View File
@@ -12,9 +12,9 @@ func buildV2Ray(targetFile string, version string, goOS GoOS, goArch GoArch) err
if version != "custom" {
year, month, day := time.Now().UTC().Date()
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 v2ray.com/core.version=" + version + " -X v2ray.com/core.build=" + today
}
cmd := exec.Command("go", "build", "-tags", "json", "-o", targetFile, "-compiler", "gc", "-ldflags", ldFlags, "github.com/v2ray/v2ray-core/shell/point/main")
cmd := exec.Command("go", "build", "-tags", "json", "-o", targetFile, "-compiler", "gc", "-ldflags", ldFlags, "v2ray.com/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()
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"testing"
"time"
"github.com/v2ray/v2ray-core/testing/assert"
"v2ray.com/core/testing/assert"
)
func TestBuildAndRun(t *testing.T) {