From: Neal Norwitz Date: Fri, 18 Aug 2006 05:10:00 +0000 (+0000) Subject: Try to get Windows bots working again. Take 2 X-Git-Tag: v2.6a1~2781 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=132bbb3d06261afac334404a7b80f3bd18cf08cc;p=python Try to get Windows bots working again. Take 2 --- diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj index ef200c488a..f0f71b8ab1 100644 --- a/PCbuild/pythoncore.vcproj +++ b/PCbuild/pythoncore.vcproj @@ -39,15 +39,15 @@ @@ -99,15 +99,15 @@ @@ -166,15 +166,15 @@ Name="VCLinkerTool" AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" AdditionalDependencies="getbuildinfo.o" - OutputFile="./python25.dll" + OutputFile="./python26.dll" LinkIncremental="1" SuppressStartupBanner="FALSE" IgnoreDefaultLibraryNames="libc" GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./python25.pdb" + ProgramDatabaseFile=".\./python26.pdb" SubSystem="2" BaseAddress="0x1e000000" - ImportLibrary=".\./python25.lib" + ImportLibrary=".\./python26.lib" TargetMachine="0"/> @@ -233,15 +233,15 @@ Name="VCLinkerTool" AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" AdditionalDependencies="getbuildinfo.o" - OutputFile="./python25.dll" + OutputFile="./python26.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" IgnoreDefaultLibraryNames="libc" GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./python25.pdb" + ProgramDatabaseFile=".\./python26.pdb" SubSystem="2" BaseAddress="0x1e000000" - ImportLibrary=".\./python25.lib" + ImportLibrary=".\./python26.lib" TargetMachine="0"/> diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index d333d280a3..d028727e38 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -12,7 +12,7 @@ the "Standard" toolbar"), and build the projects. The proper order to build subprojects: 1) pythoncore (this builds the main Python DLL and library files, - python25.{dll, lib} in Release mode) + python26.{dll, lib} in Release mode) NOTE: in previous releases, this subproject was named after the release number, e.g. python20. @@ -26,7 +26,7 @@ The proper order to build subprojects: test slave; see SUBPROJECTS below) When using the Debug setting, the output files have a _d added to -their name: python25_d.dll, python_d.exe, parser_d.pyd, and so on. +their name: python26_d.dll, python_d.exe, parser_d.pyd, and so on. SUBPROJECTS -----------