Skip to content

Commit f90a887

Browse files
committed
DOS clean-up with openai: Generate Changelog and Binaries.
1 parent 4148542 commit f90a887

File tree

1 file changed

+18
-15
lines changed

1 file changed

+18
-15
lines changed

generate_a_winpython_distro.bat

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -186,29 +186,31 @@ copy /Y "%pip_lock_web%" "%my_archive_lockfile%"
186186
copy /Y "%pip_lock_web%" "%my_changelog_lockfile%"
187187
copy /Y "%req_lock_web%" "%my_changelog_reqfile%"
188188

189-
190189
call :log_section Archive success
191190

192-
set path=%my_original_path%
193-
call %my_WINPYDIRBASE%\scripts\env.bat
191+
rem set path=%my_original_path%
192+
rem call %my_WINPYDIRBASE%\scripts\env.bat
194193

195194
%target_python_exe% -m pip freeze > %my_archive_log%.packages_versions.txt
196195

197-
REM Generate changelog and binaries
198-
echo "(%date% %time%) Generate changelog and binaries">>%my_archive_log%
196+
REM === Step 13: Generate changelog and binaries ===
197+
call :log_section Generate changelog and binaries
198+
199+
REM Define markdown changelog filenames
200+
set "mdn=WinPython%my_flavor%-%my_arch%bit-%WINPYVER2%.md"
201+
set "out=WinPython%my_flavor%-%my_arch%bit-%WINPYVER2%_History.md"
199202

200-
rem markdowm and markdown diff
201-
set mdn=WinPython%my_flavor%-%my_arch%bit-%WINPYVER2%.md
202-
%target_python_exe% -m wppm -md>%my_basedir%\bu%my_flavor%\%mdn%
203-
copy/y %my_basedir%\bu%my_flavor%\%mdn% %~dp0changelogs\%mdn%
203+
REM Create markdown package list
204+
%target_python_exe% -m wppm -md > "%my_WINPYDIRBASE%\..\%mdn%"
205+
copy /Y "%my_WINPYDIRBASE%\..\%mdn%" "%~dp0changelogs\%mdn%"
204206

205-
set out=WinPython%my_flavor%-%my_arch%bit-%WINPYVER2%_History.md
206-
%target_python_exe% -c "from wppm import diff ;a=(diff.compare_package_indexes(r'%WINPYVER2%', searchdir=r'%~dp0changelogs',flavor=r'%my_flavor%',architecture=%my_arch%));f=open(r'%my_basedir%\bu%my_flavor%\%out%','w', encoding='utf-8');f.write(a);f.close()"
207-
copy/y %my_basedir%\bu%my_flavor%\%out% %~dp0changelogs\%out%
207+
REM Generate historical diff
208+
%target_python_exe% -c "from wppm import diff; result = diff.compare_package_indexes('%WINPYVER2%', searchdir=r'%~dp0changelogs', flavor=r'%my_flavor%', architecture=%my_arch%); open(r'%my_WINPYDIRBASE%\..\%out%', 'w', encoding='utf-8').write(result)"
209+
copy /Y "%my_WINPYDIRBASE%\..\%out%" "%~dp0changelogs\%out%"
208210

209-
rem compress
210-
set stem=WinPython%my_arch%-%WINPYVER2%%my_flavor%%my_release_level%
211-
%target_python_exe% -c "from wppm import utils;utils.command_installer_7zip(r'%my_WINPYDIRBASE%', r'%my_WINPYDIRBASE%\..',r'%stem%', r'%my_create_installer%')"
211+
REM === Step 13b: Compress distribution to .7z or installer ===
212+
set "stem=WinPython%my_arch%-%WINPYVER2%%my_flavor%%my_release_level%"
213+
%target_python_exe% -c "from wppm import utils; utils.command_installer_7zip(r'%my_WINPYDIRBASE%', r'%my_WINPYDIRBASE%\..', r'%stem%', r'%my_create_installer%')"
212214

213215
call :log_section END OF CREATION
214216

@@ -223,6 +225,7 @@ exit
223225
echo. >>%my_archive_log%
224226
echo -------------------------------------- >>%my_archive_log%
225227
echo (%date% %time%) %* >>%my_archive_log%
228+
echo (%date% %time%) %*
226229
echo -------------------------------------- >>%my_archive_log%
227230
echo. >>%my_archive_log%
228231
exit /b

0 commit comments

Comments
 (0)