From 8a10faf3b9facc681d7202693ba6b2415c6055f0 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Tue, 30 Jul 2019 16:58:50 -0700 Subject: [PATCH] Remove GStreamer dependencies from UWP app. Remove GStreamer backend on Windows. It's impossible to conditionally use a crate based only on cargo features, so temporarily disable the backend on all Windows builds while we sort out how to get the UWP builds working again. --- components/servo/Cargo.toml | 4 +- components/servo/lib.rs | 20 +- python/servo/build_commands.py | 7 +- support/hololens/ServoApp/ServoApp.vcxproj | 883 +----------------- .../ServoApp/ServoApp.vcxproj.filters | 664 +------------ 5 files changed, 67 insertions(+), 1511 deletions(-) diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index 1d59fb4a67b8..73ac1c901a95 100644 --- a/components/servo/Cargo.toml +++ b/components/servo/Cargo.toml @@ -85,10 +85,10 @@ webxr-api = {git = "https://github.com/servo/webxr"} [target.'cfg(all(not(target_os = "windows"), not(target_os = "ios"), not(target_os="android"), not(target_arch="arm"), not(target_arch="aarch64")))'.dependencies] gaol = {git = "https://github.com/servo/gaol"} -[target.'cfg(any(all(target_os = "android", target_arch = "arm"), target_arch = "x86_64", all(target_os = "windows", target_arch = "aarch64")))'.dependencies.servo-media-gstreamer] +[target.'cfg(all(not(target_os = "windows"), any(all(target_os = "android", target_arch = "arm"), target_arch = "x86_64")))'.dependencies.servo-media-gstreamer] git = "https://github.com/servo/media" -[target.'cfg(not(any(all(target_os = "android", target_arch = "arm"), target_arch = "x86_64", all(target_os = "windows", target_arch = "aarch64"))))'.dependencies.servo-media-dummy] +[target.'cfg(any(target_os = "windows", not(any(all(target_os = "android", target_arch = "arm"), target_arch = "x86_64"))))'.dependencies.servo-media-dummy] git = "https://github.com/servo/media" [target.'cfg(target_os = "windows")'.dependencies] diff --git a/components/servo/lib.rs b/components/servo/lib.rs index ef829bf2d1b2..75a8706ef718 100644 --- a/components/servo/lib.rs +++ b/components/servo/lib.rs @@ -125,10 +125,12 @@ pub use msg::constellation_msg::TopLevelBrowsingContextId as BrowserId; pub use servo_config as config; pub use servo_url as url; -#[cfg(any( - all(target_os = "android", target_arch = "arm"), - target_arch = "x86_64", - all(target_os = "windows", target_arch = "aarch64"), +#[cfg(all( + not(target_os = "windows"), + any( + all(target_os = "android", target_arch = "arm"), + target_arch = "x86_64", + ) ))] mod media_platform { use super::ServoMedia; @@ -207,10 +209,12 @@ mod media_platform { } } -#[cfg(not(any( - all(target_os = "android", target_arch = "arm"), - target_arch = "x86_64", - all(target_os = "windows", target_arch = "aarch64"), +#[cfg(not(all( + not(target_os = "windows"), + any( + all(target_os = "android", target_arch = "arm"), + target_arch = "x86_64", + ) )))] mod media_platform { use super::ServoMedia; diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 232b44ef8387..c52745449163 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -670,10 +670,9 @@ def package_generated_shared_libraries(libs, build_path, servo_exe_dir): status = 1 # UWP app packaging already bundles all required DLLs for us. - if not uwp: - print("Packaging MSVC DLLs") - if not package_msvc_dlls(servo_exe_dir, target_triple, vcinstalldir, vs_version): - status = 1 + print("Packaging MSVC DLLs") + if not package_msvc_dlls(servo_exe_dir, target_triple, vcinstalldir, vs_version): + status = 1 elif sys.platform == "darwin": # On the Mac, set a lovely icon. This makes it easier to pick out the Servo binary in tools diff --git a/support/hololens/ServoApp/ServoApp.vcxproj b/support/hololens/ServoApp/ServoApp.vcxproj index fab0df1ad0e5..9635d612a8dc 100644 --- a/support/hololens/ServoApp/ServoApp.vcxproj +++ b/support/hololens/ServoApp/ServoApp.vcxproj @@ -173,910 +173,87 @@ Designer - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - true true - - true - - + true true - - true - - - true - - + true - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - true true - - true - - + true true - - true - - + true - - true - - - true - - - true - true - false - true - false - - + + true true false true false - + + true true false true false - - true - - + true true false true false - - true - true - false - true - false + + + + + true - - true - true - false - true - false + + true - - true - true - false - true - false + + true - - true - true - false - true - false + + + + true - - true + + true true false - true + + false - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - - - true - true - false - true - false - - - true - true - false - true - false - - - true - true - false - true - false - - - true - - - true - - - true - true - false - true - false - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - true - false - true - false - - - true - - - true - - - true - - + + + true @@ -1155,4 +332,4 @@ - + \ No newline at end of file diff --git a/support/hololens/ServoApp/ServoApp.vcxproj.filters b/support/hololens/ServoApp/ServoApp.vcxproj.filters index fcefc8c06dbf..836ab85c8582 100644 --- a/support/hololens/ServoApp/ServoApp.vcxproj.filters +++ b/support/hololens/ServoApp/ServoApp.vcxproj.filters @@ -90,694 +90,70 @@ Content - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - DebugServoDLLs DebugServoDLLs - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - ReleaseServoDLLs DebugServoDLLs - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - DebugServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - ReleaseServoDLLs ReleaseServoDLLs - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - ReleaseServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - DebugARM64ServoDLLs DebugARM64ServoDLLs - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - DebugARM64ServoDLLs - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - DebugARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - - - ReleaseARM64ServoDLLs - ReleaseARM64ServoDLLs ReleaseARM64ServoDLLs - + ReleaseARM64ServoDLLs - - ReleaseARM64ServoDLLs + + ReleaseServoDLLs - - ReleaseARM64ServoDLLs + + DebugServoDLLs - - ReleaseARM64ServoDLLs + + DebugServoDLLs - - ReleaseARM64ServoDLLs + + DebugServoDLLs - - ReleaseARM64ServoDLLs + + ReleaseServoDLLs + + + ReleaseServoDLLs - + ReleaseARM64ServoDLLs - + ReleaseARM64ServoDLLs - + + DebugARM64ServoDLLs + + DebugARM64ServoDLLs