cpython: f12a2f2c93e5 (original) (raw)

Mercurial > cpython

changeset 77728:f12a2f2c93e5

Issue #15102: Fix paths of python executables. [#15102]

Stefan Krah skrah@bytereef.org
date	Sun, 24 Jun 2012 19:04:35 +0200
parents	c0a41e60e591
children	75b818d7c50d 9cf4dc975a32
files	PCbuild/pyproject.props PCbuild/x64.props Tools/buildbot/build-amd64.bat
diffstat	3 files changed, 12 insertions(+), 13 deletions(-)[+] [-] PCbuild/pyproject.props 18 PCbuild/x64.props 6 Tools/buildbot/build-amd64.bat 1

line wrap: on

line diff

--- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -1,5 +1,17 @@

<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
$(SolutionDir)
$(SolutionDir)$(PlatformName)-temp-$(Configuration)$(ProjectName)</IntDir>
false
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<_PropertySheetDisplayName>amd64</_PropertySheetDisplayName>
$(SolutionDir)amd64</OutDir>
$(SolutionDir)$(PlatformName)-temp-$(Configuration)$(ProjectName)</IntDir>
python33$(PyDebugExt) $(OutDir)python$(PyDebugExt).exe @@ -16,12 +28,6 @@ $(tcltk64Dir)\lib\tcl85.lib;$(tcltk64Dir)\lib\tk85.lib $(tcltk64Dir)\lib\tcl85g.lib;$(tcltk64Dir)\lib\tk85g.lib

<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
$(SolutionDir)
$(SolutionDir)$(PlatformName)-temp-$(Configuration)$(ProjectName)</IntDir>
false
MaxSpeed

--- a/PCbuild/x64.props +++ b/PCbuild/x64.props @@ -3,12 +3,6 @@ $(HOST_PYTHON)

<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<_PropertySheetDisplayName>amd64</_PropertySheetDisplayName>
$(SolutionDir)amd64</OutDir>
$(SolutionDir)$(PlatformName)-temp-$(Configuration)$(ProjectName)</IntDir>
/USECL:MS_OPTERON /GS- %(AdditionalOptions)

--- a/Tools/buildbot/build-amd64.bat +++ b/Tools/buildbot/build-amd64.bat @@ -1,5 +1,4 @@ @rem Used by the buildbot "compile" step. -set HOST_PYTHON=%CD%\PCbuild\amd64\python_d.exe cmd /c Tools\buildbot\external-amd64.bat call "%VS100COMNTOOLS%....\VC\vcvarsall.bat" x86_amd64 cmd /c Tools\buildbot\clean-amd64.bat