diff options
| author | Thomas Wouters <thomas@python.org> | 2006-04-21 10:40:58 (GMT) |
|---|---|---|
| committer | Thomas Wouters <thomas@python.org> | 2006-04-21 10:40:58 (GMT) |
| commit | 49fd7fa4431da299196d74087df4a04f99f9c46f (patch) | |
| tree | 35ace5fe78d3d52c7a9ab356ab9f6dbf8d4b71f4 /PCbuild/python.build | |
| parent | 9ada3d6e29d5165dadacbe6be07bcd35cfbef59d (diff) | |
| download | cpython-49fd7fa4431da299196d74087df4a04f99f9c46f.zip cpython-49fd7fa4431da299196d74087df4a04f99f9c46f.tar.gz cpython-49fd7fa4431da299196d74087df4a04f99f9c46f.tar.bz2 | |
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
number of tests, all because of the codecs/_multibytecodecs issue described
here (it's not a Py3K issue, just something Py3K discovers):
http://mail.python.org/pipermail/python-dev/2006-April/064051.html
Hye-Shik Chang promised to look for a fix, so no need to fix it here. The
tests that are expected to break are:
test_codecencodings_cn
test_codecencodings_hk
test_codecencodings_jp
test_codecencodings_kr
test_codecencodings_tw
test_codecs
test_multibytecodec
This merge fixes an actual test failure (test_weakref) in this branch,
though, so I believe merging is the right thing to do anyway.
Diffstat (limited to 'PCbuild/python.build')
| -rw-r--r-- | PCbuild/python.build | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/PCbuild/python.build b/PCbuild/python.build new file mode 100644 index 0000000..61bbe89 --- /dev/null +++ b/PCbuild/python.build @@ -0,0 +1,21 @@ +<?xml version="1.0"?> +<project> + <target name="all" description="Build all targets."> + <solution configuration="release"> + <projects> + <include name="make_versioninfo.vcproj" /> + </projects> + </solution> + <exec program="make_versioninfo" output="pythonnt_rc.h" /> + + <solution configuration="release" solutionfile="pcbuild.sln"> + <excludeprojects> + <include name="_tkinter.vcproj" /> + <include name="bz2.vcproj" /> + <include name="_bsddb.vcproj" /> + <include name="_sqlite3.vcproj" /> + <include name="_ssl.vcproj" /> + </excludeprojects> + </solution> + </target> +</project> |