Add ability to explicitly set static resources path, used by cef-linux.

1 files changed, 19 insertions, 13 deletions

diff --git a/components/util/resource_files.rs b/components/util/resource_files.rs
index b40c93f2651..9dd0e199ad3 100644
--- a/components/util/resource_files.rs
+++ b/components/util/resource_files.rs
@@ -4,6 +4,7 @@
 
 use std::io::{File, IoResult};
 use std::path::Path;
+use opts;
 
 #[cfg(not(target_os = "android"))]
 use std::io::fs::PathExtensions;
@@ -17,20 +18,25 @@ pub fn resources_dir_path() -> Path {
 
 #[cfg(not(target_os = "android"))]
 pub fn resources_dir_path() -> Path {
-    // FIXME: Find a way to not rely on the executable being
-    // under `<servo source>/components/servo/target`
-    // or `<servo source>/components/servo/target/release`.
-    let mut path = os::self_exe_path().expect("can't get exe path");
-    path.pop();
-    path.pop();
-    path.pop();
-    path.push("resources");
-    if !path.is_dir() {  // self_exe_path() is probably in .../target/release
-        path.pop();
-        path.pop();
-        path.push("resources");
+    match opts::get().resources_path {
+        Some(ref path) => Path::new(path),
+        None => {
+            // FIXME: Find a way to not rely on the executable being
+            // under `<servo source>/components/servo/target`
+            // or `<servo source>/components/servo/target/release`.
+            let mut path = os::self_exe_path().expect("can't get exe path");
+            path.pop();
+            path.pop();
+            path.pop();
+            path.push("resources");
+            if !path.is_dir() {  // self_exe_path() is probably in .../target/release
+                path.pop();
+                path.pop();
+                path.push("resources");
+            }
+            path
+        }
     }
-    path
 }