# This is a combination of 2 commits.

# This is the 1st commit message:

resolved merge conflict

# This is the commit message servo#2:

refactor(build): generate revision via build.rs

Author: pmocher

Cargo.lock

@@ -4,6 +4,7 @@ version = "0.0.1"
 authors = ["The Servo Project Developers"]
 license = "MPL-2.0"
 publish = false
+build = "build.rs"
 
 [lib]
 name = "compositing"
@@ -29,3 +30,6 @@ style_traits = {path = "../style_traits"}
 time = "0.1.17"
 webrender = {git = "https://github.com/servo/webrender", features = ["capture"]}
 webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
+
+[build-dependencies]
+toml = "0.4.5"

components/compositing/Cargo.toml

@@ -0,0 +1,65 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+extern crate toml;
+
+use std::env;
+use std::fs::File;
+use std::io::{Read, Write};
+
+const WEBRENDER_REVISION_TEMPLATE: &'static str =
+"/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/// auto-generated by cargo. do not manually modify.
+pub const REVISION: &'static str = ";
+
+fn main() {
+    let current_path = env::current_dir().expect("Failed to access path to lockfile");
+    let lockfile_path = current_path.join("..").join("..").join("Cargo.lock");
+    let revision_file_path = current_path.join("webrender_revision.rs");
+
+    let mut existing_revision_exported = String::new();
+    match File::open(&revision_file_path) {
+        Ok(mut f) => {
+        f.read_to_string(&mut existing_revision_exported).unwrap_or_default();
+        },
+        Err(_) => ()
+    }
+
+    let mut lockfile = String::new();
+    File::open(lockfile_path).expect("Cannot open lockfile")
+        .read_to_string(&mut lockfile)
+        .expect("Failed to read lockfile");
+
+    match toml::from_str::<toml::value::Table>(&lockfile) {
+        Ok(result) => {
+            let packages = result.get("package").expect("Cargo lockfile should contain package list");
+
+            match *packages {
+                toml::Value::Array(ref arr) => {
+                    let source = arr
+                        .iter()
+                        .find(|pkg| pkg.get("name").and_then(|name| name.as_str()).unwrap_or("") == "webrender")
+                        .and_then(|pkg| pkg.get("source").and_then(|source| source.as_str()))
+                        .unwrap_or("unknown");
+
+                    let parsed: Vec<&str> = source.split("#").collect();
+                    let revision = if parsed.len() > 1 { parsed[1] } else { source };
+
+                    if let Some(_) = existing_revision_exported.find(revision) {
+                        return
+                    }
+
+                    let revision_contents = format!("{}\"{}\";", WEBRENDER_REVISION_TEMPLATE, revision);
+                    let mut revision_module_file = File::create(&revision_file_path).unwrap();
+                    write!(&mut revision_module_file, "{}", revision_contents).unwrap();
+                },
+                _ => panic!("Cannot find package definitions in lockfile")
+            }
+        },
+        Err(e) => panic!(e)
+    }
+}

components/compositing/build.rs

@@ -24,7 +24,8 @@ use servo_config::opts;
 use servo_geometry::{DeviceIndependentPixel, DeviceUintLength};
 use std::collections::HashMap;
 use std::env;
-use std::fs::File;
+use std::fs::{File, create_dir_all};
+use std::io::Write;
 use std::rc::Rc;
 use std::sync::mpsc::Sender;
 use std::time::{Duration, Instant};
@@ -1543,9 +1544,25 @@ impl<Window: WindowMethods> IOCompositor<Window> {
             Ok(current_dir) => {
                 let capture_id = now().to_timespec().sec.to_string();
                 let capture_path = current_dir.join("capture_webrender").join(capture_id);
+                let revision_file_path = capture_path.join("wr.txt");
+
+                if let Err(err) = create_dir_all(&capture_path) {
+                    println!("Unable to create path '{:?}' for capture: {:?}", capture_path, err);
+                    return
+                }
+
                 self.webrender_api.save_capture(capture_path, webrender_api::CaptureBits::all());
+
+                match File::create(revision_file_path) {
+                    Ok(mut file) => {
+                        if let Err(err) = write!(&mut file, "{}", REVISION) {
+                            println!("Unable to write webrender revision: {:?}", err)
+                        }
+                    }
+                    Err(err) => println!("Capture triggered, creating webrender revision info skipped: {:?}", err)
+                }
             },
-            Err(err) => println!("could not locate path to save captures: {:?}", err)
+            Err(err) => println!("Unable to locate path to save captures: {:?}", err)
         }
     }
 }

components/compositing/compositor.rs

@@ -39,6 +39,7 @@ use style_traits::CSSPixel;
 mod compositor;
 pub mod compositor_thread;
 mod touch;
+mod webrender_revision;
 pub mod windowing;
 
 pub struct SendableFrameTree {

components/compositing/lib.rs

@@ -213,36 +213,6 @@ def set_osmesa_env(bin_path, env):
     return env
 
 
-def generate_webrender_revision():
-    """Read current package id of web render to generate revision"""
-
-    lockfile_path = path.join(os.getcwd(), "Cargo.lock")
-    if not os.path.isfile(lockfile_path):
-        return
-
-    with open(lockfile_path) as f:
-        lockfile = toml.loads(f.read())
-
-    webrender_revision = ""
-    for package in lockfile.get("package", []):
-        pkgName = package.get("name")
-        if ("webrender" == pkgName):
-            webrender_revision = package.get("source")
-
-    revision = '''/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/// auto-generated by mach. do not manually modify.
-pub const REVISION: &'static str = \"%s\";''' % webrender_revision
-
-    compositor_path = os.path.join(os.getcwd(), "components", "compositing", "webrender_revision.rs")
-
-    revision_file = open(compositor_path, "w")
-    revision_file.write(revision)
-    revision_file.close()
-
-
 class BuildNotFound(Exception):
     def __init__(self, message):
         self.message = message
@@ -690,8 +660,6 @@ def ensure_bootstrapped(self, target=None):
         if "msvc" in target_platform:
             Registrar.dispatch("bootstrap", context=self.context)
 
-        generate_webrender_revision()
-
         self.context.bootstrapped = True
 
     def ensure_clobbered(self, target_dir=None):