@@ -30,7 +30,7 @@ if %my_python_target%==312 set my_python_target_release=31210& set my_release=2
3030if %my_python_target% == 313 set my_python_target_release = 3135& set my_release = 1
3131if %my_python_target% == 314 set my_python_target_release = 3140& set my_release = 1
3232
33- set my_basedir_wpy = %my_basedir% \bu%my_flavor% \WPy%my_arch% -%my_python_target_release%%my_release%
33+ set my_WINPYDIRBASE = %my_basedir% \bu%my_flavor% \WPy%my_arch% -%my_python_target_release%%my_release%%my_release_level %
3434
3535echo -------------------------------------->> %my_archive_log%
3636echo (%date% %time% ) preparing winPythonfor %my_pyver% (%my_python_target% )release%my_release%%m y_flavor% (%my_release_level% ) ***%my_arch% bit ***>> %my_archive_log%
@@ -61,11 +61,10 @@ call %my_buildenv%\scripts\env.bat
6161
6262REM Create basic build infrastructure
6363echo " (%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_basedir_wpy % ', 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', python_target_release='%my_python_target_release% ')" >> %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', python_target_release='%my_python_target_release% ')" >> %my_archive_log%
6565
6666REM Check infrastructure is in place
6767echo " (%date% %time% ) Check infrastructure" >> %my_archive_log%
68- set my_WINPYDIRBASE = %my_root_dir_for_builds% \bd%my_python_target% \bu%my_flavor% \Wpy%my_arch% -%my_python_target_release%%my_release%%my_release_level%
6968set WINPYDIRBASE = %my_WINPYDIRBASE%
7069
7170if not exist %my_WINPYDIRBASE% \scripts\env.bat (
@@ -211,7 +210,7 @@ set path=%my_original_path%
211210cd /D%~dp0
212211call %my_buildenv% \scripts\env.bat
213212
214- python.exe -c" from make import *;make_all(%my_release% , '%my_release_level% ', basedir_wpy=r'%my_basedir_wpy % ', verbose=True, flavor='%my_flavor% ', install_options=r'%my_install_options% ', find_links=r'%my_find_links% ', source_dirs=r'%my_source_dirs% ', create_installer='%my_create_installer% ', rebuild=False, python_target_release='%my_python_target_release% ')" >> %my_archive_log%
213+ 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% ', create_installer='%my_create_installer% ', rebuild=False, python_target_release='%my_python_target_release% ')" >> %my_archive_log%
215214
216215
217216echo -------------------------------------->> %my_archive_log%