Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rename easyconfig files according to standard #69

Merged
merged 3 commits into from
Aug 10, 2012
Merged

rename easyconfig files according to standard #69

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3337c44
rename easyconfig files according to standard
Aug 9, 2012
b2d441b
remove error log about wrong module
Aug 10, 2012
3ec9c87
Merge branch 'develop' into enforce-consistent-eb-naming
Aug 10, 2012
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
6 changes: 6 additions & 0 deletions easybuild/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is checked somewhere else already in resolveDependencies, no?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I should actually remove it there (since they will also call this function).


packages.append(package)

return packages
Expand Down
0 .../BLACS/BLACS-1.1-GCC-4.6.3-MVAPICH-1.7.eb → ...BLACS/BLACS-1.1-GCC-4.6.3-MVAPICH2-1.7.eb
View file
Open in desktop
File renamed without changes.
0 ...2K_20111205-goalf-1.1.0-no-OFED-libsmm.eb → ...2K-20111205-goalf-1.1.0-no-OFED-libsmm.eb
View file
Open in desktop
File renamed without changes.
0 ...CP2K_20111205-goalf-1.1.0-no-OFED-psmp.eb → ...CP2K-20111205-goalf-1.1.0-no-OFED-psmp.eb
View file
Open in desktop
File renamed without changes.
0 ...CP2K/CP2K_20111205-goalf-1.1.0-no-OFED.eb → ...CP2K/CP2K-20111205-goalf-1.1.0-no-OFED.eb
View file
Open in desktop
File renamed without changes.
0 ...gs/c/CP2K/CP2K_20111205-ictce-3.2.2.u3.eb → ...gs/c/CP2K/CP2K-20111205-ictce-3.2.2.u3.eb
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/e/ECore/ecore-1.5.2.eb
View file
Open in desktop
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' ]],
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cout not use 'name' here since it would overwrite the 'name' from the outer scope

'dirs':[]
}

0 .../easyconfigs/h/HPL/HPL-2.0-goalf-1.1.0.eb → ...figs/h/HPL/HPL-2.0-goalf-1.1.0-no-OFED.eb
View file
Open in desktop
File renamed without changes.
0 .../o/OpenFOAM/OpenFOAM-2.1.1-goalf-1.1.0.eb → ...OAM/OpenFOAM-2.1.1-goalf-1.1.0-no-OFED.eb
View file
Open in desktop
File renamed without changes.