config: Use 'home_dir' for all paths instead of hardcoded "~/cerbero"

Allows using different cerbero checkouts/builds at the same time on the
same machine (instead of having conflicts everywhere)

The default value for home_dir remains "~/cerbero" so doesn't cause any
regression for people not specifying the 'home_dir' property

7 files changed, 8 insertions, 8 deletions

diff --git a/config/android.config b/config/android.config
index 0163365b..b5690421 100644
--- a/config/android.config
+++ b/config/android.config
@@ -9,7 +9,7 @@ from cerbero.errors import FatalError
 import cerbero.utils.messages as m
 
 if not toolchain_prefix:
-    toolchain_prefix = os.path.expanduser('~/cerbero/android-ndk-r9')
+    toolchain_prefix = os.path.join(home_dir, 'android-ndk-r9')
 
 toolchain_path = None
 
diff --git a/config/build-tools.cbc b/config/build-tools.cbc
index 7a1033ae..0169e0f6 100755
--- a/config/build-tools.cbc
+++ b/config/build-tools.cbc
@@ -1,5 +1,5 @@
 import os
 
-prefix = os.path.expanduser('~/cerbero/build-tools')
-sources = os.path.expanduser('~/cerbero/sources/build-tools')
+prefix = os.path.join(home_dir, 'build-tools')
+sources = os.path.join(home_dir, 'sources', 'build-tools')
 cache_file = 'build-tools'
diff --git a/config/mingw-w32-lin.cbc b/config/mingw-w32-lin.cbc
index 2358dc2b..2fdbabee 100644
--- a/config/mingw-w32-lin.cbc
+++ b/config/mingw-w32-lin.cbc
@@ -4,5 +4,5 @@ from cerbero.config import Platform, Architecture, Distro, DistroVersion
 target_arch=Architecture.X86
 cache_file='mingw-w32-lin'
 prefix=os.path.expanduser('~/mingw/linux/w32')
-sources=os.path.expanduser('~/cerbero/sources/mingw-w32-lin')
+sources=os.path.join(home_dir, 'sources', 'mingw-w32-lin')
 recipes_dir = os.path.join(recipes_dir, 'toolchain')
diff --git a/config/mingw-w32-win.cbc b/config/mingw-w32-win.cbc
index 58beb3d1..4e230d1e 100644
--- a/config/mingw-w32-win.cbc
+++ b/config/mingw-w32-win.cbc
@@ -7,7 +7,7 @@ target_distro_version=DistroVersion.WINDOWS_7
 target_arch=Architecture.X86
 cache_file='mingw-w32-win'
 prefix=os.path.expanduser('~/mingw/windows/w32')
-sources=os.path.expanduser('~/cerbero/sources/mingw-w32-win')
+sources=os.path.join(home_dir, 'sources', 'mingw-w32-win')
 toolchain_prefix=os.path.expanduser('~/mingw/linux/w32/')
 recipes_dir = os.path.join(recipes_dir, 'toolchain')
 build='x86_64-pc-linux-gnu'
diff --git a/config/mingw-w64-lin.cbc b/config/mingw-w64-lin.cbc
index 0ab27e7b..c28c6cc8 100644
--- a/config/mingw-w64-lin.cbc
+++ b/config/mingw-w64-lin.cbc
@@ -4,5 +4,5 @@ from cerbero.config import Platform, Architecture, Distro, DistroVersion
 target_arch=Architecture.X86_64
 cache_file='mingw-w64-lin'
 prefix=os.path.expanduser('~/mingw/linux/w64')
-sources=os.path.expanduser('~/cerbero/sources/mingw-w64-lin')
+sources=os.path.join(home_dir, 'sources', 'mingw-w64-lin')
 recipes_dir = os.path.join(recipes_dir, 'toolchain')
diff --git a/config/mingw-w64-win.cbc b/config/mingw-w64-win.cbc
index ce9301f1..454db9ca 100644
--- a/config/mingw-w64-win.cbc
+++ b/config/mingw-w64-win.cbc
@@ -7,7 +7,7 @@ target_distro_version=DistroVersion.WINDOWS_7
 target_arch=Architecture.X86_64
 cache_file='mingw-w64-win'
 prefix=os.path.expanduser('~/mingw/windows/w64')
-sources=os.path.expanduser('~/cerbero/sources/mingw-w64-win')
+sources=os.path.join(home_dir, 'sources', 'mingw-w64-win')
 toolchain_prefix=os.path.expanduser('~/mingw/linux/w64/')
 recipes_dir = os.path.join(recipes_dir, 'toolchain')
 build='x86_64-pc-linux-gnu'
diff --git a/config/windows.config b/config/windows.config
index d4ebd673..da4aa20e 100644
--- a/config/windows.config
+++ b/config/windows.config
@@ -33,7 +33,7 @@ target = host
 py_prefix='lib/python2.7'
 
 if not toolchain_prefix:
-    toolchain_prefix = os.path.join(os.path.expanduser('~/cerbero/mingw'), _path)
+    toolchain_prefix = os.path.join(home_dir, 'mingw', _path)
 
 def cmd(command):
     return '%s-%s' % (host, command)