Commit fad65618 authored by niklas.baumgarten's avatar niklas.baumgarten
Browse files

[Add-Build-Dir-To-Mppy] added build dir to mppy

parent 3af3ab6b
......@@ -9,15 +9,15 @@ from .utilities.test_utilities import print_test_results
class Mpp:
def __init__(self, project_name='M++', executable='M++',
kernels=4, mute=False, fail=False):
def __init__(self, project_name='M++', executable='M++', kernels=4, mute=False,
build_dir='build'):
self.project_name = project_name
self.executable = executable
self.kernels = kernels
self.mute = mute
self.dm = DirectoryManager(self.project_name)
self.dm = DirectoryManager(self.project_name, build_dir)
self.sm = SubprocessManager(self.mute)
self.lp = LogParser(self.dm.LOG_FILE)
......
......@@ -8,7 +8,7 @@ from shutil import rmtree
class DirectoryManager:
def __init__(self, project_name='M++'):
def __init__(self, project_name='M++', build_dir='build'):
self.PY_FILE_DIR = dirname(realpath(__file__))
self.MPP_ROOT_DIR = abspath(join(self.PY_FILE_DIR, '../../../'))
......@@ -17,14 +17,14 @@ class DirectoryManager:
else:
self.PROJECT_ROOT_DIR = abspath(join(self.MPP_ROOT_DIR, '..'))
self.MPP_BUILD_DIR = abspath(join(self.MPP_ROOT_DIR, 'build'))
self.MPP_BUILD_DIR = abspath(join(self.MPP_ROOT_DIR, build_dir))
self.MPP_LOG_DIR = abspath(join(self.MPP_BUILD_DIR, 'log'))
self.MPP_DATA_DIR = abspath(join(self.MPP_BUILD_DIR, 'data'))
self.MPP_VTK_DATA_DIR = abspath(join(self.MPP_DATA_DIR, 'vtk'))
self.MPP_VTU_DATA_DIR = abspath(join(self.MPP_DATA_DIR, 'vtu'))
self.MPP_PY_DATA_DIR = abspath(join(self.MPP_DATA_DIR, 'py'))
self.PROJECT_BUILD_DIR = abspath(join(self.PROJECT_ROOT_DIR, 'build'))
self.PROJECT_BUILD_DIR = abspath(join(self.PROJECT_ROOT_DIR, build_dir))
self.PROJECT_LOG_DIR = abspath(join(self.PROJECT_BUILD_DIR, 'log'))
self.PROJECT_DATA_DIR = abspath(join(self.PROJECT_BUILD_DIR, 'data'))
self.PROJECT_VTK_DATA_DIR = abspath(join(self.PROJECT_DATA_DIR, 'vtk'))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment