Issue 15102: Fix 64-bit building for buildbot scripts

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s :	save comment
<Esc> :	cancel edit

#15102: Fix 64-bit building for buildbot scripts

Can't Edit
Can't Publish+Mail
Start Review

Created:
11 months ago by jeremy.kloth+python-tracker

Modified:
11 months ago

Reviewers:
martin

CC:
loewis, Georg, AntoinePitrou, jkloth, brian.curtin, skrah, jeremy.kloth_gmail.com, devnull_psf.upfronthosting.co.za, zach.ware

Visibility:
Public.

Patch Set 1 #

Total comments: 2

Patch Set 2 #

Total comments: 4

Patch Set 3 #

Patch Set 4 #

Patch Set 5 #

Created: 11 months ago

Download raw patch set

Unified diffs	Side-by-side diffs	Delta from patch set	Stats			Patch
PCbuild/pyproject.props	View	1 2 3 4	2 chunks	+12 lines, -6 lines	0 comments	Download
PCbuild/x64.props	View	1 2 3 4	1 chunk	+0 lines, -6 lines	0 comments	Download
Tools/buildbot/build-amd64.bat	View	1 2 3 4	1 chunk	+0 lines, -1 line	0 comments	Download

Messages

Total messages: 1

Expand All Messages | Collapse All Messages

loewis

11 months ago #1

http://bugs.python.org/review/15102/diff/5158/PCbuild/x64.props
File PCbuild/x64.props (left):

http://bugs.python.org/review/15102/diff/5158/PCbuild/x64.props#oldcode4
PCbuild/x64.props:4: <PythonExe>$(HOST_PYTHON)</PythonExe>
This change is incorrect; the HOST_PYTHON variable must be set from the outside.

http://bugs.python.org/review/15102/diff/5158/Tools/buildbot/build-common.bat
File Tools/buildbot/build-common.bat (right):

http://bugs.python.org/review/15102/diff/5158/Tools/buildbot/build-common.bat...
Tools/buildbot/build-common.bat:4: msbuild /p:useenv=true
PCbuild\make_buildinfo.vcxproj /p:Configuration=Release /p:Platform=Win32
Why is it necessary to single out these projects? The solution file will know
that they need to be built for Win32.

http://bugs.python.org/review/15102/diff/5192/PC/pylauncher.rc
File PC/pylauncher.rc (right):

http://bugs.python.org/review/15102/diff/5192/PC/pylauncher.rc#newcode6
PC/pylauncher.rc:6: #include "pythonnt_rc.h"
This chunk is incorrect. In the debug build, the generated header file is called
pythonnt_rc_d.h

http://bugs.python.org/review/15102/diff/5192/PC/python_nt.rc
File PC/python_nt.rc (right):

http://bugs.python.org/review/15102/diff/5192/PC/python_nt.rc#newcode9
PC/python_nt.rc:9: #include "pythonnt_rc.h"
This chunk is incorrect. In the debug build, the generated header file is called
pythonnt_rc_d.h

http://bugs.python.org/review/15102/diff/5192/PCbuild/make_versioninfo.vcxproj
File PCbuild/make_versioninfo.vcxproj (right):

http://bugs.python.org/review/15102/diff/5192/PCbuild/make_versioninfo.vcxpro...
PCbuild/make_versioninfo.vcxproj:60: make_versioninfo.exe &gt; ..\PC\python_nt.h
This chunk is incorrect. The proper file name *is* python_nt_d.h.

http://bugs.python.org/review/15102/diff/5192/PCbuild/pcbuild.sln
File PCbuild/pcbuild.sln (right):

http://bugs.python.org/review/15102/diff/5192/PCbuild/pcbuild.sln#newcode71
PCbuild/pcbuild.sln:71: Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") =
"pylauncher", "pylauncher.vcxproj", "{7B2727B5-5A3F-40EE-A866-43A13CD31446}"
This change is out of date; pylauncher and pylauncherw are already included in
the solution file.

Expand All Messages | Collapse All Messages