Commit98028a8

authored

Merge pull request#1670 from stonebig/master

clean-up no-more-used modules and create_installer option

2 parentsa42e169 +e8d8ccf commit98028a8Copy full SHA for 98028a8

File tree

-6

lines changed

-6

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ call %my_buildenv%\scripts\env.bat`
`61`	`61`
`62`	`62`	`REM Create basic build infrastructure`
`63`	`63`	`echo"(%date%%time%) Create basic build infrastructure">>%my_archive_log%`
`64`		`-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%`
	`64`	`+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%`
`65`	`65`
`66`	`66`	`REM Check infrastructure is in place`
`67`	`67`	`echo"(%date%%time%) Check infrastructure">>%my_archive_log%`

Lines changed: 2 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,8 @@`
`9`	`9`	`importos`
`10`	`10`	`importre`
`11`	`11`	`importshutil`
`12`		`-importsubprocess`
`13`		`-importsys`
`14`	`12`	`frompathlibimportPath`
`15`		`-fromwppmimportwppm,utils,diff`
	`13`	`+fromwppmimportwppm,utils`
`16`	`14`
`17`	`15`	`# Define constant paths for clarity`
`18`	`16`	`PORTABLE_DIRECTORY=Path(__file__).parent/"portable"`
`@@ -183,7 +181,7 @@ def build(self, rebuild: bool = True, winpy_dir: Path = None):`
`183`	`181`	`self.distribution.patch_standard_packages(package_name)`
`184`	`182`
`185`	`183`	`defmake_all(build_number:int,release_level:str,basedir_wpy:Path=None,`
`186`		`-verbose:bool=False,rebuild:bool=True,create_installer:str="True",install_options=["--no-index"],`
	`184`	`+verbose:bool=False,rebuild:bool=True,install_options=["--no-index"],`
`187`	`185`	`flavor:str="",find_links:str\|list[Path]=None,`
`188`	`186`	`source_dirs:Path=None,toolsdirs:str\|list[Path]=None,`
`189`	`187`	`):`
`@@ -195,7 +193,6 @@ def make_all(build_number: int, release_level: str, basedir_wpy: Path = None,`
`195`	`193`	`basedir_wpy: top directory of the build (c:\...\Wpy...)`
`196`	`194`	`verbose: Enable verbose output (bool).`
`197`	`195`	`rebuild: Whether to rebuild the distribution (bool).`
`198`		`- create_installer: Type of installer to create (str).`
`199`	`196`	`install_options: pip options (r'--no-index --pre --trusted-host=None')`
`200`	`197`	`flavor: WinPython flavor (str).`
`201`	`198`	`find_links: package directories (r'D:\Winpython\packages.srcreq')`

Comments

(0)