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

Auto merge of #16192 - upsuper:bug1350810, r=emilio

Browse source 
Output binding files to dist dir in addition

https://bugzilla.mozilla.org/show_bug.cgi?id=1350810
This commit is contained in:
bors-servo 2017-03-30 08:23:31 -05:00 • committed by GitHub
commit 54e2b7b2d5
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
components/style/build_gecko.rs
View file

@ -35,7 +35,7 @@ mod bindings {
use std::cmp;
use std::collections::HashSet;
use std::env;
use std::fs::File;
use std::fs::{self, File};
use std::io::{Read, Write};
use std::path::{Path, PathBuf};
use std::sync::Mutex;
@ -59,6 +59,11 @@ mod bindings {
pub static ref LAST_MODIFIED: Mutex<SystemTime> =
Mutex::new(get_modified_time(&env::current_exe().unwrap())
.expect("Failed to get modified time of executable"));
static ref BINDING_DISTDIR_PATH: PathBuf = {
let path = DISTDIR_PATH.join("rust_bindings/style");
fs::create_dir_all(&path).expect("Fail to create bindings dir in dist");
path
};
}
fn get_modified_time(file: &Path) -> Option<SystemTime> {
@ -229,7 +234,10 @@ mod bindings {
result = Regex::new(&format!(r"\b{}\b", fixup.pat)).unwrap().replace_all(&result, fixup.rep.as_str())
.into_owned().into();
}
File::create(&out_file).unwrap().write_all(&result.into_bytes()).expect("Unable to write output");
let bytes = result.into_bytes();
File::create(&out_file).unwrap().write_all(&bytes).expect("Unable to write output");
File::create(&BINDING_DISTDIR_PATH.join(file)).unwrap()
.write_all(&bytes).expect("Unable to write output to binding dist");
}
fn get_arc_types() -> Vec<String> {
@ -526,7 +534,6 @@ mod bindings {
pub fn setup_logging() {
use log;
use std::fs;
struct BuildLogger {
file: Option<Mutex<fs::File>>,