diff options
| author | Stefan Krah <skrah@bytereef.org> | 2012-06-24 17:04:35 (GMT) |
|---|---|---|
| committer | Stefan Krah <skrah@bytereef.org> | 2012-06-24 17:04:35 (GMT) |
| commit | 318c56c0016fbc0d1825a90f773f0e2cdf3c1e5a (patch) | |
| tree | 7524de1608acc9e9450b247764627388c358b1ff | |
| parent | 03b9ad05d664ba7b4f6038db2d213f47821a63a9 (diff) | |
| download | cpython-318c56c0016fbc0d1825a90f773f0e2cdf3c1e5a.zip cpython-318c56c0016fbc0d1825a90f773f0e2cdf3c1e5a.tar.gz cpython-318c56c0016fbc0d1825a90f773f0e2cdf3c1e5a.tar.bz2 | |
Issue #15102: Fix paths of python executables.
| -rw-r--r-- | PCbuild/pyproject.props | 18 | ||||
| -rw-r--r-- | PCbuild/x64.props | 6 | ||||
| -rw-r--r-- | Tools/buildbot/build-amd64.bat | 1 |
3 files changed, 12 insertions, 13 deletions
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props index 8041a6d..4afbe3c 100644 --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -1,5 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Condition="'$(Platform)'=='Win32'"> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <OutDir>$(SolutionDir)</OutDir> + <IntDir>$(SolutionDir)$(PlatformName)-temp-$(Configuration)\$(ProjectName)\</IntDir> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Platform)'=='x64'"> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <_PropertySheetDisplayName>amd64</_PropertySheetDisplayName> + <OutDir>$(SolutionDir)amd64\</OutDir> + <IntDir>$(SolutionDir)$(PlatformName)-temp-$(Configuration)\$(ProjectName)\</IntDir> + </PropertyGroup> <PropertyGroup Label="UserMacros"> <PyDllName>python33$(PyDebugExt)</PyDllName> <PythonExe>$(OutDir)python$(PyDebugExt).exe</PythonExe> @@ -16,12 +28,6 @@ <tcltk64Lib>$(tcltk64Dir)\lib\tcl85.lib;$(tcltk64Dir)\lib\tk85.lib</tcltk64Lib> <tcltk64LibDebug>$(tcltk64Dir)\lib\tcl85g.lib;$(tcltk64Dir)\lib\tk85g.lib</tcltk64LibDebug> </PropertyGroup> - <PropertyGroup> - <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> - <OutDir>$(SolutionDir)</OutDir> - <IntDir>$(SolutionDir)$(PlatformName)-temp-$(Configuration)\$(ProjectName)\</IntDir> - <LinkIncremental>false</LinkIncremental> - </PropertyGroup> <ItemDefinitionGroup> <ClCompile> <Optimization>MaxSpeed</Optimization> diff --git a/PCbuild/x64.props b/PCbuild/x64.props index 4fb319b..289d95b 100644 --- a/PCbuild/x64.props +++ b/PCbuild/x64.props @@ -3,12 +3,6 @@ <PropertyGroup Label="UserMacros" Condition="'$(HOST_PYTHON)'!=''"> <PythonExe>$(HOST_PYTHON)</PythonExe> </PropertyGroup> - <PropertyGroup> - <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> - <_PropertySheetDisplayName>amd64</_PropertySheetDisplayName> - <OutDir>$(SolutionDir)amd64\</OutDir> - <IntDir>$(SolutionDir)$(PlatformName)-temp-$(Configuration)\$(ProjectName)\</IntDir> - </PropertyGroup> <ItemDefinitionGroup> <ClCompile> <AdditionalOptions>/USECL:MS_OPTERON /GS- %(AdditionalOptions)</AdditionalOptions> diff --git a/Tools/buildbot/build-amd64.bat b/Tools/buildbot/build-amd64.bat index 569c451..7ee7b2d 100644 --- 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 |