Skip to content

Commit

Permalink
Merge pull request #69 from nudded/enforce-consistent-eb-naming
Browse files Browse the repository at this point in the history
rename easyconfig files according to standard
  • Loading branch information
boegel committed Aug 10, 2012
2 parents 6a50b80 + 3ec9c87 commit eb5cb1a
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 7 deletions.
12 changes: 6 additions & 6 deletions easybuild/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,12 @@ def processEasyconfig(path, log, onlyBlocks=None, regtest_online=False):

del eb

# ensure the pathname is equal to the module
base_name, ext = os.path.splitext(os.path.basename(spec))
module_name = "-".join(package['module'])
if base_name.lower() != module_name.lower():
log.error("easyconfig file: %s does not contain module %s" % (spec, module_name))

packages.append(package)

return packages
Expand Down Expand Up @@ -405,12 +411,6 @@ def resolveDependencies(unprocessed, robot, log):
log.info("Robot: resolving dependency %s with %s" % (candidates[0], path))

processedSpecs = processEasyconfig(path, log)
mods = [spec['module'] for spec in processedSpecs]
if not candidates[0] in mods:
msg = "Expected easyconfig %s to resolve dependency for %s, but it does not" % (path, candidates[0])
msg += " (list of obtained modules after processing easyconfig: %s)" % mods
log.error(msg)

unprocessed.extend(processedSpecs)
robotAddedDependency = True
break
Expand Down
24 changes: 24 additions & 0 deletions easybuild/easyconfigs/b/BLACS/BLACS-1.1-GCC-4.6.3-MVAPICH2-1.7.eb
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name='BLACS'
version='1.1'

homepage='http://www.netlib.org/blacs/'
description="""The BLACS (Basic Linear Algebra Communication Subprograms) project is an ongoing investigation whose purpose is to create a linear algebra oriented message passing interface that may be implemented efficiently and uniformly across a large range of distributed memory platforms."""

toolkit={'name':'GCC','version':'4.6.3'}

mpilib='MVAPICH2'
mpilibver='1.7'
versionsuffix='-%s-%s'%(mpilib, mpilibver)

sources=['mpiblacs.tgz',
'mpiblacs-patch03.tgz']
sourceURLs=[homepage]

dependencies=[(mpilib, mpilibver)]

patches=['bmake.mpi.patch']

## parallel build tends to fail
#parallel=1

moduleclass='lib'
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/e/ECore/ecore-1.5.2.eb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ sources=['%s-%s.tgz'%(name.lower(),version)]
patches=['ecore-license-var.patch']

sanityCheckPaths = {
'files':["ecore.sh",'noarch/launch.sh'] + ['arch/linux-rh5-x86_64/bin/%s' % name for name in ['ismodeller', 'ecore', 'packer', 'PorenetworkExtraction', 'Poresim', 'unpacker' ]],
'files':["ecore.sh",'noarch/launch.sh'] + ['arch/linux-rh5-x86_64/bin/%s' % bin for bin in ['ismodeller', 'ecore', 'packer', 'PorenetworkExtraction', 'Poresim', 'unpacker' ]],
'dirs':[]
}

0 comments on commit eb5cb1a

Please sign in to comment.