From bdf4563c6add01439923e2cf20b5bfe0fc121967 Mon Sep 17 00:00:00 2001 From: Lars Bergstrom Date: Fri, 26 Aug 2016 16:38:03 -0500 Subject: [PATCH] Remove static usage at compile-time of GIT_INFO to enable builds outside of a git repo --- components/script/dom/htmliframeelement.rs | 2 +- components/util/lib.rs | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs index 73d750cc8dd..2cc946ec933 100644 --- a/components/script/dom/htmliframeelement.rs +++ b/components/script/dom/htmliframeelement.rs @@ -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) => { diff --git a/components/util/lib.rs b/components/util/lib.rs index e56a0ad61d7..6513f61a940 100644 --- a/components/util/lib.rs +++ b/components/util/lib.rs @@ -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), + } }