mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-25 01:43:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

bpo-31569: correct PCBuild/ case to PCbuild/ in build scripts and docs (GH-3711)

Browse source
This commit is contained in:
Stefan Grönke 2017-09-25 18:58:10 +02:00 • committed by Paul Moore
parent 8110dbd470
commit f1502d097c
22 changed files with 44 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Tools/freeze/extensions_win32.ini
View file

@ -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

4
Tools/msi/README.txt
View file

@ -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

2
Tools/msi/build.bat
View file

@ -1,7 +1,7 @@
@echo off
setlocal
set D=%~dp0
set PCBUILD=%D%..\..\PCBuild\
set PCBUILD=%D%..\..\PCbuild\
set BUILDX86=
set BUILDX64=

2
Tools/msi/buildrelease.bat
View file

@ -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\

6
Tools/msi/exe/exe.wixproj
View file

@ -45,7 +45,7 @@
</Target>
<Target Name="_MergeMiscNewsWithBlurb" AfterTargets="PrepareForBuild" Condition="$(Blurb) != '' and !Exists('$(PySourcePath)Misc\NEWS')">
<Exec Command="$(Blurb) merge -f &quot;$(BuildPath)NEWS.txt&quot;" WorkingDirectory="$(PCBuild)" />
<Exec Command="$(Blurb) merge -f &quot;$(BuildPath)NEWS.txt&quot;" WorkingDirectory="$(PCbuild)" />
</Target>
<Target Name="_MergeMiscNewsWithPython" AfterTargets="PrepareForBuild" Condition="$(Blurb) == '' and !Exists('$(PySourcePath)Misc\NEWS')">
@ -58,8 +58,8 @@
<HostPython>@(HostPython)</HostPython>
<HostPython Condition="$(HostPython.Contains(';'))">$(HostPython.Remove($(HostPython.IndexOf(';'))))</HostPython>
</PropertyGroup>
<Exec Command="&quot;$(HostPython)&quot; -m pip install -U blurb" WorkingDirectory="$(PCBuild)" />
<Exec Command="&quot;$(HostPython)&quot; -m blurb merge -f &quot;$(BuildPath)NEWS.txt&quot;" WorkingDirectory="$(PCBuild)" />
<Exec Command="&quot;$(HostPython)&quot; -m pip install -U blurb" WorkingDirectory="$(PCbuild)" />
<Exec Command="&quot;$(HostPython)&quot; -m blurb merge -f &quot;$(BuildPath)NEWS.txt&quot;" WorkingDirectory="$(PCbuild)" />
</Target>
<Import Project="..\msi.targets" />

8
Tools/msi/launcher/launcher.wixproj
View file

@ -20,16 +20,16 @@
</ItemGroup>
<Target Name="_EnsurePyEx86" Condition="!Exists('$(BuildPath32)py.exe')" BeforeTargets="PrepareForBuild">
<MSBuild Projects="$(PySourcePath)PCBuild\pylauncher.vcxproj" Properties="Platform=Win32" />
<MSBuild Projects="$(PySourcePath)PCbuild\pylauncher.vcxproj" Properties="Platform=Win32" />
</Target>
<Target Name="_EnsurePywEx86" Condition="!Exists('$(BuildPath32)pyw.exe')" BeforeTargets="PrepareForBuild">
<MSBuild Projects="$(PySourcePath)PCBuild\pywlauncher.vcxproj" Properties="Platform=Win32" />
<MSBuild Projects="$(PySourcePath)PCbuild\pywlauncher.vcxproj" Properties="Platform=Win32" />
</Target>
<Target Name="_EnsurePyShellExt86" Condition="!Exists('$(BuildPath32)pyshellext.dll')" BeforeTargets="PrepareForBuild">
<MSBuild Projects="$(PySourcePath)PCBuild\pyshellext.vcxproj" Properties="Platform=Win32" />
<MSBuild Projects="$(PySourcePath)PCbuild\pyshellext.vcxproj" Properties="Platform=Win32" />
</Target>
<Target Name="_EnsurePyShellExt64" Condition="!Exists('$(BuildPath64)pyshellext.dll')" BeforeTargets="PrepareForBuild">
<MSBuild Projects="$(PySourcePath)PCBuild\pyshellext.vcxproj" Properties="Platform=x64" />
<MSBuild Projects="$(PySourcePath)PCbuild\pyshellext.vcxproj" Properties="Platform=x64" />
</Target>
<Import Project="..\msi.targets" />

2
Tools/msi/msi.props
View file

@ -15,7 +15,7 @@
</PropertyGroup>
<Import Project="wix.props" />
<Import Project="..\..\PCBuild\tcltk.props" />
<Import Project="..\..\PCbuild\tcltk.props" />
<PropertyGroup>
<!--

2
Tools/msi/testrelease.bat
View file

@ -2,7 +2,7 @@
@echo off
set D=%~dp0
set PCBUILD=%D%..\..\PCBuild\
set PCBUILD=%D%..\..\PCbuild\
set TARGETDIR=%TEMP%
set TESTX86=

2
Tools/msi/uploadrelease.bat
View file

@ -2,7 +2,7 @@
@echo off
set D=%~dp0
set PCBUILD=%D%..\..\PCBuild\
set PCBUILD=%D%..\..\PCbuild\
set HOST=
set USER=

2
Tools/msi/wix.props
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\PCBuild\python.props" />
<Import Project="..\..\PCbuild\python.props" />
<PropertyGroup>
<WixInstallPath Condition="'$(WixInstallPath)' == '' and Exists('$(MSBuildThisFileDirectory)\Wix')">$(MSBuildThisFileDirectory)\Wix\</WixInstallPath>

2
Tools/nuget/build.bat
View file

@ -1,7 +1,7 @@
@echo off
setlocal
set D=%~dp0
set PCBUILD=%D%..\..\PCBuild\
set PCBUILD=%D%..\..\PCbuild\
if "%Py_OutDir%"=="" set Py_OutDir=%PCBUILD%
set BUILDX86=