diff --git a/easybuild/build.py b/easybuild/build.py index faac78efca..59a558495a 100644 --- a/easybuild/build.py +++ b/easybuild/build.py @@ -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 @@ -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 diff --git a/easybuild/easyconfigs/b/BLACS/BLACS-1.1-GCC-4.6.3-MVAPICH2-1.7.eb b/easybuild/easyconfigs/b/BLACS/BLACS-1.1-GCC-4.6.3-MVAPICH2-1.7.eb new file mode 100644 index 0000000000..e1b59eb898 --- /dev/null +++ b/easybuild/easyconfigs/b/BLACS/BLACS-1.1-GCC-4.6.3-MVAPICH2-1.7.eb @@ -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' diff --git a/easybuild/easyconfigs/c/CP2K/CP2K_20111205-goalf-1.1.0-no-OFED-libsmm.eb b/easybuild/easyconfigs/c/CP2K/CP2K-20111205-goalf-1.1.0-no-OFED-libsmm.eb similarity index 100% rename from easybuild/easyconfigs/c/CP2K/CP2K_20111205-goalf-1.1.0-no-OFED-libsmm.eb rename to easybuild/easyconfigs/c/CP2K/CP2K-20111205-goalf-1.1.0-no-OFED-libsmm.eb diff --git a/easybuild/easyconfigs/c/CP2K/CP2K_20111205-goalf-1.1.0-no-OFED-psmp.eb b/easybuild/easyconfigs/c/CP2K/CP2K-20111205-goalf-1.1.0-no-OFED-psmp.eb similarity index 100% rename from easybuild/easyconfigs/c/CP2K/CP2K_20111205-goalf-1.1.0-no-OFED-psmp.eb rename to easybuild/easyconfigs/c/CP2K/CP2K-20111205-goalf-1.1.0-no-OFED-psmp.eb diff --git a/easybuild/easyconfigs/c/CP2K/CP2K_20111205-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/c/CP2K/CP2K-20111205-goalf-1.1.0-no-OFED.eb similarity index 100% rename from easybuild/easyconfigs/c/CP2K/CP2K_20111205-goalf-1.1.0-no-OFED.eb rename to easybuild/easyconfigs/c/CP2K/CP2K-20111205-goalf-1.1.0-no-OFED.eb diff --git a/easybuild/easyconfigs/c/CP2K/CP2K_20111205-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/c/CP2K/CP2K-20111205-ictce-3.2.2.u3.eb similarity index 100% rename from easybuild/easyconfigs/c/CP2K/CP2K_20111205-ictce-3.2.2.u3.eb rename to easybuild/easyconfigs/c/CP2K/CP2K-20111205-ictce-3.2.2.u3.eb diff --git a/easybuild/easyconfigs/e/ECore/ecore-1.5.2.eb b/easybuild/easyconfigs/e/ECore/ecore-1.5.2.eb index 14ffde3b21..5c2a61ef29 100644 --- a/easybuild/easyconfigs/e/ECore/ecore-1.5.2.eb +++ b/easybuild/easyconfigs/e/ECore/ecore-1.5.2.eb @@ -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':[] } diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.0-goalf-1.1.0.eb b/easybuild/easyconfigs/h/HPL/HPL-2.0-goalf-1.1.0-no-OFED.eb similarity index 100% rename from easybuild/easyconfigs/h/HPL/HPL-2.0-goalf-1.1.0.eb rename to easybuild/easyconfigs/h/HPL/HPL-2.0-goalf-1.1.0-no-OFED.eb diff --git a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-goalf-1.1.0.eb b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-goalf-1.1.0-no-OFED.eb similarity index 100% rename from easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-goalf-1.1.0.eb rename to easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-2.1.1-goalf-1.1.0-no-OFED.eb