patrick
/
libinstaller
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

v1.0 - cleanup

This commit is contained in:
Patrick Lipka 2022-09-30 15:56:20 +02:00
parent 649b5c39d5
commit 7e1dc410b0
3 changed files with 6 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/dependency.py
View File

@ -59,7 +59,7 @@ def load_dependencies(library, selected_libs, config_dir):
lib_names = [] lib_names = []
for lib in selected_libs: for lib in selected_libs:
lib_names.append(lib['name']) lib_names.append(lib['name'])
dependencies = library['dependencies'].split(',') dependencies = library['dependencies'].split(',')
for dep in dependencies: for dep in dependencies:
if len(dep) > 1: if len(dep) > 1:
@ -79,8 +79,6 @@ def load_selected_libs(config_dir, arg_namespace, args, install_all_libs, ignore
if install_all_libs: if install_all_libs:
for config_file in glob.glob(config_dir+"/*.json"): for config_file in glob.glob(config_dir+"/*.json"):
data = load_lib_data(config_file) data = load_lib_data(config_file)
#with open(cf, 'r') as f:
#data = json.load(f)
data['version'] = data['default version'] data['version'] = data['default version']
selected_libs.append(data) selected_libs.append(data)
else: else:
@ -95,10 +93,10 @@ def load_selected_libs(config_dir, arg_namespace, args, install_all_libs, ignore
data = load_lib_data(config_file) data = load_lib_data(config_file)
data['version'] = version data['version'] = version
selected_libs.append(data) selected_libs.append(data)
if not ignore_deps: if not ignore_deps:
# also add all dependencies to the install list # also add all dependencies to the install list
for lib in selected_libs: for lib in selected_libs:
load_dependencies(lib, selected_libs, config_dir) load_dependencies(lib, selected_libs, config_dir)
return selected_libs return selected_libs

3
lib/io.py
View File

@ -1,7 +1,8 @@
import json import json
# load library data from json file # load library data from json file
def load_lib_data(lib_path): def load_lib_data(lib_path):
with open (lib_path, 'r') as config_file: with open (lib_path, 'r') as config_file:
data = json.load(config_file) data = json.load(config_file)
return data return data

27
libinstaller
View File

@ -8,7 +8,7 @@ from lib.dependency import sort_libs_by_dependencies, load_selected_libs
from lib.installer import install_lib from lib.installer import install_lib
from lib.init import init, check_python_version from lib.init import init, check_python_version
SCRIPT_VERSION = "v0.9" SCRIPT_VERSION = "v1.0"
# check if Python >=3.3.0 is used # check if Python >=3.3.0 is used
check_python_version() check_python_version()
@ -33,31 +33,6 @@ ignore_deps = arg_namespace.ignore_deps
# extract libraries and versions selected for installation # extract libraries and versions selected for installation
selected_libs = load_selected_libs(config_dir, arg_namespace, args, install_all_libs, ignore_deps) selected_libs = load_selected_libs(config_dir, arg_namespace, args, install_all_libs, ignore_deps)
'''
selected_libs = []
if install_all_libs:
for config_file in glob.glob(config_dir+"/*.json"):
data = load_lib_data(config_file)
#with open(cf, 'r') as f:
#data = json.load(f)
data['version'] = data['default version']
selected_libs.append(data)
else:
ignore_names = ["config", "mpi", "compiler", "prefix", "src", "work", "keep_work", "threads", "verbose", "version", "disable_shared"]
for lib_name in args:
if lib_name not in ignore_names and "version" not in lib_name:
install = getattr(arg_namespace, lib_name)
if install:
version = getattr(arg_namespace, lib_name+"_version")
config_file = config_dir + "/" + lib_name + ".json"
data = load_lib_data(config_file)
data['version'] = data['default version']
selected_libs.append(data)
#with open(config_file, 'r') as cf:
#data = json.load(cf)
#data['version'] = version
#selected_libs.append(data)
'''
# set up install directory name # set up install directory name
compiler_version = get_compiler_version(compiler) compiler_version = get_compiler_version(compiler)