加大订单PDF公司抬头并修复Win7打包环境复用

packaging/win7/01_install_env.cmd

@@ -1,30 +1,23 @@
 @echo off
 setlocal EnableExtensions DisableDelayedExpansion
-cd /d "%~dp0"
+set "PO_KIT_ROOT=%~dp0"
+cd /d "%PO_KIT_ROOT%"
 set "PYTHONUTF8=1"
 set "PYTHONIOENCODING=utf-8"
 set "PYTHONHOME="
 set "PYTHONPATH="
-set "PO_PYTHON=%~dp0.python38\python.exe"
-set "PO_INSTALLER=%~dp0installers\python-3.8.10.exe"
-if /i "%PROCESSOR_ARCHITECTURE%"=="AMD64" set "PO_INSTALLER=%~dp0installers\python-3.8.10-amd64.exe"
-if /i "%PROCESSOR_ARCHITEW6432%"=="AMD64" set "PO_INSTALLER=%~dp0installers\python-3.8.10-amd64.exe"
-if exist "%PO_PYTHON%" goto ready
-echo Installing the bundled Python 3.8.10. Windows 7 SP1 is required.
-echo If Windows requests a restart, restart and run this script again.
-start /wait "" "%PO_INSTALLER%" /passive InstallAllUsers=0 TargetDir="%~dp0.python38" Include_launcher=0 InstallLauncherAllUsers=0 PrependPath=0 Include_doc=0 Include_test=0 Include_tcltk=0 Shortcuts=0 AssociateFiles=0
-if errorlevel 1 goto failed
-:ready
-if not exist "%PO_PYTHON%" goto failed
-"%PO_PYTHON%" "%~dp0win7\build.py" setup
-if errorlevel 1 goto failed
-echo.
+"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" -NoLogo -NoProfile -ExecutionPolicy Bypass -File "%PO_KIT_ROOT%win7\install_env.ps1"
+set "PO_RESULT=%ERRORLEVEL%"
+if "%PO_RESULT%"=="3010" goto restart
+if "%PO_RESULT%"=="1641" goto restart
+if not "%PO_RESULT%"=="0" goto failed
 echo Setup passed. Run 02_build_exe.cmd next.
-pause
-exit /b 0
+goto finish
+:restart
+echo Windows requested a restart. Restart, then run 01_install_env.cmd again.
+goto finish
 :failed
-echo.
-echo SETUP FAILED. See README_WIN7.txt and the message above.
-echo Do not install the modern Python 3.11 build on Windows 7.
+echo SETUP FAILED. Exit code: %PO_RESULT%. Keep the logs folder and the message above.
+:finish
 pause
-exit /b 1
+exit /b %PO_RESULT%