[Python-checkins] bpo-42336: Improve PCbuild batch files (GH-23325)

Wed Nov 18 12:25:00 EST 2020

https://github.com/python/cpython/commit/8b1f4cc4644869812ff7f210a7fcbe872d88846e
commit: 8b1f4cc4644869812ff7f210a7fcbe872d88846e
branch: 3.8
author: Steve Dower <steve.dower at python.org>
committer: zooba <steve.dower at microsoft.com>
date: 2020年11月18日T17:24:56Z
summary:
bpo-42336: Improve PCbuild batch files (GH-23325)
files:
A PCbuild/env.ps1
M .azure-pipelines/ci.yml
M .azure-pipelines/pr.yml
M .github/workflows/build.yml
M PCbuild/env.bat
M PCbuild/idle.bat
M PCbuild/prepare_libffi.bat
M PCbuild/rt.bat

diff --git a/.azure-pipelines/ci.yml b/.azure-pipelines/ci.yml
index 531ed060fd386..3feb85ae6561d 100644
--- a/.azure-pipelines/ci.yml
+++ b/.azure-pipelines/ci.yml
@@ -104,7 +104,7 @@ jobs:
 matrix:
 win32:
 arch: win32
- buildOpt:
+ buildOpt: '-p Win32'
 testRunTitle: '$(Build.SourceBranchName)-win32'
 testRunPlatform: win32
 win64:
diff --git a/.azure-pipelines/pr.yml b/.azure-pipelines/pr.yml
index 1ffe0a97a2465..2e94af35600cf 100644
--- a/.azure-pipelines/pr.yml
+++ b/.azure-pipelines/pr.yml
@@ -104,7 +104,7 @@ jobs:
 matrix:
 win32:
 arch: win32
- buildOpt:
+ buildOpt: '-p Win32'
 testRunTitle: '$(System.PullRequest.TargetBranch)-win32'
 testRunPlatform: win32
 win64:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e4e5a3ad63d3b..3859cc3ecec8f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -52,7 +52,7 @@ jobs:
 - name: Display build info
 run: .\python.bat -m test.pythoninfo
 - name: Tests
- run: .\PCbuild\rt.bat -q -uall -u-cpu -rwW --slowest --timeout=1200 -j0
+ run: .\PCbuild\rt.bat -p Win32 -q -uall -u-cpu -rwW --slowest --timeout=1200 -j0
 
 build_win_amd64:
 name: 'Windows (x64)'
@@ -66,7 +66,7 @@ jobs:
 - name: Display build info
 run: .\python.bat -m test.pythoninfo
 - name: Tests
- run: .\PCbuild\rt.bat -x64 -q -uall -u-cpu -rwW --slowest --timeout=1200 -j0
+ run: .\PCbuild\rt.bat -p x64 -q -uall -u-cpu -rwW --slowest --timeout=1200 -j0
 
 build_macos:
 name: 'macOS'
diff --git a/PCbuild/env.bat b/PCbuild/env.bat
index 9d4c9d1c32f7a..7362447b8f0bf 100644
--- a/PCbuild/env.bat
+++ b/PCbuild/env.bat
@@ -9,8 +9,19 @@ rem 'v110', 'v120' or 'v140') to the build script.
 
 echo Build environments: x86, amd64, x86_amd64
 echo.
