Keep icu_capi headers in SM (#639)

* Keep icu_capi headers

Signed-off-by: sagudev <[email protected]>

* Apply

Signed-off-by: sagudev <[email protected]>

* bump mozjs-sys

Signed-off-by: sagudev <[email protected]>

---------

Signed-off-by: sagudev <[email protected]>

Author: sagudev

mozjs-sys/Cargo.toml

@@ -2,16 +2,11 @@
 name = "mozjs_sys"
 description = "System crate for the Mozilla SpiderMonkey JavaScript engine."
 repository.workspace = true
-version = "0.140.0-7"
+version = "0.140.0-8"
 authors = ["Mozilla", "The Servo Project Developers"]
 links = "mozjs"
 license.workspace = true
-exclude = [
-  "__pycache__",
-  "/etc/",
-  "/mozjs/.cargo/",
-
-]
+exclude = ["__pycache__", "/etc/", "/mozjs/.cargo/"]
 edition.workspace = true
 
 [lib]
@@ -36,16 +31,25 @@ encoding_c = "0.9.8"
 encoding_c_mem = "0.2.6"
 # unicode-bidi-ffi = { path = "./mozjs/intl/bidi/rust/unicode-bidi-ffi" }
 # keep in sync with intl/icu_capi/Cargo.toml
-icu_capi = { version = "=1.5.0", default-features = false, features = ["compiled_data", "icu_calendar", "icu_properties", "icu_segmenter"], optional = true }
+icu_capi = { version = "=1.5.0", default-features = false, features = [
+  "compiled_data",
+  "icu_calendar",
+  "icu_properties",
+  "icu_segmenter",
+], optional = true }
 
-libz-rs-sys = { version = "0.5.1", features = ["export-symbols"], optional = true }
+libz-rs-sys = { version = "0.5.1", features = [
+  "export-symbols",
+], optional = true }
 # SM depends on them and we provide them using cargo
-libz-sys = { version = "1.1.19", default-features = false, features = ["libc", "stock-zlib"], optional = true }
+libz-sys = { version = "1.1.19", default-features = false, features = [
+  "libc",
+  "stock-zlib",
+], optional = true }
 
 [build-dependencies]
 bindgen.workspace = true
 cc.workspace = true
 walkdir = "2"
 flate2 = "1"
 tar = "0.4"
-cargo_metadata = "0.20.0"

mozjs-sys/build.rs

@@ -4,7 +4,6 @@
 
 use bindgen::callbacks::ParseCallbacks;
 use bindgen::{CodegenConfig, Formatter, RustTarget};
-use cargo_metadata::CargoOpt;
 use std::ffi::{OsStr, OsString};
 use std::fmt::Write;
 use std::path::{Path, PathBuf};
@@ -137,34 +136,6 @@ fn main() {
     }
 }
 
-fn get_icu_capi_include_path() -> String {
-    // Using cargo metadata is the official recommendation from the icu4x documentation.
-    // See <https://icu4x.unicode.org/2_0/cppdoc/>.
-    // Once we update to a new release containing https://github.com/unicode-org/icu4x/pull/6887
-    // we can remove the dependency on cargo metadata.
-    let metadata = cargo_metadata::MetadataCommand::new()
-        // icu_capi is feature guarded behind the `intl` feature.
-        .features(CargoOpt::SomeFeatures(vec!["intl".into()]))
-        .exec()
-        .unwrap();
-    let packages = metadata.packages;
-    let icu_capi_info = packages
-        .iter()
-        .find(|pkg| pkg.name.contains("icu_capi"))
-        .expect("icu_capi not found");
-    let icu_cpath = &icu_capi_info.manifest_path;
-    // Include path for icu_capi 1.5:
-    let c_include_path = icu_cpath
-        .parent()
-        .expect("manifest dir?")
-        .join("bindings/c");
-    assert!(
-        c_include_path.exists(),
-        "ICU_C C include path {c_include_path} does not exist"
-    );
-    c_include_path.to_string()
-}
-
 fn build_spidermonkey(build_dir: &Path) {
     let target = env::var("TARGET").unwrap();
     let make;
@@ -247,12 +218,6 @@ fn build_spidermonkey(build_dir: &Path) {
 
     let mut cxxflags = vec![];
 
-    #[cfg(feature = "intl")]
-    {
-        let icu_c_include_path = get_icu_capi_include_path();
-        cxxflags.push(format!("-I{}", &icu_c_include_path.replace("\\", "/")));
-    }
-
     if target.contains("apple") || target.contains("freebsd") || target.contains("ohos") {
         cxxflags.push(String::from("-stdlib=libc++"));
     }

mozjs-sys/etc/filters.txt

@@ -20,7 +20,6 @@
 - /build/workspace-hack
 - /build/rust
 - /intl/bidi
-- /intl/icu_capi
 - /intl/icu_segmenter_data
 - /js/rust
 - /js/src/build.rs
@@ -36,6 +35,12 @@
 - /Cargo.toml
 - /.cargo
 
+# Keep icu_capi headers
++ /intl/icu_capi/bindings/
++ /intl/icu_capi/bindings/c/
++ /intl/icu_capi/bindings/c/*
+- /intl/icu_capi/**
+
 # Keep zlib headers for libz-rs-sys
 + modules/zlib/src/
 + modules/zlib/src/zlib.h