From 193013f6bb45c810532158e16aa4a03ec6ab2035 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Wed, 29 May 2019 16:34:39 -0400 Subject: [PATCH] Add cargo features for canvas backend to other ports. --- ports/libmlservo/Cargo.toml | 4 ++++ ports/libsimpleservo/api/Cargo.toml | 16 +++++++++------- ports/libsimpleservo/capi/Cargo.toml | 16 +++++++++------- ports/libsimpleservo/jniapi/Cargo.toml | 16 +++++++++------- 4 files changed, 31 insertions(+), 21 deletions(-) diff --git a/ports/libmlservo/Cargo.toml b/ports/libmlservo/Cargo.toml index 2534dbe4a9d..b2e3d900285 100644 --- a/ports/libmlservo/Cargo.toml +++ b/ports/libmlservo/Cargo.toml @@ -12,6 +12,10 @@ crate-type = ["staticlib"] test = false bench = false +[features] +azure_backend = ["simpleservo/azure_backend"] +raqote_backend = ["simpleservo/raqote_backend"] + [dependencies] libservo = { path = "../../components/servo", features = ["no_static_freetype"] } simpleservo = { path = "../libsimpleservo/api", features = ["no_static_freetype"] } diff --git a/ports/libsimpleservo/api/Cargo.toml b/ports/libsimpleservo/api/Cargo.toml index 0556947d7da..7c48fa4de21 100644 --- a/ports/libsimpleservo/api/Cargo.toml +++ b/ports/libsimpleservo/api/Cargo.toml @@ -26,16 +26,18 @@ libloading = "0.5" gl_generator = "0.11" [features] +azure_backend = ["libservo/azure_backend"] default = ["unstable", "default-except-unstable"] default-except-unstable = ["webdriver", "max_log_level"] -max_log_level = ["log/release_max_level_info"] -webdriver = ["libservo/webdriver"] -energy-profiling = ["libservo/energy-profiling"] debugmozjs = ["libservo/debugmozjs"] -unstable = ["libservo/unstable"] +energy-profiling = ["libservo/energy-profiling"] googlevr = ["libservo/googlevr"] -oculusvr = ["libservo/oculusvr"] -native-bluetooth = ["libservo/native-bluetooth"] -webgl_backtrace = ["libservo/webgl_backtrace"] js_backtrace = ["libservo/js_backtrace"] +max_log_level = ["log/release_max_level_info"] +native-bluetooth = ["libservo/native-bluetooth"] no_static_freetype = ["libservo/no_static_freetype"] +oculusvr = ["libservo/oculusvr"] +raqote_backend = ["libservo/raqote_backend"] +webdriver = ["libservo/webdriver"] +unstable = ["libservo/unstable"] +webgl_backtrace = ["libservo/webgl_backtrace"] diff --git a/ports/libsimpleservo/capi/Cargo.toml b/ports/libsimpleservo/capi/Cargo.toml index c114f87083d..7764f3fe71b 100644 --- a/ports/libsimpleservo/capi/Cargo.toml +++ b/ports/libsimpleservo/capi/Cargo.toml @@ -21,15 +21,17 @@ env_logger = "0.6" cbindgen = "0.8" [features] +azure_backend = ["simpleservo/azure_backend"] +debugmozjs = ["simpleservo/debugmozjs"] default = ["unstable", "default-except-unstable"] default-except-unstable = ["webdriver", "max_log_level"] -max_log_level = ["simpleservo/max_log_level"] -webdriver = ["simpleservo/webdriver"] energy-profiling = ["simpleservo/energy-profiling"] -debugmozjs = ["simpleservo/debugmozjs"] -unstable = ["simpleservo/unstable"] googlevr = ["simpleservo/googlevr"] -oculusvr = ["simpleservo/oculusvr"] -native-bluetooth = ["simpleservo/native-bluetooth"] -webgl_backtrace = ["simpleservo/webgl_backtrace"] js_backtrace = ["simpleservo/js_backtrace"] +max_log_level = ["simpleservo/max_log_level"] +native-bluetooth = ["simpleservo/native-bluetooth"] +oculusvr = ["simpleservo/oculusvr"] +raqote_backend = ["simpleservo/raqote_backend"] +unstable = ["simpleservo/unstable"] +webdriver = ["simpleservo/webdriver"] +webgl_backtrace = ["simpleservo/webgl_backtrace"] diff --git a/ports/libsimpleservo/jniapi/Cargo.toml b/ports/libsimpleservo/jniapi/Cargo.toml index d2fafd86dc2..95a841770a0 100644 --- a/ports/libsimpleservo/jniapi/Cargo.toml +++ b/ports/libsimpleservo/jniapi/Cargo.toml @@ -26,15 +26,17 @@ simpleservo = { path = "../api" } cc = "1.0" [features] +azure_backend = ["simpleservo/azure_backend"] +debugmozjs = ["simpleservo/debugmozjs"] default = ["unstable", "default-except-unstable"] default-except-unstable = ["webdriver", "max_log_level"] -max_log_level = ["simpleservo/max_log_level"] -webdriver = ["simpleservo/webdriver"] energy-profiling = ["simpleservo/energy-profiling"] -debugmozjs = ["simpleservo/debugmozjs"] -unstable = ["simpleservo/unstable"] googlevr = ["simpleservo/googlevr"] -oculusvr = ["simpleservo/oculusvr"] -native-bluetooth = ["simpleservo/native-bluetooth"] -webgl_backtrace = ["simpleservo/webgl_backtrace"] js_backtrace = ["simpleservo/js_backtrace"] +max_log_level = ["simpleservo/max_log_level"] +native-bluetooth = ["simpleservo/native-bluetooth"] +oculusvr = ["simpleservo/oculusvr"] +raqote_backend = ["simpleservo/raqote_backend"] +unstable = ["simpleservo/unstable"] +webdriver = ["simpleservo/webdriver"] +webgl_backtrace = ["simpleservo/webgl_backtrace"]