diff --git a/generate_a_winpython_distro.bat b/generate_a_winpython_distro.bat index 522a5239..0b64a596 100644 --- a/generate_a_winpython_distro.bat +++ b/generate_a_winpython_distro.bat @@ -61,7 +61,7 @@ call %my_buildenv%\scripts\env.bat REM Create basic build infrastructure echo "(%date% %time%) Create basic build infrastructure">>%my_archive_log% -python.exe -c "from make import *;make_all(%my_release%, '%my_release_level%', basedir_wpy=r'%my_WINPYDIRBASE%', verbose=True, flavor='%my_flavor%', install_options=r'%my_install_options%', find_links=r'%my_find_links%', source_dirs=r'%my_source_dirs%', toolsdirs=r'%my_toolsdirs%', create_installer='False')">>%my_archive_log% +python.exe -c "from make import *;make_all(%my_release%, '%my_release_level%', basedir_wpy=r'%my_WINPYDIRBASE%', verbose=True, flavor='%my_flavor%', install_options=r'%my_install_options%', find_links=r'%my_find_links%', source_dirs=r'%my_source_dirs%', toolsdirs=r'%my_toolsdirs%')">>%my_archive_log% REM Check infrastructure is in place echo "(%date% %time%) Check infrastructure">>%my_archive_log% diff --git a/make.py b/make.py index 43c48175..bb76c605 100644 --- a/make.py +++ b/make.py @@ -9,10 +9,8 @@ import os import re import shutil -import subprocess -import sys from pathlib import Path -from wppm import wppm, utils, diff +from wppm import wppm, utils # Define constant paths for clarity PORTABLE_DIRECTORY = Path(__file__).parent / "portable" @@ -183,7 +181,7 @@ def build(self, rebuild: bool = True, winpy_dir: Path = None): self.distribution.patch_standard_packages(package_name) def make_all(build_number: int, release_level: str, basedir_wpy: Path = None, - verbose: bool = False, rebuild: bool = True, create_installer: str = "True", install_options=["--no-index"], + verbose: bool = False, rebuild: bool = True, install_options=["--no-index"], flavor: str = "", find_links: str | list[Path] = None, source_dirs: Path = None, toolsdirs: str | list[Path] = None, ): @@ -195,7 +193,6 @@ def make_all(build_number: int, release_level: str, basedir_wpy: Path = None, basedir_wpy: top directory of the build (c:\...\Wpy...) verbose: Enable verbose output (bool). rebuild: Whether to rebuild the distribution (bool). - create_installer: Type of installer to create (str). install_options: pip options (r'--no-index --pre --trusted-host=None') flavor: WinPython flavor (str). find_links: package directories (r'D:\Winpython\packages.srcreq')