Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Mpp
Mpp
Commits
e2b853ed
Commit
e2b853ed
authored
Mar 24, 2020
by
niklas.baumgarten
Browse files
updated dir names
parent
ba4b8b4a
Changes
1
Hide whitespace changes
Inline
Side-by-side
python/mppy.py
View file @
e2b853ed
...
...
@@ -7,13 +7,13 @@ from subprocess import Popen, PIPE
class
Mpp
:
PY_FILE_DIR
=
os
.
path
.
dirname
(
os
.
path
.
realpath
(
__file__
))
MPP_DIR
=
os
.
path
.
abspath
(
os
.
path
.
join
(
PY_FILE_DIR
,
'..'
))
MPP_BUILD_DIR
=
os
.
path
.
abspath
(
os
.
path
.
join
(
MPP_DIR
,
'build'
))
MPP_
ROOT_
DIR
=
os
.
path
.
abspath
(
os
.
path
.
join
(
PY_FILE_DIR
,
'..'
))
MPP_BUILD_DIR
=
os
.
path
.
abspath
(
os
.
path
.
join
(
MPP_
ROOT_
DIR
,
'build'
))
MPP_LOG_DIR
=
os
.
path
.
abspath
(
os
.
path
.
join
(
MPP_BUILD_DIR
,
'log'
))
MPP_DATA_DIR
=
os
.
path
.
abspath
(
os
.
path
.
join
(
MPP_BUILD_DIR
,
'data'
))
MPP_VTK_DATA_DIR
=
os
.
path
.
abspath
(
os
.
path
.
join
(
MPP_DATA_DIR
,
'vtk'
))
MPP_PY_DATA_DIR
=
os
.
path
.
abspath
(
os
.
path
.
join
(
MPP_DATA_DIR
,
'py'
))
PROJECT_ROOT_DIR
=
os
.
path
.
abspath
(
os
.
path
.
join
(
MPP_DIR
,
'..'
))
PROJECT_ROOT_DIR
=
os
.
path
.
abspath
(
os
.
path
.
join
(
MPP_
ROOT_
DIR
,
'..'
))
PROJECT_BUILD_DIR
=
os
.
path
.
abspath
(
os
.
path
.
join
(
PROJECT_ROOT_DIR
,
'build'
))
PROJECT_LOG_DIR
=
os
.
path
.
abspath
(
os
.
path
.
join
(
PROJECT_BUILD_DIR
,
'log'
))
PROJECT_DATA_DIR
=
os
.
path
.
abspath
(
os
.
path
.
join
(
PROJECT_BUILD_DIR
,
'data'
))
...
...
@@ -32,7 +32,7 @@ class Mpp:
def
check_git_mpp
(
self
):
return
self
.
run_subprocess
([
'git'
,
'ls-remote'
,
self
.
git_mpp_address
],
self
.
MPP_DIR
)
self
.
MPP_
ROOT_
DIR
)
def
git_pull_project
(
self
,
branch
=
'master'
):
rc_project
=
self
.
run_subprocess
([
'git'
,
'pull'
,
'origin'
,
branch
],
...
...
@@ -47,7 +47,7 @@ class Mpp:
def
git_pull_mpp
(
self
,
branch
=
'master'
):
return
self
.
run_subprocess
([
'git'
,
'pull'
,
'origin'
,
branch
],
self
.
MPP_DIR
)
self
.
MPP_
ROOT_
DIR
)
def
run_subprocess
(
self
,
args
,
cwd
):
if
isinstance
(
args
,
list
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment