From 6f04b5a50bcc60b062849e94398df8f22ecec7b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8C=85=E5=B8=83=E4=B8=81?= Date: Wed, 5 Jan 2022 00:41:15 +0800 Subject: [PATCH] Add uwp targets (#1416) * add uwp targets * fix gen toml --- crates/libs/sys/Cargo.toml | 15 +++++++++++++++ crates/libs/windows/Cargo.toml | 15 +++++++++++++++ crates/targets/aarch64_msvc/build.rs | 3 ++- crates/targets/i686_gnu/build.rs | 3 ++- crates/targets/i686_msvc/build.rs | 3 ++- crates/targets/x86_64_gnu/build.rs | 3 ++- crates/targets/x86_64_msvc/build.rs | 3 ++- crates/tools/api/src/main.rs | 15 +++++++++++++++ crates/tools/sys/src/main.rs | 15 +++++++++++++++ 9 files changed, 70 insertions(+), 5 deletions(-) diff --git a/crates/libs/sys/Cargo.toml b/crates/libs/sys/Cargo.toml index 7793e0b25e..a1e1a7ebda 100644 --- a/crates/libs/sys/Cargo.toml +++ b/crates/libs/sys/Cargo.toml @@ -16,18 +16,33 @@ all-features = true [target.i686-pc-windows-msvc.dependencies] windows_i686_msvc = { path = "../../targets/i686_msvc", version = "0.29.0" } +[target.i686-uwp-windows-msvc.dependencies] +windows_i686_msvc = { path = "../../targets/i686_msvc", version = "0.29.0" } + [target.x86_64-pc-windows-msvc.dependencies] windows_x86_64_msvc = { path = "../../targets/x86_64_msvc", version = "0.29.0" } +[target.x86_64-uwp-windows-msvc.dependencies] +windows_x86_64_msvc = { path = "../../targets/x86_64_msvc", version = "0.29.0" } + [target.aarch64-pc-windows-msvc.dependencies] windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.29.0" } +[target.aarch64-uwp-windows-msvc.dependencies] +windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.29.0" } + [target.i686-pc-windows-gnu.dependencies] windows_i686_gnu = { path = "../../targets/i686_gnu", version = "0.29.0" } +[target.i686-uwp-windows-gnu.dependencies] +windows_i686_gnu = { path = "../../targets/i686_gnu", version = "0.29.0" } + [target.x86_64-pc-windows-gnu.dependencies] windows_x86_64_gnu = { path = "../../targets/x86_64_gnu", version = "0.29.0" } +[target.x86_64-uwp-windows-gnu.dependencies] +windows_x86_64_gnu = { path = "../../targets/x86_64_gnu", version = "0.29.0" } + [features] default = [] deprecated = [] diff --git a/crates/libs/windows/Cargo.toml b/crates/libs/windows/Cargo.toml index 1cbf5cbe0c..b179653d26 100644 --- a/crates/libs/windows/Cargo.toml +++ b/crates/libs/windows/Cargo.toml @@ -17,18 +17,33 @@ targets = [] [target.i686-pc-windows-msvc.dependencies] windows_i686_msvc = { path = "../../targets/i686_msvc", version = "0.29.0" } +[target.i686-uwp-windows-msvc.dependencies] +windows_i686_msvc = { path = "../../targets/i686_msvc", version = "0.29.0" } + [target.x86_64-pc-windows-msvc.dependencies] windows_x86_64_msvc = { path = "../../targets/x86_64_msvc", version = "0.29.0" } +[target.x86_64-uwp-windows-msvc.dependencies] +windows_x86_64_msvc = { path = "../../targets/x86_64_msvc", version = "0.29.0" } + [target.aarch64-pc-windows-msvc.dependencies] windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.29.0" } +[target.aarch64-uwp-windows-msvc.dependencies] +windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.29.0" } + [target.i686-pc-windows-gnu.dependencies] windows_i686_gnu = { path = "../../targets/i686_gnu", version = "0.29.0" } +[target.i686-uwp-windows-gnu.dependencies] +windows_i686_gnu = { path = "../../targets/i686_gnu", version = "0.29.0" } + [target.x86_64-pc-windows-gnu.dependencies] windows_x86_64_gnu = { path = "../../targets/x86_64_gnu", version = "0.29.0" } +[target.x86_64-uwp-windows-gnu.dependencies] +windows_x86_64_gnu = { path = "../../targets/x86_64_gnu", version = "0.29.0" } + [dependencies] windows_macros = { path = "../macros", version = "0.29.0", optional = true } windows_reader = { path = "../reader", version = "0.29.0", optional = true } diff --git a/crates/targets/aarch64_msvc/build.rs b/crates/targets/aarch64_msvc/build.rs index ed9ea8941f..243d23c4f9 100644 --- a/crates/targets/aarch64_msvc/build.rs +++ b/crates/targets/aarch64_msvc/build.rs @@ -1,5 +1,6 @@ fn main() { - if std::env::var("TARGET").unwrap() != "aarch64-pc-windows-msvc" { + let target = std::env::var("TARGET").unwrap(); + if target != "aarch64-pc-windows-msvc" && target != "aarch64-uwp-windows-msvc" { return; } diff --git a/crates/targets/i686_gnu/build.rs b/crates/targets/i686_gnu/build.rs index fed2b28497..9dbe7e5406 100644 --- a/crates/targets/i686_gnu/build.rs +++ b/crates/targets/i686_gnu/build.rs @@ -1,5 +1,6 @@ fn main() { - if std::env::var("TARGET").unwrap() != "i686-pc-windows-gnu" { + let target = std::env::var("TARGET").unwrap(); + if target != "i686-pc-windows-gnu" && target != "i686-uwp-windows-gnu" { return; } diff --git a/crates/targets/i686_msvc/build.rs b/crates/targets/i686_msvc/build.rs index beb291126e..53892bff6b 100644 --- a/crates/targets/i686_msvc/build.rs +++ b/crates/targets/i686_msvc/build.rs @@ -1,5 +1,6 @@ fn main() { - if std::env::var("TARGET").unwrap() != "i686-pc-windows-msvc" { + let target = std::env::var("TARGET").unwrap(); + if target != "i686-pc-windows-msvc" && target != "i686-uwp-windows-msvc" { return; } diff --git a/crates/targets/x86_64_gnu/build.rs b/crates/targets/x86_64_gnu/build.rs index c968493dcb..7612e7935d 100644 --- a/crates/targets/x86_64_gnu/build.rs +++ b/crates/targets/x86_64_gnu/build.rs @@ -1,5 +1,6 @@ fn main() { - if std::env::var("TARGET").unwrap() != "x86_64-pc-windows-gnu" { + let target = std::env::var("TARGET").unwrap(); + if target != "x86_64-pc-windows-gnu" && target != "x86_64-uwp-windows-gnu" { return; } diff --git a/crates/targets/x86_64_msvc/build.rs b/crates/targets/x86_64_msvc/build.rs index 21933e60ba..c51c8caa81 100644 --- a/crates/targets/x86_64_msvc/build.rs +++ b/crates/targets/x86_64_msvc/build.rs @@ -1,5 +1,6 @@ fn main() { - if std::env::var("TARGET").unwrap() != "x86_64-pc-windows-msvc" { + let target = std::env::var("TARGET").unwrap(); + if target != "x86_64-pc-windows-msvc" && target != "x86_64-uwp-windows-msvc" { return; } diff --git a/crates/tools/api/src/main.rs b/crates/tools/api/src/main.rs index 8a5a580d6d..fed0d94ca0 100644 --- a/crates/tools/api/src/main.rs +++ b/crates/tools/api/src/main.rs @@ -41,18 +41,33 @@ targets = [] [target.i686-pc-windows-msvc.dependencies] windows_i686_msvc = { path = "../../targets/i686_msvc", version = "0.29.0" } +[target.i686-uwp-windows-msvc.dependencies] +windows_i686_msvc = { path = "../../targets/i686_msvc", version = "0.29.0" } + [target.x86_64-pc-windows-msvc.dependencies] windows_x86_64_msvc = { path = "../../targets/x86_64_msvc", version = "0.29.0" } +[target.x86_64-uwp-windows-msvc.dependencies] +windows_x86_64_msvc = { path = "../../targets/x86_64_msvc", version = "0.29.0" } + [target.aarch64-pc-windows-msvc.dependencies] windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.29.0" } +[target.aarch64-uwp-windows-msvc.dependencies] +windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.29.0" } + [target.i686-pc-windows-gnu.dependencies] windows_i686_gnu = { path = "../../targets/i686_gnu", version = "0.29.0" } +[target.i686-uwp-windows-gnu.dependencies] +windows_i686_gnu = { path = "../../targets/i686_gnu", version = "0.29.0" } + [target.x86_64-pc-windows-gnu.dependencies] windows_x86_64_gnu = { path = "../../targets/x86_64_gnu", version = "0.29.0" } +[target.x86_64-uwp-windows-gnu.dependencies] +windows_x86_64_gnu = { path = "../../targets/x86_64_gnu", version = "0.29.0" } + [dependencies] windows_macros = { path = "../macros", version = "0.29.0", optional = true } windows_reader = { path = "../reader", version = "0.29.0", optional = true } diff --git a/crates/tools/sys/src/main.rs b/crates/tools/sys/src/main.rs index b0656048c9..f9f49b4b6d 100644 --- a/crates/tools/sys/src/main.rs +++ b/crates/tools/sys/src/main.rs @@ -40,18 +40,33 @@ all-features = true [target.i686-pc-windows-msvc.dependencies] windows_i686_msvc = { path = "../../targets/i686_msvc", version = "0.29.0" } +[target.i686-uwp-windows-msvc.dependencies] +windows_i686_msvc = { path = "../../targets/i686_msvc", version = "0.29.0" } + [target.x86_64-pc-windows-msvc.dependencies] windows_x86_64_msvc = { path = "../../targets/x86_64_msvc", version = "0.29.0" } +[target.x86_64-uwp-windows-msvc.dependencies] +windows_x86_64_msvc = { path = "../../targets/x86_64_msvc", version = "0.29.0" } + [target.aarch64-pc-windows-msvc.dependencies] windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.29.0" } +[target.aarch64-uwp-windows-msvc.dependencies] +windows_aarch64_msvc = { path = "../../targets/aarch64_msvc", version = "0.29.0" } + [target.i686-pc-windows-gnu.dependencies] windows_i686_gnu = { path = "../../targets/i686_gnu", version = "0.29.0" } +[target.i686-uwp-windows-gnu.dependencies] +windows_i686_gnu = { path = "../../targets/i686_gnu", version = "0.29.0" } + [target.x86_64-pc-windows-gnu.dependencies] windows_x86_64_gnu = { path = "../../targets/x86_64_gnu", version = "0.29.0" } +[target.x86_64-uwp-windows-gnu.dependencies] +windows_x86_64_gnu = { path = "../../targets/x86_64_gnu", version = "0.29.0" } + [features] default = [] deprecated = []