bpo-36511: Improve ARM32 buildbot scripts (GH-14251) · python/cpython@a195212

@@ -2,6 +2,7 @@

22

rem Used by the buildbot "remotedeploy" step.

33

setlocal

445+

set PATH=%PATH%;%SystemRoot%\SysNative\OpenSSH;%SystemRoot%\System32\OpenSSH

56

set here=%~dp0

67

set arm32_ssh=

78

@@ -13,28 +14,31 @@ if "%arm32_ssh%"=="true" goto :Arm32Ssh

13141415

:Arm32Ssh

1516

if "%SSH_SERVER%"=="" goto :Arm32SshHelp

16-

if "%SSH%"=="" if EXIST %WINDIR%\System32\OpenSSH\ssh.exe (set SSH=%WINDIR%\System32\OpenSSH\ssh.exe)

17-

if "%SCP%"=="" if EXIST %WINDIR%\System32\OpenSSH\scp.exe (set SCP=%WINDIR%\System32\OpenSSH\scp.exe)

18-

echo SSH = %SSH%

19-

echo SCP = %SCP%

17+18+

ssh %SSH_SERVER% echo Make sure we can find SSH and SSH_SERVER variable is valid

19+

if %ERRORLEVEL% NEQ 0 (echo SSH does not work) & exit /b %ERRORLEVEL%

20+2021

if "%PYTHON_SOURCE%"=="" (set PYTHON_SOURCE=%here%..\..\)

2122

if "%REMOTE_PYTHON_DIR%"=="" (set REMOTE_PYTHON_DIR=C:\python\)

2223

if NOT "%REMOTE_PYTHON_DIR:~-1,1%"=="\" (set REMOTE_PYTHON_DIR=%REMOTE_PYTHON_DIR%\)

23-

%SSH% %SSH_SERVER% "if EXIST %REMOTE_PYTHON_DIR% (rd %REMOTE_PYTHON_DIR% /s/q)"

24-

%SSH% %SSH_SERVER% "md %REMOTE_PYTHON_DIR%PCBuild\arm32"

25-

%SSH% %SSH_SERVER% "md %REMOTE_PYTHON_DIR%temp"

26-

%SSH% %SSH_SERVER% "md %REMOTE_PYTHON_DIR%Modules"

27-

%SSH% %SSH_SERVER% "md %REMOTE_PYTHON_DIR%PC"

28-

for /f "USEBACKQ" %%i in (`dir PCbuild\*.bat /b`) do @%SCP% PCBuild\%%i "%SSH_SERVER%:%REMOTE_PYTHON_DIR%PCBuild"

29-

for /f "USEBACKQ" %%i in (`dir PCbuild\*.py /b`) do @%SCP% PCBuild\%%i "%SSH_SERVER%:%REMOTE_PYTHON_DIR%PCBuild"

30-

for /f "USEBACKQ" %%i in (`dir PCbuild\arm32\*.exe /b`) do @%SCP% PCBuild\arm32\%%i "%SSH_SERVER%:%REMOTE_PYTHON_DIR%PCBuild\arm32"

31-

for /f "USEBACKQ" %%i in (`dir PCbuild\arm32\*.pyd /b`) do @%SCP% PCBuild\arm32\%%i "%SSH_SERVER%:%REMOTE_PYTHON_DIR%PCBuild\arm32"

32-

for /f "USEBACKQ" %%i in (`dir PCbuild\arm32\*.dll /b`) do @%SCP% PCBuild\arm32\%%i "%SSH_SERVER%:%REMOTE_PYTHON_DIR%PCBuild\arm32"

33-

%SCP% -r "%PYTHON_SOURCE%Include" "%SSH_SERVER%:%REMOTE_PYTHON_DIR%Include"

34-

%SCP% -r "%PYTHON_SOURCE%Lib" "%SSH_SERVER%:%REMOTE_PYTHON_DIR%Lib"

35-

%SCP% -r "%PYTHON_SOURCE%Tools" "%SSH_SERVER%:%REMOTE_PYTHON_DIR%Tools"

36-

%SCP% "%PYTHON_SOURCE%Modules\Setup" "%SSH_SERVER%:%REMOTE_PYTHON_DIR%Modules"

37-

%SCP% "%PYTHON_SOURCE%PC\pyconfig.h" "%SSH_SERVER%:%REMOTE_PYTHON_DIR%PC"

24+

echo PYTHON_SOURCE = %PYTHON_SOURCE%

25+

echo REMOTE_PYTHON_DIR = %REMOTE_PYTHON_DIR%

26+27+

ssh %SSH_SERVER% "if EXIST %REMOTE_PYTHON_DIR% (rd %REMOTE_PYTHON_DIR% /s/q)"

28+

ssh %SSH_SERVER% "md %REMOTE_PYTHON_DIR%PCBuild\arm32"

29+

ssh %SSH_SERVER% "md %REMOTE_PYTHON_DIR%temp"

30+

ssh %SSH_SERVER% "md %REMOTE_PYTHON_DIR%Modules"

31+

ssh %SSH_SERVER% "md %REMOTE_PYTHON_DIR%PC"

32+

for /f "USEBACKQ" %%i in (`dir PCbuild\*.bat /b`) do @scp PCBuild\%%i "%SSH_SERVER%:%REMOTE_PYTHON_DIR%PCBuild"

33+

for /f "USEBACKQ" %%i in (`dir PCbuild\*.py /b`) do @scp PCBuild\%%i "%SSH_SERVER%:%REMOTE_PYTHON_DIR%PCBuild"

34+

for /f "USEBACKQ" %%i in (`dir PCbuild\arm32\*.exe /b`) do @scp PCBuild\arm32\%%i "%SSH_SERVER%:%REMOTE_PYTHON_DIR%PCBuild\arm32"

35+

for /f "USEBACKQ" %%i in (`dir PCbuild\arm32\*.pyd /b`) do @scp PCBuild\arm32\%%i "%SSH_SERVER%:%REMOTE_PYTHON_DIR%PCBuild\arm32"

36+

for /f "USEBACKQ" %%i in (`dir PCbuild\arm32\*.dll /b`) do @scp PCBuild\arm32\%%i "%SSH_SERVER%:%REMOTE_PYTHON_DIR%PCBuild\arm32"

37+

scp -r "%PYTHON_SOURCE%Include" "%SSH_SERVER%:%REMOTE_PYTHON_DIR%Include"

38+

scp -r "%PYTHON_SOURCE%Lib" "%SSH_SERVER%:%REMOTE_PYTHON_DIR%Lib"

39+

scp -r "%PYTHON_SOURCE%Tools" "%SSH_SERVER%:%REMOTE_PYTHON_DIR%Tools"

40+

scp "%PYTHON_SOURCE%Modules\Setup" "%SSH_SERVER%:%REMOTE_PYTHON_DIR%Modules"

41+

scp "%PYTHON_SOURCE%PC\pyconfig.h" "%SSH_SERVER%:%REMOTE_PYTHON_DIR%PC"

38423943

exit /b %ERRORLEVEL%

4044