-set VSTOOLS=%VS140COMNTOOLS%
-if "%VSTOOLS%"=="" set VSTOOLS=%VS120COMNTOOLS%
-if "%VSTOOLS%"=="" set VSTOOLS=%VS110COMNTOOLS%
-if "%VSTOOLS%"=="" set VSTOOLS=%VS100COMNTOOLS%
-call "%VSTOOLS%..\..\VC\vcvarsall.bat" %*
+set _ARGS=%*
+if NOT DEFINED _ARGS set _ARGS=x86
+
+if not exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" goto :skip_vswhere
+set VSTOOLS=
+for /F "tokens=*" %%i in ('"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -property installationPath -latest -prerelease -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64') DO @(set VSTOOLS=%%i\VC\Auxiliary\Build\vcvarsall.bat)
+if not defined VSTOOLS goto :skip_vswhere
+call "%VSTOOLS%" %_ARGS%
+exit /B 0
+
+:skip_vswhere
+if not defined VSTOOLS set VSTOOLS=%VS140COMNTOOLS%
+if not defined VSTOOLS set VSTOOLS=%VS120COMNTOOLS%
+if not defined VSTOOLS set VSTOOLS=%VS110COMNTOOLS%
+if not defined VSTOOLS set VSTOOLS=%VS100COMNTOOLS%
+call "%VSTOOLS%..\..\VC\vcvarsall.bat" %_ARGS%
diff --git a/PCbuild/env.ps1 b/PCbuild/env.ps1
new file mode 100644
index 0000000000000..19d7ada4c1079
--- /dev/null
+++ b/PCbuild/env.ps1
@@ -0,0 +1,2 @@
+$pcbuild = $script:MyInvocation.MyCommand.Path | Split-Path -parent;
+& cmd /K "$pcbuild\env.bat" $args
diff --git a/PCbuild/idle.bat b/PCbuild/idle.bat
index 1978b99f6ee19..4927e21b571ac 100644
--- a/PCbuild/idle.bat
+++ b/PCbuild/idle.bat
@@ -4,12 +4,24 @@ rem Usage: idle [-d]
 rem -d Run Debug build (python_d.exe). Else release build.
 
 setlocal
-set exe=win32\python
+set PCBUILD=%~dp0
+set exedir=%PCBUILD%\win32
+set exe=python
 PATH %PATH%;..\externals\tcltk\bin
 
-if "%1"=="-d" (set exe=%exe%_d) & shift
+:CheckOpts
+if "%1"=="-d" (set exe=%exe%_d) & shift & goto :CheckOpts
+if "%1"=="-p" (call :SetExeDir %2) & shift & shift & goto :CheckOpts
 
-set cmd=%exe% ../Lib/idlelib/idle.py %1 %2 %3 %4 %5 %6 %7 %8 %9
+set cmd=%exedir%\%exe% %PCBUILD%\..\Lib\idlelib\idle.py %1 %2 %3 %4 %5 %6 %7 %8 %9
 
 echo on
 %cmd%
+exit /B %LASTERRORCODE%
+
+:SetExeDir
+if /I %1 EQU Win32 (set exedir=%PCBUILD%\win32)
+if /I %1 EQU x64 (set exedir=%PCBUILD%\amd64)
+if /I %1 EQU ARM (set exedir=%PCBUILD%\arm32)
+if /I %1 EQU ARM64 (set exedir=%PCBUILD%\arm64)
+exit /B 0
diff --git a/PCbuild/prepare_libffi.bat b/PCbuild/prepare_libffi.bat
index f41ba83379af9..922a47565c8da 100644
--- a/PCbuild/prepare_libffi.bat
+++ b/PCbuild/prepare_libffi.bat
@@ -22,10 +22,10 @@ echo Based on https://github.com/libffi/libffi/blob/master/.appveyor.yml
 echo.
 echo.
 echo.Available flags:
-echo. -x64 build for x64
-echo. -x86 build for x86
-echo. -arm32 build for arm32
-echo. -arm64 build for arm64
+echo. -x64 enable x64 build
+echo. -x86 enable x86 build
+echo. -arm32 enable arm32 build
+echo. -arm64 enable arm64 build
 echo. -? this help
 echo. --install-cygwin install cygwin to c:\cygwin
 exit /b 127
@@ -44,6 +44,7 @@ set INSTALL_CYGWIN=
 if "%1"=="" goto :CheckOptsDone
 if /I "%1"=="-x64" (set BUILD_X64=1) & shift & goto :CheckOpts
 if /I "%1"=="-x86" (set BUILD_X86=1) & shift & goto :CheckOpts
