ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prefix option in install.py not needed

Browse Source
This commit is contained in:
Axel Kohlmeyer
2019-03-26 21:55:07 -04:00
parent 07a6749ddc
commit 77e323d28c
1 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
python/install.py
View File

@ -23,11 +23,8 @@ parser.add_argument("-l", "--lib", required=True,
parser.add_argument("-v", "--version", required=True, parser.add_argument("-v", "--version", required=True,
help="path to the LAMMPS version.h header file") help="path to the LAMMPS version.h header file")
pgroup = parser.add_mutually_exclusive_group() parser.add_argument("-d","--dir",
pgroup.add_argument("-d","--dir", help="Legacy custom installation folder selection for module and library")
help="Legacy custom installation folder for module and library")
pgroup.add_argument("-p","--prefix",
help="Installation prefix for module and library")
args = parser.parse_args() args = parser.parse_args()
@ -65,14 +62,6 @@ if args.dir:
else: else:
args.dir = os.path.abspath(args.dir) args.dir = os.path.abspath(args.dir)
if args.prefix:
if not os.path.isdir(args.prefix):
print( "ERROR: Installation prefix folder %s does not exist" % args.prefix)
parser.print_help()
sys.exit(1)
else:
args.prefix = os.path.abspath(args.prefix)
# if a custom directory is given, we copy the files directly # if a custom directory is given, we copy the files directly
# without any special processing or additional steps to that folder # without any special processing or additional steps to that folder
@ -108,10 +97,7 @@ import site
tryuser=False tryuser=False
try: try:
if args.prefix: sys.argv = ["setup.py","install"] # as if had run "python setup.py install"
sys.argv = ["setup.py","install","--prefix=%s" % args.prefix] # as if had run "python setup.py install --prefix=XXX"
else:
sys.argv = ["setup.py","install"] # as if had run "python setup.py install"
setup(name = "lammps", setup(name = "lammps",
version = verstr, version = verstr,
author = "Steve Plimpton", author = "Steve Plimpton",
@ -120,7 +106,7 @@ try:
description = "LAMMPS Molecular Dynamics Python module", description = "LAMMPS Molecular Dynamics Python module",
license = "GPL", license = "GPL",
py_modules = ["lammps"], py_modules = ["lammps"],
data_files = [(get_python_lib(prefix=args.prefix), [args.lib])]) data_files = [(get_python_lib(), [args.lib])])
except: except:
tryuser=True tryuser=True
print ("Installation into global site-packages folder failed.\nTrying user folder %s now." % site.USER_SITE) print ("Installation into global site-packages folder failed.\nTrying user folder %s now." % site.USER_SITE)