aboutsummaryrefslogtreecommitdiffstats
path: root/components/util/resource_files.rs
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2014-11-28 08:16:02 +0000
committerSimon Sapin <simon.sapin@exyr.org>2014-12-02 18:03:39 -0800
commit2f413c89374493184768e2ee6fe0b35f0ef52994 (patch)
tree745e727f761fd30d792cca9d61364b93bffd8a1b /components/util/resource_files.rs
parentb2b6d4d0d1e381d038dc5e45cbe74304704934e7 (diff)
downloadservo-2f413c89374493184768e2ee6fe0b35f0ef52994.tar.gz
servo-2f413c89374493184768e2ee6fe0b35f0ef52994.zip
Move the servo crate from root to components/servo
Diffstat (limited to 'components/util/resource_files.rs')
-rw-r--r--components/util/resource_files.rs8
1 files changed, 6 insertions, 2 deletions
diff --git a/components/util/resource_files.rs b/components/util/resource_files.rs
index 73e1148cc9a..b40c93f2651 100644
--- a/components/util/resource_files.rs
+++ b/components/util/resource_files.rs
@@ -17,11 +17,15 @@ 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>/target`.
+ // 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() {
+ if !path.is_dir() { // self_exe_path() is probably in .../target/release
path.pop();
path.pop();
path.push("resources");