try to use relative directories
authorTimo Savola <tsavola@movial.fi>
Fri, 4 Apr 2008 13:31:00 +0000 (16:31 +0300)
committerTimo Savola <tsavola@movial.fi>
Fri, 4 Apr 2008 13:31:00 +0000 (16:31 +0300)
matrix/config.py
matrix/matrix.py

index af7cc913a58e67ad6c09538061c56c13ddefcb88..15db6f08a351efac6bbf35a24379bd22ff039afc 100644 (file)
@@ -4,7 +4,7 @@
 
 import os as _os
 
 
 import os as _os
 
-top_dir = _os.environ.get('MATRIX_TOPDIR', _os.getcwd())
+top_dir = _os.environ.get('MATRIX_TOPDIR', '')
 cache_dir = _os.path.join(top_dir, 'build-cache')
 global_cache_dir = '/usr/share/matrix/build-cache'
 script_dir = None
 cache_dir = _os.path.join(top_dir, 'build-cache')
 global_cache_dir = '/usr/share/matrix/build-cache'
 script_dir = None
index 11d9aaa418d485e2ed8e79ecb5af483489633064..8edcc7428b30525a53a0281de4e2f26b672fe457 100644 (file)
@@ -462,8 +462,8 @@ def start_job(c, jobs, make_jobs):
        workdir = os.path.join(config.top_dir, 'src', c.name)
        args = ['make', '--no-print-directory', '-f', makefile, '-C', workdir,
                '-j', str(make_jobs), 'build_matrix_component',
        workdir = os.path.join(config.top_dir, 'src', c.name)
        args = ['make', '--no-print-directory', '-f', makefile, '-C', workdir,
                '-j', str(make_jobs), 'build_matrix_component',
-               'MATRIX_TOPDIR='    + config.top_dir,
-               'MATRIX_SCRIPTDIR=' + config.script_dir,
+               'MATRIX_TOPDIR='    + os.path.abspath(config.top_dir),
+               'MATRIX_SCRIPTDIR=' + os.path.abspath(config.script_dir),
                'MATRIX_COMPONENT=' + c.name,
                'MATRIX_ARCH='      + board.arch,
                'MATRIX_GCC_MARCH=' + board.gcc_march,
                'MATRIX_COMPONENT=' + c.name,
                'MATRIX_ARCH='      + board.arch,
                'MATRIX_GCC_MARCH=' + board.gcc_march,