Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
OGS Container Maker
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ogs
OGS Container Maker
Commits
b764ce50
Verified
Commit
b764ce50
authored
4 years ago
by
Lars Bilke
Browse files
Options
Downloads
Patches
Plain Diff
Removed --gitlab option.
parent
f883b8ca
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
README.md
+0
-1
0 additions, 1 deletion
README.md
ogscm/cli.py
+3
-3
3 additions, 3 deletions
ogscm/cli.py
ogscm/cli_args.py
+0
-4
0 additions, 4 deletions
ogscm/cli_args.py
with
3 additions
and
8 deletions
README.md
+
0
−
1
View file @
b764ce50
...
@@ -108,7 +108,6 @@ Additional options:
...
@@ -108,7 +108,6 @@ Additional options:
--gui Builds the GUI (Data Explorer) (default: False)
--gui Builds the GUI (Data Explorer) (default: False)
--docs Setup documentation requirements (Doxygen) (default: False)
--docs Setup documentation requirements (Doxygen) (default: False)
--jenkins Setup Jenkins slave (default: False)
--jenkins Setup Jenkins slave (default: False)
--gitlab Setup for GitLab-CI (default: False)
--cvode Install and configure with cvode (default: False)
--cvode Install and configure with cvode (default: False)
--cppcheck Install cppcheck (default: False)
--cppcheck Install cppcheck (default: False)
--iwyy Install include-what-you-use (default: False)
--iwyy Install include-what-you-use (default: False)
...
...
This diff is collapsed.
Click to expand it.
ogscm/cli.py
+
3
−
3
View file @
b764ce50
...
@@ -39,7 +39,7 @@ def main(): # pragma: no cover
...
@@ -39,7 +39,7 @@ def main(): # pragma: no cover
cli
=
Cli_Args
()
cli
=
Cli_Args
()
args
=
cli
.
parse_args
()
args
=
cli
.
parse_args
()
if
args
.
jenkins
or
args
.
gitlab
:
if
args
.
jenkins
:
args
.
ogs
=
[
'
off
'
]
args
.
ogs
=
[
'
off
'
]
if
args
.
deploy
!=
''
:
if
args
.
deploy
!=
''
:
args
.
build
=
True
args
.
build
=
True
...
@@ -256,7 +256,7 @@ def main(): # pragma: no cover
...
@@ -256,7 +256,7 @@ def main(): # pragma: no cover
if
args
.
gui
:
if
args
.
gui
:
Stage0
+=
packages
(
Stage0
+=
packages
(
apt
=
[
apt
=
[
'
mesa-common-dev
'
,
'
libgl1-mesa-dev
'
,
'
libglu1-mesa-dev
'
,
'
mesa-common-dev
'
,
'
libgl1-mesa-dev
'
,
'
libglu1-mesa-dev
'
,
x
'
libxt-dev
'
'
libxt-dev
'
],
],
yum
=
[
yum
=
[
...
@@ -297,7 +297,6 @@ def main(): # pragma: no cover
...
@@ -297,7 +297,6 @@ def main(): # pragma: no cover
# Stage0 += boost(version='1.66.0') # header only?
# Stage0 += boost(version='1.66.0') # header only?
Stage0
+=
packages
(
apt
=
[
'
libboost-dev
'
],
yum
=
[
'
boost-devel
'
],
epel
=
True
)
Stage0
+=
packages
(
apt
=
[
'
libboost-dev
'
],
yum
=
[
'
boost-devel
'
],
epel
=
True
)
# Stage0 += environment(variables={'BOOST_ROOT': '/usr/local/boost'})
# Stage0 += environment(variables={'BOOST_ROOT': '/usr/local/boost'})
Stage0
+=
eigen
()
vtk_cmake_args
=
[
vtk_cmake_args
=
[
'
-DModule_vtkIOXML=ON
'
,
'
-DModule_vtkIOXML=ON
'
,
'
-DVTK_Group_Rendering=OFF
'
,
'
-DVTK_Group_Rendering=OFF
'
,
...
@@ -337,6 +336,7 @@ def main(): # pragma: no cover
...
@@ -337,6 +336,7 @@ def main(): # pragma: no cover
ldconfig
=
True
)
ldconfig
=
True
)
if
ompi
!=
'
off
'
:
if
ompi
!=
'
off
'
:
Stage0
+=
petsc
(
version
=
'
3.11.3
'
,
ldconfig
=
True
)
Stage0
+=
petsc
(
version
=
'
3.11.3
'
,
ldconfig
=
True
)
Stage0
+=
eigen
(
version
=
'
3.3.7
'
)
if
args
.
cvode
:
if
args
.
cvode
:
Stage0
+=
cvode
()
Stage0
+=
cvode
()
if
args
.
cppcheck
:
if
args
.
cppcheck
:
...
...
This diff is collapsed.
Click to expand it.
ogscm/cli_args.py
+
0
−
4
View file @
b764ce50
...
@@ -153,10 +153,6 @@ class Cli_Args(argparse.ArgumentParser):
...
@@ -153,10 +153,6 @@ class Cli_Args(argparse.ArgumentParser):
dest
=
'
jenkins
'
,
dest
=
'
jenkins
'
,
action
=
'
store_true
'
,
action
=
'
store_true
'
,
help
=
'
Setup Jenkins slave
'
)
help
=
'
Setup Jenkins slave
'
)
switches_g
.
add_argument
(
'
--gitlab
'
,
dest
=
'
gitlab
'
,
action
=
'
store_true
'
,
help
=
'
Setup for GitLab-CI
'
)
switches_g
.
add_argument
(
'
--cvode
'
,
switches_g
.
add_argument
(
'
--cvode
'
,
dest
=
'
cvode
'
,
dest
=
'
cvode
'
,
action
=
'
store_true
'
,
action
=
'
store_true
'
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment