From 3337c44d0031df4f3dc0b55cc0280544ffd3d8fb Mon Sep 17 00:00:00 2001 From: Toon Willems Date: Thu, 9 Aug 2012 11:46:08 +0200 Subject: [PATCH 1/2] rename easyconfig files according to standard --- easybuild/build.py | 6 ++++++ ...3-MVAPICH-1.7.eb => BLACS-1.1-GCC-4.6.3-MVAPICH2-1.7.eb} | 0 ...ibsmm.eb => CP2K-20111205-goalf-1.1.0-no-OFED-libsmm.eb} | 0 ...ED-psmp.eb => CP2K-20111205-goalf-1.1.0-no-OFED-psmp.eb} | 0 ....1.0-no-OFED.eb => CP2K-20111205-goalf-1.1.0-no-OFED.eb} | 0 ...05-ictce-3.2.2.u3.eb => CP2K-20111205-ictce-3.2.2.u3.eb} | 0 easybuild/easyconfigs/e/ECore/ecore-1.5.2.eb | 2 +- ...PL-2.0-goalf-1.1.0.eb => HPL-2.0-goalf-1.1.0-no-OFED.eb} | 0 ...goalf-1.1.0.eb => OpenFOAM-2.1.1-goalf-1.1.0-no-OFED.eb} | 0 9 files changed, 7 insertions(+), 1 deletion(-) rename easybuild/easyconfigs/b/BLACS/{BLACS-1.1-GCC-4.6.3-MVAPICH-1.7.eb => BLACS-1.1-GCC-4.6.3-MVAPICH2-1.7.eb} (100%) rename easybuild/easyconfigs/c/CP2K/{CP2K_20111205-goalf-1.1.0-no-OFED-libsmm.eb => CP2K-20111205-goalf-1.1.0-no-OFED-libsmm.eb} (100%) rename easybuild/easyconfigs/c/CP2K/{CP2K_20111205-goalf-1.1.0-no-OFED-psmp.eb => CP2K-20111205-goalf-1.1.0-no-OFED-psmp.eb} (100%) rename easybuild/easyconfigs/c/CP2K/{CP2K_20111205-goalf-1.1.0-no-OFED.eb => CP2K-20111205-goalf-1.1.0-no-OFED.eb} (100%) rename easybuild/easyconfigs/c/CP2K/{CP2K_20111205-ictce-3.2.2.u3.eb => CP2K-20111205-ictce-3.2.2.u3.eb} (100%) rename easybuild/easyconfigs/h/HPL/{HPL-2.0-goalf-1.1.0.eb => HPL-2.0-goalf-1.1.0-no-OFED.eb} (100%) rename easybuild/easyconfigs/o/OpenFOAM/{OpenFOAM-2.1.1-goalf-1.1.0.eb => OpenFOAM-2.1.1-goalf-1.1.0-no-OFED.eb} (100%) diff --git a/easybuild/build.py b/easybuild/build.py index 7fe3878921..c11d1e34c3 100644 --- a/easybuild/build.py +++ b/easybuild/build.py @@ -339,6 +339,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 diff --git a/easybuild/easyconfigs/b/BLACS/BLACS-1.1-GCC-4.6.3-MVAPICH-1.7.eb b/easybuild/easyconfigs/b/BLACS/BLACS-1.1-GCC-4.6.3-MVAPICH2-1.7.eb similarity index 100% rename from easybuild/easyconfigs/b/BLACS/BLACS-1.1-GCC-4.6.3-MVAPICH-1.7.eb rename to easybuild/easyconfigs/b/BLACS/BLACS-1.1-GCC-4.6.3-MVAPICH2-1.7.eb 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 From b2d441bd2552feb226d5ebd36e9f6eb1a14b3402 Mon Sep 17 00:00:00 2001 From: Toon Willems Date: Fri, 10 Aug 2012 15:17:28 +0200 Subject: [PATCH 2/2] remove error log about wrong module --- easybuild/build.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/easybuild/build.py b/easybuild/build.py index c11d1e34c3..b77081bf3e 100644 --- a/easybuild/build.py +++ b/easybuild/build.py @@ -406,12 +406,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