From f1502d097c29b266a5748312ee2451a2d6ac0af6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Gr=C3=B6nke?= Date: Mon, 25 Sep 2017 18:58:10 +0200 Subject: [PATCH] bpo-31569: correct PCBuild/ case to PCbuild/ in build scripts and docs (GH-3711) --- .github/CODEOWNERS | 2 +- .github/appveyor.yml | 2 +- Doc/distutils/builtdist.rst | 2 +- Doc/library/test.rst | 2 +- Doc/make.bat | 2 +- Lib/distutils/sysconfig.py | 2 +- .../2017-09-25-00-25-23.bpo-31569.TS49pM.rst | 1 + PC/bdist_wininst/bdist_wininst.vcxproj | 4 ++-- PC/bdist_wininst/build.bat | 2 +- PC/launcher.c | 8 ++++---- PCbuild/python.props | 10 +++++----- Tools/freeze/extensions_win32.ini | 18 +++++++++--------- Tools/msi/README.txt | 4 ++-- Tools/msi/build.bat | 2 +- Tools/msi/buildrelease.bat | 2 +- Tools/msi/exe/exe.wixproj | 6 +++--- Tools/msi/launcher/launcher.wixproj | 8 ++++---- Tools/msi/msi.props | 2 +- Tools/msi/testrelease.bat | 2 +- Tools/msi/uploadrelease.bat | 2 +- Tools/msi/wix.props | 2 +- Tools/nuget/build.bat | 2 +- 22 files changed, 44 insertions(+), 43 deletions(-) create mode 100644 Misc/NEWS.d/next/Build/2017-09-25-00-25-23.bpo-31569.TS49pM.rst diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 28ca17e7e93..67c03a807d0 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -35,7 +35,7 @@ Python/bootstrap_hash.c @python/crypto-team # Windows /PC/ @python/windows-team -/PCBuild/ @python/windows-team +/PCbuild/ @python/windows-team # Windows installer packages /Tools/msi/ @python/windows-team diff --git a/.github/appveyor.yml b/.github/appveyor.yml index 98b32c977d1..b052b28f8aa 100644 --- a/.github/appveyor.yml +++ b/.github/appveyor.yml @@ -28,7 +28,7 @@ only_commits: - Modules/ - Objects/ - PC/ - - PCBuild/ + - PCbuild/ - Parser/ - Programs/ - Python/ diff --git a/Doc/distutils/builtdist.rst b/Doc/distutils/builtdist.rst index dc3a50cb032..f523a672340 100644 --- a/Doc/distutils/builtdist.rst +++ b/Doc/distutils/builtdist.rst @@ -368,7 +368,7 @@ Python itself for the platform you are targeting - it is not possible from a binary installation of Python (as the .lib etc file for other platforms are not included.) In practice, this means the user of a 32 bit operating system will need to use Visual Studio 2008 to open the -:file:`PCBuild/PCbuild.sln` solution in the Python source tree and build the +:file:`PCbuild/PCbuild.sln` solution in the Python source tree and build the "x64" configuration of the 'pythoncore' project before cross-compiling extensions is possible. diff --git a/Doc/library/test.rst b/Doc/library/test.rst index 9d4ff7ad8b4..33978e331b6 100644 --- a/Doc/library/test.rst +++ b/Doc/library/test.rst @@ -186,7 +186,7 @@ options, run :program:`python -m test -h`. Some other ways to execute the regression tests depend on what platform the tests are being executed on. On Unix, you can run :program:`make test` at the top-level directory where Python was built. On Windows, -executing :program:`rt.bat` from your :file:`PCBuild` directory will run all +executing :program:`rt.bat` from your :file:`PCbuild` directory will run all regression tests. diff --git a/Doc/make.bat b/Doc/make.bat index 6cb315fda40..3f201de1db7 100644 --- a/Doc/make.bat +++ b/Doc/make.bat @@ -5,7 +5,7 @@ pushd %~dp0 set this=%~n0 -call ..\PCBuild\find_python.bat %PYTHON% +call ..\PCbuild\find_python.bat %PYTHON% if not defined SPHINXBUILD if defined PYTHON ( %PYTHON% -c "import sphinx" > nul 2> nul if errorlevel 1 ( diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py index 2bcd1dd2885..e07a6c8b94e 100644 --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py @@ -23,7 +23,7 @@ BASE_PREFIX = os.path.normpath(sys.base_prefix) BASE_EXEC_PREFIX = os.path.normpath(sys.base_exec_prefix) # Path to the base directory of the project. On Windows the binary may -# live in project/PCBuild/win32 or project/PCBuild/amd64. +# live in project/PCbuild/win32 or project/PCbuild/amd64. # set for cross builds if "_PYTHON_PROJECT_BASE" in os.environ: project_base = os.path.abspath(os.environ["_PYTHON_PROJECT_BASE"]) diff --git a/Misc/NEWS.d/next/Build/2017-09-25-00-25-23.bpo-31569.TS49pM.rst b/Misc/NEWS.d/next/Build/2017-09-25-00-25-23.bpo-31569.TS49pM.rst new file mode 100644 index 00000000000..a6345dbbbdb --- /dev/null +++ b/Misc/NEWS.d/next/Build/2017-09-25-00-25-23.bpo-31569.TS49pM.rst @@ -0,0 +1 @@ +Correct PCBuild/ case to PCbuild/ in build scripts and documentation. diff --git a/PC/bdist_wininst/bdist_wininst.vcxproj b/PC/bdist_wininst/bdist_wininst.vcxproj index 9bbfda28ccb..70bfb9c9337 100644 --- a/PC/bdist_wininst/bdist_wininst.vcxproj +++ b/PC/bdist_wininst/bdist_wininst.vcxproj @@ -39,7 +39,7 @@ wininst false - + Application @@ -51,7 +51,7 @@ - + <_ProjectFileVersion>10.0.30319.1 diff --git a/PC/bdist_wininst/build.bat b/PC/bdist_wininst/build.bat index d5cf75206dd..3ce46cfd380 100644 --- a/PC/bdist_wininst/build.bat +++ b/PC/bdist_wininst/build.bat @@ -2,7 +2,7 @@ setlocal set D=%~dp0 -set PCBUILD=%~dp0..\..\PCBuild\ +set PCBUILD=%~dp0..\..\PCbuild\ echo Building Lib\distutils\command\wininst-xx.0.exe diff --git a/PC/launcher.c b/PC/launcher.c index 0733df7563f..d717a7e3419 100644 --- a/PC/launcher.c +++ b/PC/launcher.c @@ -169,11 +169,11 @@ static size_t num_installed_pythons = 0; static wchar_t * location_checks[] = { L"\\", - L"\\PCBuild\\win32\\", - L"\\PCBuild\\amd64\\", + L"\\PCbuild\\win32\\", + L"\\PCbuild\\amd64\\", /* To support early 32bit versions of Python that stuck the build binaries - * directly in PCBuild... */ - L"\\PCBuild\\", + * directly in PCbuild... */ + L"\\PCbuild\\", NULL }; diff --git a/PCbuild/python.props b/PCbuild/python.props index ebb16315e1a..32c12fabdf0 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -32,13 +32,13 @@ $(PySourcePath)\ - $(PySourcePath)PCBuild\win32\ + $(PySourcePath)PCbuild\win32\ $(Py_OutDir)\win32\ - $(PySourcePath)PCBuild\amd64\ + $(PySourcePath)PCbuild\amd64\ $(Py_OutDir)\amd64\ $(BuildPath32) $(BuildPath64) - $(PySourcePath)PCBuild\$(ArchName)\ + $(PySourcePath)PCbuild\$(ArchName)\ $(BuildPath)\ $(BuildPath)instrumented\ @@ -118,11 +118,11 @@ Override the version number when building by specifying OverrideVersion. For example: - PCBuild\build.bat "/p:OverrideVersion=3.5.2a1" + PCbuild\build.bat "/p:OverrideVersion=3.5.2a1" Use the -V option to check your version is valid: - PCBuild\build.bat -V "/p:OverrideVersion=3.5.2a1" + PCbuild\build.bat -V "/p:OverrideVersion=3.5.2a1" PythonVersionNumber: 3.5.2 PythonVersion: 3.5.2a1 PythonVersionHex: 0x030502A1 diff --git a/Tools/freeze/extensions_win32.ini b/Tools/freeze/extensions_win32.ini index d01fd6b9f52..d8f274b1664 100644 --- a/Tools/freeze/extensions_win32.ini +++ b/Tools/freeze/extensions_win32.ini @@ -26,34 +26,34 @@ ; If you need others, add them here [_socket] -dsp=%PYTHONPREFIX%\PCBuild\_socket.dsp +dsp=%PYTHONPREFIX%\PCbuild\_socket.dsp [_sre] -dsp=%PYTHONPREFIX%\PCBuild\_sre.dsp +dsp=%PYTHONPREFIX%\PCbuild\_sre.dsp [unicodedata] -dsp=%PYTHONPREFIX%\PCBuild\unicodedata.dsp +dsp=%PYTHONPREFIX%\PCbuild\unicodedata.dsp [mmap] -dsp=%PYTHONPREFIX%\PCBuild\mmap.dsp +dsp=%PYTHONPREFIX%\PCbuild\mmap.dsp [winsound] -dsp=%PYTHONPREFIX%\PCBuild\winsound.dsp +dsp=%PYTHONPREFIX%\PCbuild\winsound.dsp libs=winmm.lib [parser] -dsp=%PYTHONPREFIX%\PCBuild\parser.dsp +dsp=%PYTHONPREFIX%\PCbuild\parser.dsp [select] -dsp=%PYTHONPREFIX%\PCBuild\select.dsp +dsp=%PYTHONPREFIX%\PCbuild\select.dsp [zlib] -dsp=%PYTHONPREFIX%\PCBuild\zlib.dsp +dsp=%PYTHONPREFIX%\PCbuild\zlib.dsp cl=/I %PYTHONPREFIX%\..\zlib-1.1.4 /D _WINDOWS /D WIN32 libs=%PYTHONPREFIX%\..\zlib-1.1.4\zlib.lib /nodefaultlib:libc [winreg] -dsp=%PYTHONPREFIX%\PCBuild\winreg.dsp +dsp=%PYTHONPREFIX%\PCbuild\winreg.dsp libs=advapi32.lib diff --git a/Tools/msi/README.txt b/Tools/msi/README.txt index 7023b611819..1908f5c3a40 100644 --- a/Tools/msi/README.txt +++ b/Tools/msi/README.txt @@ -64,7 +64,7 @@ Building the Installer Before building the installer, download extra build dependencies using Tools\msi\get_externals.bat. (Note that this is in addition to the -similarly named file in PCBuild.) +similarly named file in PCbuild.) For testing, the installer should be built with the Tools/msi/build.bat script: @@ -72,7 +72,7 @@ script: build.bat [-x86] [-x64] [--doc] [--test-marker] [--pack] This script will build the required configurations of Python and -generate an installer layout in PCBuild/(win32|amd64)/en-us. +generate an installer layout in PCbuild/(win32|amd64)/en-us. Specify -x86 and/or -x64 to build for each platform. If neither is specified, both platforms will be built. Currently, both the debug and diff --git a/Tools/msi/build.bat b/Tools/msi/build.bat index f720ea9a86a..8fa612e9ddc 100644 --- a/Tools/msi/build.bat +++ b/Tools/msi/build.bat @@ -1,7 +1,7 @@ @echo off setlocal set D=%~dp0 -set PCBUILD=%D%..\..\PCBuild\ +set PCBUILD=%D%..\..\PCbuild\ set BUILDX86= set BUILDX64= diff --git a/Tools/msi/buildrelease.bat b/Tools/msi/buildrelease.bat index 5dc1b57b668..4178981195e 100644 --- a/Tools/msi/buildrelease.bat +++ b/Tools/msi/buildrelease.bat @@ -28,7 +28,7 @@ rem {msi} MSI filename core.msi set DOWNLOAD_URL=https://www.python.org/ftp/python/{version}/{arch}{releasename}/{msi} set D=%~dp0 -set PCBUILD=%D%..\..\PCBuild\ +set PCBUILD=%D%..\..\PCbuild\ if "%Py_OutDir%"=="" set Py_OutDir=%PCBUILD% set EXTERNALS=%D%..\..\externals\windows-installer\ diff --git a/Tools/msi/exe/exe.wixproj b/Tools/msi/exe/exe.wixproj index 8eaf494c4d4..071501ce6e6 100644 --- a/Tools/msi/exe/exe.wixproj +++ b/Tools/msi/exe/exe.wixproj @@ -45,7 +45,7 @@ - + @@ -58,8 +58,8 @@ @(HostPython) $(HostPython.Remove($(HostPython.IndexOf(';')))) - - + + diff --git a/Tools/msi/launcher/launcher.wixproj b/Tools/msi/launcher/launcher.wixproj index 8935ce88a7d..7ff169029e4 100644 --- a/Tools/msi/launcher/launcher.wixproj +++ b/Tools/msi/launcher/launcher.wixproj @@ -20,16 +20,16 @@ - + - + - + - + diff --git a/Tools/msi/msi.props b/Tools/msi/msi.props index 2318d484d11..24a90bd8cb1 100644 --- a/Tools/msi/msi.props +++ b/Tools/msi/msi.props @@ -15,7 +15,7 @@ - +