+if /I "%1"=="-win32" (set BUILD_X86=1) & shift & goto :CheckOpts
 if /I "%1"=="-arm32" (set BUILD_ARM32=1) & shift & goto :CheckOpts
 if /I "%1"=="-arm64" (set BUILD_ARM64=1) & shift & goto :CheckOpts
 if /I "%1"=="-pdb" (set BUILD_PDB=-g) & shift & goto :CheckOpts
@@ -67,9 +68,7 @@ setlocal
 if NOT DEFINED SH if exist c:\cygwin\bin\sh.exe set SH=c:\cygwin\bin\sh.exe
 
 if NOT DEFINED VCVARSALL (
- if exist "C:\Program Files (x86)\Microsoft Visual Studio2017円\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" (
- set VCVARSALL="C:\Program Files (x86)\Microsoft Visual Studio2017円\Enterprise\VC\Auxiliary\Build\vcvarsall.bat"
- )
+ for /F "tokens=*" %%i in ('"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -property installationPath -latest -prerelease -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64') DO @(set VCVARSALL="%%i\VC\Auxiliary\Build\vcvarsall.bat")
 )
 if ^%VCVARSALL:~0,1% NEQ ^" SET VCVARSALL="%VCVARSALL%"
 
diff --git a/PCbuild/rt.bat b/PCbuild/rt.bat
index 59f757c0f5888..8ac549f2a3606 100644
--- a/PCbuild/rt.bat
+++ b/PCbuild/rt.bat
@@ -6,8 +6,9 @@ rem -O Run python.exe or python_d.exe (see -d) with -O.
 rem -q "quick" -- normally the tests are run twice, the first time
 rem after deleting all the .pyc files reachable from Lib/.
 rem -q runs the tests just once, and without deleting .pyc files.
-rem -x64 Run the 64-bit build of python (or python_d if -d was specified)
-rem When omitted, uses %PREFIX% if set or the 32-bit build
+rem -p <Win32|x64|ARM|ARM64> or -win32, -x64, -arm32, -arm64
+rem Run the specified architecture of python (or python_d if -d
+rem was specified). If omitted, uses %PREFIX% if set or 32-bit.
 rem All leading instances of these switches are shifted off, and
 rem whatever remains (up to 9 arguments) is passed to regrtest.py.
 rem For example,
@@ -38,9 +39,11 @@ set exe=
 if "%1"=="-O" (set dashO=-O) & shift & goto CheckOpts
 if "%1"=="-q" (set qmode=yes) & shift & goto CheckOpts
 if "%1"=="-d" (set suffix=_d) & shift & goto CheckOpts
+if "%1"=="-win32" (set prefix=%pcbuild%win32) & shift & goto CheckOpts
 if "%1"=="-x64" (set prefix=%pcbuild%amd64) & shift & goto CheckOpts
 if "%1"=="-arm64" (set prefix=%pcbuild%arm64) & shift & goto CheckOpts
 if "%1"=="-arm32" (set prefix=%pcbuild%arm32) & shift & goto CheckOpts
+if "%1"=="-p" (call :SetPlatform %~2) & shift & shift & goto CheckOpts
 if NOT "%1"=="" (set regrtestargs=%regrtestargs% %1) & shift & goto CheckOpts
 
 if not defined prefix set prefix=%pcbuild%win32
@@ -60,6 +63,15 @@ echo on
 
 echo About to run again without deleting .pyc first:
 pause
+goto Qmode
+
+:SetPlatform
+if /I %1 EQU Win32 (set prefix=%pcbuild%win32) & exit /B 0
+if /I %1 EQU x64 (set prefix=%pcbuild%amd64) & exit /B 0
+if /I %1 EQU ARM64 (set prefix=%pcbuild%arm64) & exit /B 0
+if /I %1 EQU ARM (set prefix=%pcbuild%arm32) & exit /B 0
+echo Invalid platform "%1"
+exit /B 1
 
 :Qmode
 echo on
