diff options
author | Stefan Grönke <stefan@gronke.org> | 2017-09-25 18:58:10 +0200 |
---|---|---|
committer | Paul Moore <p.f.moore@gmail.com> | 2017-09-25 17:58:10 +0100 |
commit | f1502d097c29b266a5748312ee2451a2d6ac0af6 (patch) | |
tree | b799565b97317d802a3e828f3341482ee2d8351c /Tools/msi | |
parent | 8110dbd470f3daa4de58dda66d360e3c26d3b94f (diff) | |
download | cpython-git-f1502d097c29b266a5748312ee2451a2d6ac0af6.tar.gz |
bpo-31569: correct PCBuild/ case to PCbuild/ in build scripts and docs (GH-3711)
Diffstat (limited to 'Tools/msi')
-rw-r--r-- | Tools/msi/README.txt | 4 | ||||
-rw-r--r-- | Tools/msi/build.bat | 2 | ||||
-rw-r--r-- | Tools/msi/buildrelease.bat | 2 | ||||
-rw-r--r-- | Tools/msi/exe/exe.wixproj | 6 | ||||
-rw-r--r-- | Tools/msi/launcher/launcher.wixproj | 8 | ||||
-rw-r--r-- | Tools/msi/msi.props | 2 | ||||
-rw-r--r-- | Tools/msi/testrelease.bat | 2 | ||||
-rw-r--r-- | Tools/msi/uploadrelease.bat | 2 | ||||
-rw-r--r-- | Tools/msi/wix.props | 2 |
9 files changed, 15 insertions, 15 deletions
diff --git a/Tools/msi/README.txt b/Tools/msi/README.txt index 7023b61181..1908f5c3a4 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 f720ea9a86..8fa612e9dd 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 5dc1b57b66..4178981195 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 8eaf494c4d..071501ce6e 100644 --- a/Tools/msi/exe/exe.wixproj +++ b/Tools/msi/exe/exe.wixproj @@ -45,7 +45,7 @@ </Target> <Target Name="_MergeMiscNewsWithBlurb" AfterTargets="PrepareForBuild" Condition="$(Blurb) != '' and !Exists('$(PySourcePath)Misc\NEWS')"> - <Exec Command="$(Blurb) merge -f "$(BuildPath)NEWS.txt"" WorkingDirectory="$(PCBuild)" /> + <Exec Command="$(Blurb) merge -f "$(BuildPath)NEWS.txt"" 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=""$(HostPython)" -m pip install -U blurb" WorkingDirectory="$(PCBuild)" /> - <Exec Command=""$(HostPython)" -m blurb merge -f "$(BuildPath)NEWS.txt"" WorkingDirectory="$(PCBuild)" /> + <Exec Command=""$(HostPython)" -m pip install -U blurb" WorkingDirectory="$(PCbuild)" /> + <Exec Command=""$(HostPython)" -m blurb merge -f "$(BuildPath)NEWS.txt"" WorkingDirectory="$(PCbuild)" /> </Target> <Import Project="..\msi.targets" /> diff --git a/Tools/msi/launcher/launcher.wixproj b/Tools/msi/launcher/launcher.wixproj index 8935ce88a7..7ff169029e 100644 --- a/Tools/msi/launcher/launcher.wixproj +++ b/Tools/msi/launcher/launcher.wixproj @@ -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" /> diff --git a/Tools/msi/msi.props b/Tools/msi/msi.props index 2318d484d1..24a90bd8cb 100644 --- a/Tools/msi/msi.props +++ b/Tools/msi/msi.props @@ -15,7 +15,7 @@ </PropertyGroup> <Import Project="wix.props" /> - <Import Project="..\..\PCBuild\tcltk.props" /> + <Import Project="..\..\PCbuild\tcltk.props" /> <PropertyGroup> <!-- diff --git a/Tools/msi/testrelease.bat b/Tools/msi/testrelease.bat index 96fdf5eb86..02bcca943c 100644 --- a/Tools/msi/testrelease.bat +++ b/Tools/msi/testrelease.bat @@ -2,7 +2,7 @@ @echo off set D=%~dp0 -set PCBUILD=%D%..\..\PCBuild\ +set PCBUILD=%D%..\..\PCbuild\ set TARGETDIR=%TEMP% set TESTX86= diff --git a/Tools/msi/uploadrelease.bat b/Tools/msi/uploadrelease.bat index 610b092b86..4753fd3503 100644 --- a/Tools/msi/uploadrelease.bat +++ b/Tools/msi/uploadrelease.bat @@ -2,7 +2,7 @@ @echo off set D=%~dp0 -set PCBUILD=%D%..\..\PCBuild\ +set PCBUILD=%D%..\..\PCbuild\ set HOST= set USER= diff --git a/Tools/msi/wix.props b/Tools/msi/wix.props index fbb2d1020e..7269d34c03 100644 --- a/Tools/msi/wix.props +++ b/Tools/msi/wix.props @@ -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> |