From f0a049a29e43826fafb93e268c1081d805a0fc66 Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Wed, 11 Jul 2012 08:39:29 -0400
Subject: [PATCH] Don't depend on the mitx directory being named that, so that
tests will run in jenkins where mitx is checked out as workspace
---
cms/envs/common.py | 7 ++++---
lms/envs/common.py | 9 +++++----
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/cms/envs/common.py b/cms/envs/common.py
index 4f801aa29a4..8d3e2672daa 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -36,14 +36,15 @@ MITX_FEATURES = {
############################# SET PATH INFORMATION #############################
PROJECT_ROOT = path(__file__).abspath().dirname().dirname() # /mitx/cms
-COMMON_ROOT = PROJECT_ROOT.dirname() / "common"
-ENV_ROOT = PROJECT_ROOT.dirname().dirname() # virtualenv dir /mitx is in
+REPO_ROOT = PROJECT_ROOT.dirname()
+COMMON_ROOT = REPO_ROOT / "common"
+ENV_ROOT = REPO_ROOT.dirname() # virtualenv dir /mitx is in
COURSES_ROOT = ENV_ROOT / "data"
# FIXME: To support multiple courses, we should walk the courses dir at startup
DATA_DIR = COURSES_ROOT
-sys.path.append(ENV_ROOT)
+sys.path.append(REPO_ROOT)
sys.path.append(PROJECT_ROOT / 'djangoapps')
sys.path.append(PROJECT_ROOT / 'lib')
sys.path.append(COMMON_ROOT / 'djangoapps')
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 117c433aae7..772c0db85ea 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -50,16 +50,17 @@ DEFAULT_GROUPS = []
GENERATE_PROFILE_SCORES = False
############################# SET PATH INFORMATION #############################
-PROJECT_ROOT = path(__file__).abspath().dirname().dirname() # /mitx/lms
-COMMON_ROOT = PROJECT_ROOT.dirname() / "common"
-ENV_ROOT = PROJECT_ROOT.dirname().dirname() # virtualenv dir /mitx is in
+PROJECT_ROOT = path(__file__).abspath().dirname().dirname() # /mitx/lms
+REPO_ROOT = PROJECT_ROOT.dirname()
+COMMON_ROOT = REPO_ROOT / "common"
+ENV_ROOT = REPO_ROOT.dirname() # virtualenv dir /mitx is in
ASKBOT_ROOT = ENV_ROOT / "askbot-devel"
COURSES_ROOT = ENV_ROOT / "data"
# FIXME: To support multiple courses, we should walk the courses dir at startup
DATA_DIR = COURSES_ROOT
-sys.path.append(ENV_ROOT)
+sys.path.append(REPO_ROOT)
sys.path.append(ASKBOT_ROOT)
sys.path.append(ASKBOT_ROOT / "askbot" / "deps")
sys.path.append(PROJECT_ROOT / 'djangoapps')
--
GitLab