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

Remove static usage at compile-time of GIT_INFO to enable builds outside of a git repo

Browse source
This commit is contained in:
Lars Bergstrom 2016-08-26 16:38:03 -05:00
parent 8e39313321
commit bdf4563c6a
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/script/dom/htmliframeelement.rs
View file

@ -355,7 +355,7 @@ unsafe fn build_mozbrowser_event_detail(event: MozBrowserEvent,
type_: Some(DOMString::from(error_type.name())), type_: Some(DOMString::from(error_type.name())),
description: Some(DOMString::from(description)), description: Some(DOMString::from(description)),
report: Some(DOMString::from(report)), report: Some(DOMString::from(report)),
version: Some(DOMString::from_string(servo_version().into())), version: Some(DOMString::from_string(servo_version())),
}.to_jsval(cx, rval); }.to_jsval(cx, rval);
}, },
MozBrowserEvent::SecurityChange(https_state) => { MozBrowserEvent::SecurityChange(https_state) => {

9
components/util/lib.rs
View file

@ -36,6 +36,11 @@ pub mod prefs;
pub mod resource_files; pub mod resource_files;
pub mod thread; pub mod thread;
pub fn servo_version() -> &'static str { pub fn servo_version() -> String {
concat!("Servo ", env!("CARGO_PKG_VERSION"), env!("GIT_INFO")) let cargo_version = env!("CARGO_PKG_VERSION");
let git_info = option_env!("GIT_INFO");
match git_info {
Some(info) => format!("Servo {}{}", cargo_version, info),
None => format!("Servo {}", cargo_version),
}
} }