From 694180fc9aa9108e8bcc06b6ca54cb6c94367714 Mon Sep 17 00:00:00 2001 From: rprx <63339210+rprx@users.noreply.github.com> Date: Sun, 28 Jun 2020 00:46:43 +0800 Subject: [PATCH] Add windows arm build (#39) * Add windows arm build * Add windows arm build * Add windows arm build --- infra/bazel/matrix.bzl | 1 + main/targets.bzl | 50 +++++++++++++++++++++++++++++++++++++++++- release/BUILD | 31 ++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 1 deletion(-) diff --git a/infra/bazel/matrix.bzl b/infra/bazel/matrix.bzl index 2b821d02f..1c53021d9 100644 --- a/infra/bazel/matrix.bzl +++ b/infra/bazel/matrix.bzl @@ -1,6 +1,7 @@ SUPPORTED_MATRIX = [ ("windows", "amd64"), ("windows", "386"), + ("windows", "arm"), ("darwin", "amd64"), ("linux", "amd64"), ("linux", "386"), diff --git a/main/targets.bzl b/main/targets.bzl index acff91a2f..3d16541cc 100644 --- a/main/targets.bzl +++ b/main/targets.bzl @@ -36,6 +36,54 @@ def gen_targets(matrix): base = ":" + bin_name, ) + bin_name = "v2ray_" + os + "_" + arch + "_armv7_nowindow" + foreign_go_binary( + name = bin_name, + pkg = pkg, + output = "w" + output + "_armv7", + os = os, + arch = arch, + arm = "7", + ld = "-H windowsgui", + ) + + gpg_sign( + name = bin_name + "_sig", + base = ":" + bin_name, + ) + + bin_name = "v2ray_" + os + "_" + arch + "_armv6_nowindow" + foreign_go_binary( + name = bin_name, + pkg = pkg, + output = "w" + output + "_armv6", + os = os, + arch = arch, + arm = "6", + ld = "-H windowsgui", + ) + + gpg_sign( + name = bin_name + "_sig", + base = ":" + bin_name, + ) + + bin_name = "v2ray_" + os + "_" + arch + "_armv5_nowindow" + foreign_go_binary( + name = bin_name, + pkg = pkg, + output = "w" + output + "_armv5", + os = os, + arch = arch, + arm = "5", + ld = "-H windowsgui", + ) + + gpg_sign( + name = bin_name + "_sig", + base = ":" + bin_name, + ) + if arch in ["mips", "mipsle"]: bin_name = "v2ray_" + os + "_" + arch + "_softfloat" foreign_go_binary( @@ -96,4 +144,4 @@ def gen_targets(matrix): gpg_sign( name = bin_name + "_sig", base = ":" + bin_name, - ) \ No newline at end of file + ) diff --git a/release/BUILD b/release/BUILD index 86566cc45..da2c6d9ab 100644 --- a/release/BUILD +++ b/release/BUILD @@ -82,6 +82,37 @@ pkg_zip( mappings = gen_mappings("windows", "386"), ) +pkg_zip( + name = "v2ray_windows_arm_package", + srcs = [ + ":config_json", + ":doc", + ":geodata", + "//infra/control/main:v2ctl_windows_arm", + "//infra/control/main:v2ctl_windows_arm_sig", + "//infra/control/main:v2ctl_windows_arm_armv7", + "//infra/control/main:v2ctl_windows_arm_armv7_sig", + "//main:v2ray_windows_arm", + "//main:v2ray_windows_arm_sig", + "//main:v2ray_windows_arm_nowindow", + "//main:v2ray_windows_arm_nowindow_sig", + "//main:v2ray_windows_arm_armv5", + "//main:v2ray_windows_arm_armv5_sig", + "//main:v2ray_windows_arm_armv5_nowindow", + "//main:v2ray_windows_arm_armv5_nowindow_sig", + "//main:v2ray_windows_arm_armv6", + "//main:v2ray_windows_arm_armv6_sig", + "//main:v2ray_windows_arm_armv6_nowindow", + "//main:v2ray_windows_arm_armv6_nowindow_sig", + "//main:v2ray_windows_arm_armv7", + "//main:v2ray_windows_arm_armv7_sig", + "//main:v2ray_windows_arm_armv7_nowindow", + "//main:v2ray_windows_arm_armv7_nowindow_sig", + ], + out = "v2ray-windows-arm.zip", + mappings = gen_mappings("windows", "arm"), +) + pkg_zip( name = "v2ray_freebsd_amd64_package", srcs = [