Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #4672 : glennw/servo/make-glutin-default, r=larsbergstrom

Browse source 
This change makes glutin the default windowing system on mac/linux.

If you run into any issues with the glutin system, you can temporarily
build the GLFW system with the following command:

cd components/servo
../../mach cargo build --no-default-features --features=glfw

Once any glutin related issues have been sorted out, the GLFW
port will be removed.
This commit is contained in:
bors-servo 2015-01-19 16:30:47 -07:00
commit ccf5f96fa9
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/servo/Cargo.toml
View file

@ -27,8 +27,8 @@ path = "../../tests/contenttest.rs"
harness = false harness = false
[features] [features]
default = ["glfw_app"] default = ["glutin_app"]
glutin = ["glutin_app"] glfw = ["glfw_app"]
[dependencies.compositing] [dependencies.compositing]
path = "../compositing" path = "../compositing"

4
components/servo/main.rs
View file

@ -14,9 +14,9 @@ extern crate servo;
extern crate time; extern crate time;
extern crate "util" as servo_util; extern crate "util" as servo_util;
#[cfg(all(feature = "glutin",not(test)))] #[cfg(all(feature = "glutin_app",not(test)))]
extern crate "glutin_app" as app; extern crate "glutin_app" as app;
#[cfg(all(feature = "glfw_app",not(test)))] #[cfg(all(feature = "glfw",not(test)))]
extern crate "glfw_app" as app; extern crate "glfw_app" as app;
#[cfg(not(test))] #[cfg(not(test))]

5
python/servo/build_commands.py
View file

@ -64,10 +64,7 @@ class MachCommands(CommandBase):
with cd(path.join(apk_builder_dir, "apk-builder")): with cd(path.join(apk_builder_dir, "apk-builder")):
subprocess.call(["cargo", "build"], env=self.build_env()) subprocess.call(["cargo", "build"], env=self.build_env())
# FIXME: This can be simplified when glutin becomes the default opts += ["--target", "arm-linux-androideabi"]
# and glfw has been removed.
opts += ["--target", "arm-linux-androideabi", "--no-default-features"]
features += ["glutin"]
if debug_mozjs or self.config["build"]["debug-mozjs"]: if debug_mozjs or self.config["build"]["debug-mozjs"]:
features += ["script/debugmozjs"] features += ["script/debugmozjs"]

3
tests/reftest.rs
View file

@ -276,6 +276,9 @@ fn capture(reftest: &Reftest, side: uint) -> (u32, u32, Vec<u8>) {
if reftest.experimental { if reftest.experimental {
command.arg("--experimental"); command.arg("--experimental");
} }
if cfg!(target_os = "linux") {
command.args(["-r", "mesa"].as_slice());
}
let retval = match command.status() { let retval = match command.status() {
Ok(status) => status, Ok(status) => status,
Err(e) => panic!("failed to execute process: {}", e), Err(e) => panic!("failed to execute process: {}", e),