Loading python/install.py +23 −9 Original line number Diff line number Diff line Loading @@ -22,8 +22,12 @@ parser.add_argument("-l", "--lib", required=True, help="path to the compiled LAMMPS shared library") parser.add_argument("-v", "--version", required=True, help="path to the LAMMPS version.h header file") parser.add_argument("-d","--dir", help="custom installation folder for module and library") pgroup = parser.add_mutually_exclusive_group() pgroup.add_argument("-d","--dir", 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() Loading Loading @@ -61,6 +65,14 @@ if args.dir: else: 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 # without any special processing or additional steps to that folder Loading Loading @@ -96,15 +108,18 @@ import site tryuser=False try: if args.prefix: 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", version = verstr, author = "Steve Plimpton", author_email = "sjplimp@sandia.gov", url = "http://lammps.sandia.gov", url = "https://lammps.sandia.gov", description = "LAMMPS Molecular Dynamics Python module", py_modules = ["lammps"], data_files = [(get_python_lib(), [args.lib])]) data_files = [(get_python_lib(prefix=args.prefix), [args.lib])]) except: tryuser=True print ("Installation into global site-packages folder failed.\nTrying user folder %s now." % site.USER_SITE) Loading @@ -116,7 +131,7 @@ if tryuser: version = verstr, author = "Steve Plimpton", author_email = "sjplimp@sandia.gov", url = "http://lammps.sandia.gov", url = "https://lammps.sandia.gov", description = "LAMMPS Molecular Dynamics Python module", py_modules = ["lammps"], data_files = [(site.USER_SITE, [args.lib])]) Loading @@ -124,4 +139,3 @@ if tryuser: print("Installation into user site package folder failed.") Loading
python/install.py +23 −9 Original line number Diff line number Diff line Loading @@ -22,8 +22,12 @@ parser.add_argument("-l", "--lib", required=True, help="path to the compiled LAMMPS shared library") parser.add_argument("-v", "--version", required=True, help="path to the LAMMPS version.h header file") parser.add_argument("-d","--dir", help="custom installation folder for module and library") pgroup = parser.add_mutually_exclusive_group() pgroup.add_argument("-d","--dir", 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() Loading Loading @@ -61,6 +65,14 @@ if args.dir: else: 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 # without any special processing or additional steps to that folder Loading Loading @@ -96,15 +108,18 @@ import site tryuser=False try: if args.prefix: 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", version = verstr, author = "Steve Plimpton", author_email = "sjplimp@sandia.gov", url = "http://lammps.sandia.gov", url = "https://lammps.sandia.gov", description = "LAMMPS Molecular Dynamics Python module", py_modules = ["lammps"], data_files = [(get_python_lib(), [args.lib])]) data_files = [(get_python_lib(prefix=args.prefix), [args.lib])]) except: tryuser=True print ("Installation into global site-packages folder failed.\nTrying user folder %s now." % site.USER_SITE) Loading @@ -116,7 +131,7 @@ if tryuser: version = verstr, author = "Steve Plimpton", author_email = "sjplimp@sandia.gov", url = "http://lammps.sandia.gov", url = "https://lammps.sandia.gov", description = "LAMMPS Molecular Dynamics Python module", py_modules = ["lammps"], data_files = [(site.USER_SITE, [args.lib])]) Loading @@ -124,4 +139,3 @@ if tryuser: print("Installation into user site package folder failed.")
