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

Auto merge of #13063 - larsbergstrom:remove_git_info, r=metajack

Browse source 
Remove static usage at compile-time of GIT_INFO to enable builds outs…

r? @metajack

The issue here is that if we build Servo from a expanded copy of the sources w/o a git repository present in-tree, this will fail. Further, we can't switch to `option_env` with an `unwrap_or` because `concat!` expects string literals.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13063)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-08-28 10:43:29 -05:00 • committed by GitHub
commit ff6ffb7370
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())),
description: Some(DOMString::from(description)),
report: Some(DOMString::from(report)),
version: Some(DOMString::from_string(servo_version().into())),
version: Some(DOMString::from_string(servo_version())),
}.to_jsval(cx, rval);
},
MozBrowserEvent::SecurityChange(https_state) => {

9
components/util/lib.rs
View file

@ -36,6 +36,11 @@ pub mod prefs;
pub mod resource_files;
pub mod thread;
pub fn servo_version() -> &'static str {
concat!("Servo ", env!("CARGO_PKG_VERSION"), env!("GIT_INFO"))
pub fn servo_version() -> String {
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),
}
}