Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion easybuild/easyblocks/d/db.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
@author: Kenneth Hoste (Ghent University)
"""
import os
import shutil

from easybuild.easyblocks.generic.configuremake import ConfigureMake
from easybuild.tools.build_log import EasyBuildError
Expand Down
1 change: 0 additions & 1 deletion easybuild/easyblocks/d/dl_poly_classic.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
"""
import glob
import os
import shutil

from easybuild.tools.build_log import EasyBuildError
from easybuild.tools.filetools import copy_file, copy_dir
Expand Down
16 changes: 8 additions & 8 deletions easybuild/easyblocks/d/dolfin.py
Original file line number Diff line number Diff line change
Expand Up @@ -230,14 +230,6 @@ def test_step(self):
]
env_var_cmds = ' && '.join(['export %s="%s"' % (var, val) for (var, val) in env_vars])

# test command templates
cmd_template_python = " && ".join([
env_var_cmds,
"cd %(dir)s",
"python demo_%(name)s.py",
"cd -",
])

cpp_cmds = [
env_var_cmds,
"cd %(dir)s",
Expand Down Expand Up @@ -269,6 +261,14 @@ def test_step(self):
# exclude Python tests for now, because they 'hang' sometimes (unclear why)
# they can be reinstated once run_cmd (or its equivalent) has support for timeouts
# see https://github.com/easybuilders/easybuild-framework/issues/581
# test command templates
# cmd_template_python = " && ".join([
# env_var_cmds,
# "cd %(dir)s",
# "python demo_%(name)s.py",
# "cd -",
# ])

# for (tmpl, subdir) in [(cmd_template_python, 'python'), (cmd_template_cpp, 'cpp')]

# subdomains-poisson has no C++ get_version, only Python
Expand Down
22 changes: 11 additions & 11 deletions easybuild/easyblocks/d/doris.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,16 @@ def configure_step(self):
"===> Press enter to continue (CTRL-C to exit).": '',
}
std_qa = {
"===> Do you want to compile a more verbose DEBUG version \(y/n\)\? \[n\](.|\n)*expected results\)": 'n',
"===> What is your C\+\+ compiler\? \[.*\]": os.getenv('CXX'),
"===> Do you have the FFTW library \(y/n\)\? \[.*\]": 'y',
"===> What is the path to the FFTW library \(libfftw3f.*\)\? \[.*\]": os.path.join(fftw, 'lib'),
"===> What is the path to the FFTW include file \(fftw3.h\)\? \[.*\]": os.path.join(fftw, 'include'),
"===> Do you have the VECLIB library \(y/n\)\? \[.*\]": 'n',
"===> Do you have the LAPACK library \(y/n\)\? \[.*\]": 'y',
"===> What is the path to the LAPACK library liblapack.a\? \[.*\]": os.getenv('LAPACK_LIB_DIR'),
"===> Are you working on a Little Endian \(X86 PC, Intel\) machine \(y/n\)\? \[.*\]": 'y',
"===> Installation of Doris in directory: /usr/local/bin \(y/n\)\? \[.*\]": 'n',
r"===> Do you want to compile a more verbose DEBUG version \(y/n\)\? \[n\](.|\n)*expected results\)": 'n',
r"===> What is your C\+\+ compiler\? \[.*\]": os.getenv('CXX'),
r"===> Do you have the FFTW library \(y/n\)\? \[.*\]": 'y',
r"===> What is the path to the FFTW library \(libfftw3f.*\)\? \[.*\]": os.path.join(fftw, 'lib'),
r"===> What is the path to the FFTW include file \(fftw3.h\)\? \[.*\]": os.path.join(fftw, 'include'),
r"===> Do you have the VECLIB library \(y/n\)\? \[.*\]": 'n',
r"===> Do you have the LAPACK library \(y/n\)\? \[.*\]": 'y',
r"===> What is the path to the LAPACK library liblapack.a\? \[.*\]": os.getenv('LAPACK_LIB_DIR'),
r"===> Are you working on a Little Endian \(X86 PC, Intel\) machine \(y/n\)\? \[.*\]": 'y',
r"===> Installation of Doris in directory: /usr/local/bin \(y/n\)\? \[.*\]": 'n',
}

run_cmd_qa('./configure', qa, std_qa=std_qa, log_all=True, simple=True)
Expand All @@ -84,7 +84,7 @@ def build_step(self):
lflags = "-L%s -lfftw3f " % os.path.join(get_software_root('FFTW'), 'lib')
lflags += "-L%s %s" % (os.getenv('LAPACK_LIB_DIR'), os.getenv('LIBLAPACK_MT'))
self.cfg.update('buildopts', 'LFLAGS="%s"' % lflags)
self.cfg.update('buildopts', 'CFLAGSOPT="%s \$(DEFS)"' % os.getenv('CXXFLAGS'))
self.cfg.update('buildopts', r'CFLAGSOPT="%s \$(DEFS)"' % os.getenv('CXXFLAGS'))

super(EB_Doris, self).build_step()

Expand Down
7 changes: 4 additions & 3 deletions easybuild/easyblocks/d/doxygen.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
from easybuild.tools.run import run_cmd
from easybuild.easyblocks.generic.cmakemake import CMakeMake


class EB_Doxygen(CMakeMake):
"""Support for building/installing Doxygen"""

Expand All @@ -45,9 +46,9 @@ def configure_step(self):
for versions before 1.8.10. Newer versions use cmake instead of configure"""
if LooseVersion(self.version) < LooseVersion("1.8.10"):

cmd = "%s ./configure --prefix %s %s" % (self.cfg['preconfigopts'], self.installdir,
self.cfg['configopts'])
run_cmd(cmd, log_all=True, simple=True)
cmd = "%s ./configure --prefix %s %s" % (self.cfg['preconfigopts'], self.installdir,
self.cfg['configopts'])
run_cmd(cmd, log_all=True, simple=True)
else:
super(EB_Doxygen, self).configure_step()

Expand Down