Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Narvaez <dwnarvaez@gmail.com>2012-11-25 22:11:13 (GMT)
committer Daniel Narvaez <dwnarvaez@gmail.com>2012-11-25 22:11:13 (GMT)
commit9df732f0d1696875262a9d6b480cf31ac7145113 (patch)
treeeee3e8f233e7e5308fb421bd01be7db8f46e37de
parent8e12b81139d65835c6bd9226e9593f1793508df5 (diff)
Replace devbot dir with home
It was weird to store that stuff in the install dir.
-rw-r--r--commands/common.py1
-rw-r--r--[-rwxr-xr-x]devbot/autoinstall.py0
-rw-r--r--devbot/build.py2
-rw-r--r--devbot/config.py11
-rw-r--r--devbot/environ.py2
5 files changed, 9 insertions, 7 deletions
diff --git a/commands/common.py b/commands/common.py
index 9a6d5c0..a61139e 100644
--- a/commands/common.py
+++ b/commands/common.py
@@ -18,6 +18,7 @@ def setup():
config.set_build_dir(os.path.join(base_dir, "build"))
config.set_commands_dir(os.path.join(base_dir, "commands"))
config.set_logs_dir(os.path.join(base_dir, "logs"))
+ config.set_home_dir(os.path.join(base_dir, "home"))
config.set_prefs_path(os.path.join(base_dir, "prefs"))
version = distro.get_system_version()
diff --git a/devbot/autoinstall.py b/devbot/autoinstall.py
index 053262e..053262e 100755..100644
--- a/devbot/autoinstall.py
+++ b/devbot/autoinstall.py
diff --git a/devbot/build.py b/devbot/build.py
index 65a7ea3..f117667 100644
--- a/devbot/build.py
+++ b/devbot/build.py
@@ -16,7 +16,7 @@ from devbot import environ
state = { "built_modules": {} }
def get_state_path():
- return os.path.join(config.devbot_dir, "state.json")
+ return os.path.join(config.home_dir, "state.json")
def load_state():
global state
diff --git a/devbot/config.py b/devbot/config.py
index 8a734d5..437bfe7 100644
--- a/devbot/config.py
+++ b/devbot/config.py
@@ -10,10 +10,10 @@ commands_dir = None
install_dir = None
prefix_dir = None
lib_dir = None
-devbot_dir = None
share_dir = None
bin_dir = None
etc_dir = None
+home_dir = None
dep_files = None
module_files = None
package_files = None
@@ -53,6 +53,11 @@ def set_logs_dir(dir):
global logs_dir
logs_dir = dir
+def set_home_dir(dir):
+ global home_dir
+ home_dir = dir
+ _ensure_dir(home_dir)
+
def _get_prefix_dir(dir, relocatable):
real_prefix_path = os.path.join(dir, "real_prefix")
@@ -81,7 +86,6 @@ def set_install_dir(dir, relocatable=False):
global system_lib_dir
global install_dir
global prefix_dir
- global devbot_dir
global share_dir
global bin_dir
global etc_dir
@@ -92,9 +96,6 @@ def set_install_dir(dir, relocatable=False):
prefix_dir = _get_prefix_dir(dir, relocatable)
- devbot_dir = os.path.join(prefix_dir, "devbot")
- _ensure_dir(devbot_dir)
-
share_dir = os.path.join(prefix_dir, "share")
_ensure_dir(share_dir)
_ensure_dir(os.path.join(share_dir, "aclocal"))
diff --git a/devbot/environ.py b/devbot/environ.py
index 8de1a7f..c8b6343 100644
--- a/devbot/environ.py
+++ b/devbot/environ.py
@@ -35,7 +35,7 @@ def _setup_variables():
_add_path("GST_PLUGIN_PATH",
os.path.join(config.lib_dir , "gstreamer-1.0"))
_add_path("GST_REGISTRY",
- os.path.join(config.devbot_dir, "gstreamer.registry"))
+ os.path.join(config.home_dir, "gstreamer.registry"))
_add_path("PYTHONPATH",
sysconfig.get_python_lib(prefix=config.prefix_dir))
_add_path("PYTHONPATH",