git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12605 f3b2605a-c512-4ea7-a41b-209d697bcdaa

This commit is contained in:
sjplimp
2014-10-07 17:30:37 +00:00
parent de88af10e2
commit bd26134155
3 changed files with 63 additions and 32 deletions

View File

@ -709,18 +709,31 @@ class Packages:
plist.append("yes-%s" % one)
elif "user-"+one in user:
plist.append("yes-user-%s" % one)
elif one == '^' and one[1:] in std:
plist.append("no-%s" % one[1:])
elif one[0] == '^' and one[1:] in user:
plist.append("no-%s" % one[1:])
elif one[0] == '^' and "user-"+one[1:] in user:
plist.append("no-user-%s" % one[1:])
elif one == "std" or one == "standard" or one == "user" or \
one == "lib" or one == "all":
plist.append("yes-%s" % one)
elif one == "^std" or one == "^standard" or one == "^user" or \
one == "^lib" or one == "^all":
plist.append("no-%s" % one[1:])
one == "lib" or one == "all": plist.append("yes-%s" % one)
elif one.startswith("yes-"):
if one[4:] in std: plist.append("yes-%s" % one[4:])
elif one[4:] in user: plist.append("yes-%s" % one[4:])
elif "user-"+one[4:] in user: plist.append("yes-user-%s" % one[4:])
elif one == "yes-std" or one == "yes-standard" or \
one == "yes-user" or one == "yes-lib" or one == "yes-all":
plist.append("yes-%s" % one[4:])
else: error("Invalid package name %s" % one)
elif one.startswith("no-"):
if one[3:] in std: plist.append("no-%s" % one[3:])
elif one[3:] in user: plist.append("no-%s" % one[3:])
elif "user-"+one[3:] in user: plist.append("no-user-%s" % one[3:])
elif one == "no-std" or one == "no-standard" or one == "no-user" or \
one == "no-lib" or one == "no-all":
plist.append("no-%s" % one[3:])
else: error("Invalid package name %s" % one)
elif one.startswith('^'):
if one[1:] in std: plist.append("no-%s" % one[1:])
elif one[1:] in user: plist.append("no-%s" % one[1:])
elif "user-"+one[1:] in user: plist.append("no-user-%s" % one[1:])
elif one == "^std" or one == "^standard" or one == "^user" or \
one == "^lib" or one == "^all": plist.append("no-%s" % one[1:])
else: error("Invalid package name %s" % one)
elif one == "none": plist.append("no-all")
elif one == "orig": plist.append(one)
else: error("Invalid package name %s" % one)