From 33772a00bd9b9061a98a57dbee9334737dead8a5 Mon Sep 17 00:00:00 2001 From: lubinglun Date: Mon, 10 Apr 2023 19:49:43 +0800 Subject: [PATCH 1/2] Add GN Build Files and Custom Modifications Issue:https://gitee.com/openharmony/build/issues/I6UFTP Signed-off-by: lubinglun --- BUILD.gn | 37 +++++++++++++++++++++++++++++++++++++ gen/cmd/BUILD.gn | 34 ++++++++++++++++++++++++++++++++++ macro/BUILD.gn | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 104 insertions(+) create mode 100644 BUILD.gn create mode 100644 gen/cmd/BUILD.gn create mode 100644 macro/BUILD.gn diff --git a/BUILD.gn b/BUILD.gn new file mode 100644 index 00000000..d3bf5b5e --- /dev/null +++ b/BUILD.gn @@ -0,0 +1,37 @@ +# Copyright (c) 2023 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/ohos.gni") + +ohos_cargo_crate("lib") { + crate_name = "cxx" + crate_type = "rlib" + crate_root = "src/lib.rs" + + sources = [ "src/lib.rs" ] + edition = "2018" + cargo_pkg_version = "1.0.91" + cargo_pkg_authors = "David Tolnay " + cargo_pkg_name = "cxx" + cargo_pkg_description = "Safe interop between Rust and C++" + deps = [ + "//third_party/rust/cxx/macro:lib(${host_toolchain})", + "//third_party/rust/link-cplusplus:lib", + ] + features = [ + "alloc", + "std", + ] + build_root = "build.rs" + build_sources = [ "build.rs" ] +} diff --git a/gen/cmd/BUILD.gn b/gen/cmd/BUILD.gn new file mode 100644 index 00000000..5de6c324 --- /dev/null +++ b/gen/cmd/BUILD.gn @@ -0,0 +1,34 @@ +# Copyright (c) 2023 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/ohos.gni") + +ohos_cargo_crate("cxxbridge") { + crate_type = "bin" + crate_root = "src/main.rs" + + sources = [ "src/main.rs" ] + edition = "2018" + cargo_pkg_version = "1.0.92" + cargo_pkg_authors = "David Tolnay " + cargo_pkg_name = "cxxbridge-cmd" + cargo_pkg_description = + "C++ code generator for integrating `cxx` crate into a non-Cargo build." + deps = [ + "//third_party/rust/clap:lib", + "//third_party/rust/codespan/codespan-reporting:lib", + "//third_party/rust/proc-macro2:lib", + "//third_party/rust/quote:lib", + "//third_party/rust/syn:lib", + ] +} diff --git a/macro/BUILD.gn b/macro/BUILD.gn new file mode 100644 index 00000000..02b58b24 --- /dev/null +++ b/macro/BUILD.gn @@ -0,0 +1,33 @@ +# Copyright (c) 2023 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/ohos.gni") + +ohos_cargo_crate("lib") { + crate_name = "cxxbridge_macro" + crate_type = "proc-macro" + visibility = [ "//third_party/rust/*" ] + crate_root = "src/lib.rs" + + sources = [ "src/lib.rs" ] + edition = "2018" + cargo_pkg_version = "1.0.91" + cargo_pkg_authors = "David Tolnay " + cargo_pkg_name = "cxxbridge-macro" + cargo_pkg_description = "Implementation detail of the `cxx` crate." + deps = [ + "//third_party/rust/proc-macro2:lib", + "//third_party/rust/quote:lib", + "//third_party/rust/syn:lib", + ] +} -- Gitee From a4c089b24341befdfa9dab101e11fc8584ee88f3 Mon Sep 17 00:00:00 2001 From: xxlight Date: Mon, 17 Apr 2023 19:39:16 +0800 Subject: [PATCH 2/2] fix:remove needless codes Issue: https://gitee.com/xxlight/third_party_rust_cxx/issues/I6WGKQ Signed-off-by: xxlight --- build.rs | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/build.rs b/build.rs index 9158b1c8..b51536f7 100644 --- a/build.rs +++ b/build.rs @@ -3,23 +3,6 @@ use std::path::Path; use std::process::Command; fn main() { - cc::Build::new() - .file("src/cxx.cc") - .cpp(true) - .cpp_link_stdlib(None) // linked via link-cplusplus crate - .flag_if_supported(cxxbridge_flags::STD) - .warnings_into_errors(cfg!(deny_warnings)) - .compile("cxxbridge1"); - - println!("cargo:rerun-if-changed=src/cxx.cc"); - println!("cargo:rerun-if-changed=include/cxx.h"); - println!("cargo:rustc-cfg=built_with_cargo"); - - if let Some(manifest_dir) = env::var_os("CARGO_MANIFEST_DIR") { - let cxx_h = Path::new(&manifest_dir).join("include").join("cxx.h"); - println!("cargo:HEADER={}", cxx_h.to_string_lossy()); - } - if let Some(rustc) = rustc_version() { if rustc.minor < 60 { println!("cargo:warning=The cxx crate requires a rustc version 1.60.0 or newer."); -- Gitee