Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
318c56c0
Commit
318c56c0
authored
Jun 24, 2012
by
Stefan Krah
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #15102: Fix paths of python executables.
parent
03b9ad05
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
13 deletions
+12
-13
PCbuild/pyproject.props
PCbuild/pyproject.props
+12
-6
PCbuild/x64.props
PCbuild/x64.props
+0
-6
Tools/buildbot/build-amd64.bat
Tools/buildbot/build-amd64.bat
+0
-1
No files found.
PCbuild/pyproject.props
View file @
318c56c0
<?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>
...
...
PCbuild/x64.props
View file @
318c56c0
...
...
@@ -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>
...
...
Tools/buildbot/build-amd64.bat
View file @
318c56c0
@rem
Used
by
the
buildbot
"compile"
step
.
set
HOST_PYTHON
=
%CD%
\PCbuild\amd64\python_d.exe
cmd
/c
Tools
\buildbot\external
-amd
64
.bat
call
"
%VS1
00COMNTOOLS
%
\..\..\VC\vcvarsall.bat"
x86_amd64
cmd
/c
Tools
\buildbot\clean
-amd
64
.bat
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment