devenver: We don't use the manifest file

This commit is contained in:
doyle 2023-01-30 23:10:19 +11:00
parent 10b013f66d
commit 00cd69734a
2 changed files with 1 additions and 8 deletions

View File

@ -44,16 +44,10 @@ arg_parser.add_argument('--install-dir',
default=default_base_install_dir, default=default_base_install_dir,
type=pathlib.Path) type=pathlib.Path)
arg_parser.add_argument('--manifest-file',
help=f'Python file that has a get_manifest() function returning a dictionary of applications to download & install (see manifest.py for starters)',
required=True,
type=pathlib.Path)
arg_parser.add_argument('--version', arg_parser.add_argument('--version',
action='version', action='version',
version='DEVenver v1') version='DEVenver v1')
args = arg_parser.parse_args() args = arg_parser.parse_args()
base_downloads_dir = args.downloads_dir base_downloads_dir = args.downloads_dir

View File

@ -333,12 +333,11 @@ with open(odin_msvc_uninstall_script_path, "w") as file:
python_exe = pathlib.Path(installed_apps["Python"][0]['exe_path']).relative_to(devenver.base_install_dir) python_exe = pathlib.Path(installed_apps["Python"][0]['exe_path']).relative_to(devenver.base_install_dir)
python_install_dir = pathlib.Path(installed_apps["Python"][0]['exe_path']).parent.relative_to(devenver.base_install_dir) python_install_dir = pathlib.Path(installed_apps["Python"][0]['exe_path']).parent.relative_to(devenver.base_install_dir)
win_setup_script_path = pathlib.Path(devenver.script_dir, "win_setup.py") win_setup_script_path = pathlib.Path(devenver.script_dir, "win_setup.py")
manifest_script_path = pathlib.Path(devenver.script_dir, "devenver_manifest.py")
bootstrap_setup_script = f"""@echo off bootstrap_setup_script = f"""@echo off
setlocal EnableDelayedExpansion setlocal EnableDelayedExpansion
set PYTHONHOME=%~dp0{python_install_dir} set PYTHONHOME=%~dp0{python_install_dir}
%~dp0{python_exe} {win_setup_script_path} --manifest-file {manifest_script_path} %~dp0{python_exe} {win_setup_script_path}
pause pause
""" """