From 76e1e10239fd3ed025750224ec2cf2318a2f0305 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 26 May 2020 10:29:05 +0200
Subject: [PATCH] Mods for https://github.com/ufz/ogs/pull/2563.
---
ogscm/build_jenkins_definitions.py | 8 ++++----
ogscm/cli.py | 12 ++++++++----
ogscm/cli_args.py | 6 ++++++
3 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/ogscm/build_jenkins_definitions.py b/ogscm/build_jenkins_definitions.py
index 0ca3a31..b19c588 100644
--- a/ogscm/build_jenkins_definitions.py
+++ b/ogscm/build_jenkins_definitions.py
@@ -16,7 +16,7 @@ subprocess.run(f"python ogscm/cli.py --out {args.out} --file Dockerfile.clang.fu
"--base_image ubuntu:18.04 --compiler clang --jenkins --iwyy "
"--compiler_version 9",
shell=True)
-# subprocess.run(f"python ogscm/cli.py --out {args.out} --file Dockerfile.clang.gui "
-# "--base_image ubuntu:18.04 --compiler clang --jenkins --iwyy "
-# "--compiler_version 9 --gui",
-# shell=True)
+subprocess.run(f"python ogscm/cli.py --out {args.out} --file Dockerfile.clang.gui "
+ "--base_image ubuntu:20.04 --compiler clang --jenkins --iwyy "
+ "--compiler_version 9 --pm system --gui",
+ shell=True)
diff --git a/ogscm/cli.py b/ogscm/cli.py
index cc9f163..658cb14 100644
--- a/ogscm/cli.py
+++ b/ogscm/cli.py
@@ -254,7 +254,7 @@ def main(): # pragma: no cover
'libxt-dev'
])
if ogscm.config.g_package_manager == package_manager.CONAN:
- Stage0 += cmake(eula=True, version='3.14.7')
+ Stage0 += cmake(eula=True, version='3.16.6')
conan_user_home = '/opt/conan'
if args.dev:
conan_user_home = ''
@@ -279,12 +279,13 @@ def main(): # pragma: no cover
'/opt/spack/bin/spack install --only dependencies vtk@8.1.2 +osmesa'
])
elif ogscm.config.g_package_manager == package_manager.SYSTEM:
- Stage0 += cmake(eula=True, version='3.14.7')
+ Stage0 += cmake(eula=True, version='3.16.6')
# Use ldconfig to set library search path (instead of
# LD_LIBRARY_PATH) as host var overwrites container var. See
# https://github.com/sylabs/singularity/pull/2669
- Stage0 += boost(version='1.66.0') # header only?
- Stage0 += environment(variables={'BOOST_ROOT': '/usr/local/boost'})
+ # Stage0 += boost(version='1.66.0') # header only?
+ Stage0 += packages(ospackages=['libboost-dev'])
+ # Stage0 += environment(variables={'BOOST_ROOT': '/usr/local/boost'})
Stage0 += eigen()
vtk_cmake_args = [
'-DModule_vtkIOXML=ON',
@@ -339,6 +340,9 @@ def main(): # pragma: no cover
Stage0 += pip(packages=args.pip, pip='pip3')
Stage1 += pip(packages=args.pip, pip='pip3')
+ if args.packages:
+ Stage0 += packages(ospackages=args.packages)
+
if ogs_version != 'off':
mount_args = ''
if args.ccache:
diff --git a/ogscm/cli_args.py b/ogscm/cli_args.py
index 9ae8928..d08a771 100644
--- a/ogscm/cli_args.py
+++ b/ogscm/cli_args.py
@@ -189,6 +189,12 @@ class Cli_Args(argparse.ArgumentParser):
default=[],
metavar='package',
help='Install additional Python packages')
+ switches_g.add_argument('--packages',
+ nargs='*',
+ type=str,
+ default=[],
+ metavar='packages',
+ help='Install additional OS packages')
maint_g = self.add_argument_group('Maintenance')
maint_g.add_argument(
'--clean',
--
GitLab