Merge pull request winpython#1496 from stonebig/master

stonebig · web-flow · commit a4b46a4e67fa · 2025-03-09T11:21:07.000+01:00
simplify generate_winpython_distros999_nnn.bat
diff --git a/generate_winpython_distros313_dot.bat b/generate_winpython_distros313_dot.bat
@@ -6,41 +6,24 @@ set my_original_path=%path%
 set my_root_dir_for_builds=C:\Winp
 set my_python_target=313
 set my_pyver=3.13
-
 set my_flavor=dot
+set my_arch=64
 
+rem settings delegated to generate_a_winpython_distro.bat
 set my_release=
-
 set my_release_level=
 
-rem set my_create_installer=False
-set my_create_installer=nsis.zip
-set my_create_installer=.7z
-set my_create_installer=7zip
-
-rem 2024-07-14: ask both the 7zip auto executable and the .7z simple archive
-rem set my_create_installer=False
-rem set my_create_installer=7zip.7z
+rem list of installers to create separated per dot: False=none, .zip=zip, .7z=.7z, 7zip=auto-extractible 7z
 set my_create_installer=7zip.7z.zip
 
-set my_arch=64
 set my_preclear_build_directory=Yes
 
 set tmp_reqdir=%my_root_dir_for_builds%\bd%my_python_target%
 
-rem ****** THREADING
-rem 20240629: handle cython-3.23 as a pre-requirement
-
-rem set my_requirements_pre=C:\WinP\bd313\requirements_pre.txt
-rem set my_find_links_pre=C:\WinP\bd313\packages.win-amd64
-
-rem ***** THREADING
-
 set my_requirements=C:\Winp\bd313\dot_requirements.txt
+set my_source_dirs=C:\Winp\bd313\packages.win-amd64
 
 set my_find_links=C:\Winp\packages.srcreq
-
-set my_source_dirs=C:\Winp\bd313\packages.win-amd64
 set my_toolsdirs=C:\Winp\bdTools\Tools.dot
 set my_docsdirs=C:\WinP\bdDocs\docs.dot
 
@@ -49,12 +32,4 @@ set my_install_options=--no-index --pre --trusted-host=None
 call %~dp0\generate_a_winpython_distro.bat
 
 
-set my_arch=32
-set my_preclear_build_directory=No
-
-set my_source_dirs=C:\Winp\bd313\packages.win32
-
-rem call %~dp0\generate_a_winpython_distro.bat
-
-
 pause
diff --git a/generate_winpython_distros313_slim.bat b/generate_winpython_distros313_slim.bat
@@ -6,41 +6,25 @@ set my_original_path=%path%
 set my_root_dir_for_builds=C:\Winp
 set my_python_target=313
 set my_pyver=3.13
-
 set my_flavor=slim
+set my_arch=64
 
+rem settings delegated to generate_a_winpython_distro.bat
 set my_release=
-
 set my_release_level=
 
-rem set my_create_installer=False
-set my_create_installer=nsis.zip
-set my_create_installer=.7z
-set my_create_installer=7zip
-
-rem 2024-07-14: ask both the 7zip auto executable and the .7z simple archive
-rem set my_create_installer=False
+rem list of installers to create separated per dot: False=none, .zip=zip, .7z=.7z, 7zip=auto-extractible 7z
+rem set my_create_installer=7zip.7z.zip
 set my_create_installer=7zip.7z
 
-set my_arch=64
 set my_preclear_build_directory=Yes
 
 set tmp_reqdir=%my_root_dir_for_builds%\bd%my_python_target%
 
-rem ****** THREADING
-rem 20240629: handle cython-3.23 as a pre-requirement
-
-rem set my_requirements_pre=C:\WinP\bd313\requirements_pre.txt
-rem set my_find_links_pre=C:\WinP\bd313\packages.win-amd64
-
-rem ***** THREADING
-
 set my_requirements=C:\Winp\bd313\requirements64_slim.txt
-
-set my_find_links=C:\Winp\packages.srcreq
-
 set my_source_dirs=C:\Winp\bd313\packages.win-amd64
 
+set my_find_links=C:\Winp\packages.srcreq
 set my_toolsdirs=C:\Winp\bdTools\Tools.dot
 
 REM 2024-07-13:put back pandoc (so from 598Mo to 518Mo?)
@@ -53,12 +37,4 @@ set my_install_options=--no-index --pre --trusted-host=None
 call %~dp0\generate_a_winpython_distro.bat
 
 
-set my_arch=32
-set my_preclear_build_directory=No
-
-set my_source_dirs=C:\Winp\bd313\packages.win32
-
-rem call %~dp0\generate_a_winpython_distro.bat
-
-
 pause
