From a82ca019b2e3fbb3b83e29e46762bec68f038f4f Mon Sep 17 00:00:00 2001 From: Darien Raymond Date: Mon, 25 Dec 2017 21:54:44 +0100 Subject: [PATCH] release script relocation --- app/router/condition_test.go | 2 +- common/net/ipnet_test.go | 6 +++--- {tools/release => release}/config/geoip.dat | Bin {tools/release => release}/config/geosite.dat | 0 .../config/systemd/v2ray.service | 0 {tools/release => release}/config/systemv/v2ray | 0 .../config/vpoint_socks_vmess.json | 0 .../config/vpoint_vmess_freedom.json | 0 {tools/release => release}/doc/readme.md | 2 +- {tools/release => release}/make-release.sh | 0 {tools/release => release}/release-ci.sh | 0 .../release => release}/verify/official_release.asc | 0 tools/tools.go | 2 -- 13 files changed, 5 insertions(+), 7 deletions(-) rename {tools/release => release}/config/geoip.dat (100%) rename {tools/release => release}/config/geosite.dat (100%) rename {tools/release => release}/config/systemd/v2ray.service (100%) rename {tools/release => release}/config/systemv/v2ray (100%) rename {tools/release => release}/config/vpoint_socks_vmess.json (100%) rename {tools/release => release}/config/vpoint_vmess_freedom.json (100%) rename {tools/release => release}/doc/readme.md (92%) rename {tools/release => release}/make-release.sh (100%) rename {tools/release => release}/release-ci.sh (100%) rename {tools/release => release}/verify/official_release.asc (100%) delete mode 100644 tools/tools.go diff --git a/app/router/condition_test.go b/app/router/condition_test.go index 50611f294..e4a097537 100644 --- a/app/router/condition_test.go +++ b/app/router/condition_test.go @@ -211,7 +211,7 @@ func loadGeoSite(country string) ([]*Domain, error) { func TestChinaSites(t *testing.T) { assert := With(t) - common.Must(sysio.CopyFile(platform.GetAssetLocation("geosite.dat"), filepath.Join(os.Getenv("GOPATH"), "src", "v2ray.com", "core", "tools", "release", "config", "geosite.dat"))) + common.Must(sysio.CopyFile(platform.GetAssetLocation("geosite.dat"), filepath.Join(os.Getenv("GOPATH"), "src", "v2ray.com", "core", "release", "config", "geosite.dat"))) domains, err := loadGeoSite("CN") assert(err, IsNil) diff --git a/common/net/ipnet_test.go b/common/net/ipnet_test.go index 2943e59a6..77bab96b7 100644 --- a/common/net/ipnet_test.go +++ b/common/net/ipnet_test.go @@ -54,7 +54,7 @@ func TestIPNet(t *testing.T) { func TestGeoIPCN(t *testing.T) { assert := With(t) - common.Must(sysio.CopyFile(platform.GetAssetLocation("geoip.dat"), filepath.Join(os.Getenv("GOPATH"), "src", "v2ray.com", "core", "tools", "release", "config", "geoip.dat"))) + common.Must(sysio.CopyFile(platform.GetAssetLocation("geoip.dat"), filepath.Join(os.Getenv("GOPATH"), "src", "v2ray.com", "core", "release", "config", "geoip.dat"))) ips, err := loadGeoIP("CN") common.Must(err) @@ -87,7 +87,7 @@ func loadGeoIP(country string) ([]*router.CIDR, error) { } func BenchmarkIPNetQuery(b *testing.B) { - common.Must(sysio.CopyFile(platform.GetAssetLocation("geoip.dat"), filepath.Join(os.Getenv("GOPATH"), "src", "v2ray.com", "core", "tools", "release", "config", "geoip.dat"))) + common.Must(sysio.CopyFile(platform.GetAssetLocation("geoip.dat"), filepath.Join(os.Getenv("GOPATH"), "src", "v2ray.com", "core", "release", "config", "geoip.dat"))) ips, err := loadGeoIP("CN") common.Must(err) @@ -105,7 +105,7 @@ func BenchmarkIPNetQuery(b *testing.B) { } func BenchmarkCIDRQuery(b *testing.B) { - common.Must(sysio.CopyFile(platform.GetAssetLocation("geoip.dat"), filepath.Join(os.Getenv("GOPATH"), "src", "v2ray.com", "core", "tools", "release", "config", "geoip.dat"))) + common.Must(sysio.CopyFile(platform.GetAssetLocation("geoip.dat"), filepath.Join(os.Getenv("GOPATH"), "src", "v2ray.com", "core", "release", "config", "geoip.dat"))) ips, err := loadGeoIP("CN") common.Must(err) diff --git a/tools/release/config/geoip.dat b/release/config/geoip.dat similarity index 100% rename from tools/release/config/geoip.dat rename to release/config/geoip.dat diff --git a/tools/release/config/geosite.dat b/release/config/geosite.dat similarity index 100% rename from tools/release/config/geosite.dat rename to release/config/geosite.dat diff --git a/tools/release/config/systemd/v2ray.service b/release/config/systemd/v2ray.service similarity index 100% rename from tools/release/config/systemd/v2ray.service rename to release/config/systemd/v2ray.service diff --git a/tools/release/config/systemv/v2ray b/release/config/systemv/v2ray similarity index 100% rename from tools/release/config/systemv/v2ray rename to release/config/systemv/v2ray diff --git a/tools/release/config/vpoint_socks_vmess.json b/release/config/vpoint_socks_vmess.json similarity index 100% rename from tools/release/config/vpoint_socks_vmess.json rename to release/config/vpoint_socks_vmess.json diff --git a/tools/release/config/vpoint_vmess_freedom.json b/release/config/vpoint_vmess_freedom.json similarity index 100% rename from tools/release/config/vpoint_vmess_freedom.json rename to release/config/vpoint_vmess_freedom.json diff --git a/tools/release/doc/readme.md b/release/doc/readme.md similarity index 92% rename from tools/release/doc/readme.md rename to release/doc/readme.md index 8fadb7706..2af2ba4af 100644 --- a/tools/release/doc/readme.md +++ b/release/doc/readme.md @@ -29,7 +29,7 @@ v2ray --config= 压缩包中的 .sig 文件为 GPG 签名文件，用来验证对应程序文件的真实性。签名公钥可以在下面的链接找到： -https://github.com/v2ray/v2ray-core/blob/master/tools/release/verify/official_release.asc +https://github.com/v2ray/v2ray-core/blob/master/release/verify/official_release.asc ## 问题反馈 diff --git a/tools/release/make-release.sh b/release/make-release.sh similarity index 100% rename from tools/release/make-release.sh rename to release/make-release.sh diff --git a/tools/release/release-ci.sh b/release/release-ci.sh similarity index 100% rename from tools/release/release-ci.sh rename to release/release-ci.sh diff --git a/tools/release/verify/official_release.asc b/release/verify/official_release.asc similarity index 100% rename from tools/release/verify/official_release.asc rename to release/verify/official_release.asc diff --git a/tools/tools.go b/tools/tools.go deleted file mode 100644 index 61f89aea9..000000000 --- a/tools/tools.go +++ /dev/null @@ -1,2 +0,0 @@ -// Package tools contains utilities that is not directly linked into V2Ray binary. -package tools