[Python-checkins] python/dist/src/PCbuild BUILDno.txt, 1.38.2.2, 1.38.2.3 pcbuild.sln, 1.5.4.1, 1.5.4.2 pythoncore.vcproj, 1.26.2.2, 1.26.2.3 readme.txt, 1.23.2.2, 1.23.2.3 zlib.vcproj, 1.6.6.1, 1.6.6.2
jhylton@users.sourceforge.net
jhylton at users.sourceforge.net
Sun Oct 16 07:24:09 CEST 2005
Update of /cvsroot/python/python/dist/src/PCbuild
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27718/PCbuild
Modified Files:
Tag: ast-branch
BUILDno.txt pcbuild.sln pythoncore.vcproj readme.txt
zlib.vcproj
Log Message:
Merge head to branch (for the last time)
Index: BUILDno.txt
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/BUILDno.txt,v
retrieving revision 1.38.2.2
retrieving revision 1.38.2.3
diff -u -d -r1.38.2.2 -r1.38.2.3
--- BUILDno.txt 7 Jan 2005 07:04:26 -0000 1.38.2.2
+++ BUILDno.txt 16 Oct 2005 05:24:05 -0000 1.38.2.3
@@ -33,6 +33,16 @@
Windows Python BUILD numbers
----------------------------
+ 65 2.4.1
+ 30-Mar-2005
+ 64 2.4.1c2
+ 17-Mar-2005
+ 63 2.4.1c1
+ 10-Mar-2005
+ 62 2.3.5
+ 08-Feb-2005
+ 61 2.3.5c1
+ 26-Jan-2005
60 2.4
29-Nov-2004
59 2.4.0c1
Index: pcbuild.sln
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/pcbuild.sln,v
retrieving revision 1.5.4.1
retrieving revision 1.5.4.2
diff -u -d -r1.5.4.1 -r1.5.4.2
--- pcbuild.sln 7 Jan 2005 07:04:29 -0000 1.5.4.1
+++ pcbuild.sln 16 Oct 2005 05:24:05 -0000 1.5.4.2
@@ -179,8 +179,8 @@
{680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.Debug.Build.0 = Debug|Win32
{680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.Release.ActiveCfg = Release|Win32
{680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.Release.Build.0 = Release|Win32
- {680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.ReleaseItanium.ActiveCfg = Release|Win32
- {680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.ReleaseItanium.Build.0 = Release|Win32
+ {680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.ReleaseItanium.ActiveCfg = ReleaseItanium|Win32
+ {680CDC79-9CCA-4282-9A8D-927CB0DB55B2}.ReleaseItanium.Build.0 = ReleaseItanium|Win32
EndGlobalSection
GlobalSection(SolutionItems) = postSolution
readme.txt = readme.txt
Index: pythoncore.vcproj
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/pythoncore.vcproj,v
retrieving revision 1.26.2.2
retrieving revision 1.26.2.3
diff -u -d -r1.26.2.2 -r1.26.2.3
--- pythoncore.vcproj 21 Mar 2005 19:27:39 -0000 1.26.2.2
+++ pythoncore.vcproj 16 Oct 2005 05:24:05 -0000 1.26.2.3
@@ -1280,6 +1280,33 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\Modules\functionalmodule.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="ReleaseItanium|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\Python\future.c">
<FileConfiguration
Name="Release|Win32">
@@ -2732,6 +2759,60 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\Modules\sha256module.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="ReleaseItanium|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\Modules\sha512module.c">
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="ReleaseItanium|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/>
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\Modules\signalmodule.c">
<FileConfiguration
Name="Release|Win32">
Index: readme.txt
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/readme.txt,v
retrieving revision 1.23.2.2
retrieving revision 1.23.2.3
diff -u -d -r1.23.2.2 -r1.23.2.3
--- readme.txt 7 Jan 2005 07:04:32 -0000 1.23.2.2
+++ readme.txt 16 Oct 2005 05:24:05 -0000 1.23.2.3
@@ -12,7 +12,7 @@
The proper order to build subprojects:
1) pythoncore (this builds the main Python DLL and library files,
- python21.{dll, lib} in Release mode)
+ python25.{dll, lib} in Release mode)
NOTE: in previous releases, this subproject was
named after the release number, e.g. python20.
@@ -25,7 +25,7 @@
to the subsystems they implement; see SUBPROJECTS below)
When using the Debug setting, the output files have a _d added to
-their name: python24_d.dll, python_d.exe, parser_d.pyd, and so on.
+their name: python25_d.dll, python_d.exe, parser_d.pyd, and so on.
SUBPROJECTS
-----------
@@ -114,7 +114,7 @@
all.tcl: Total 8420 Passed 6826 Skipped 1581 Failed 13
Sourced 91 Test Files.
Files with failing tests: canvImg.test scrollbar.test textWind.test winWm.test
-
+
Built Tix
---------
Download from http://prdownloads.sourceforge.net/tix/tix-8.1.4.tar.gz
@@ -126,15 +126,18 @@
zlib
Python wrapper for the zlib compression library. Get the source code
- for version 1.2.1 from a convenient mirror at:
+ for version 1.2.3 from a convenient mirror at:
http://www.gzip.org/zlib/
- Unpack into dist\zlib-1.2.1.
+ Unpack into dist\zlib-1.2.3.
A custom pre-link step in the zlib project settings should manage to
- build zlib-1.2.1\zlib.lib by magic before zlib.pyd (or zlib_d.pyd) is
+ build zlib-1.2.3\zlib.lib by magic before zlib.pyd (or zlib_d.pyd) is
linked in PCbuild\.
However, the zlib project is not smart enough to remove anything under
- zlib-1.2.1\ when you do a clean, so if you want to rebuild zlib.lib
- you need to clean up zlib-1.2.1\ by hand.
+ zlib-1.2.3\ when you do a clean, so if you want to rebuild zlib.lib
+ you need to clean up zlib-1.2.3\ by hand.
+ When building zlib.pyd for Itanium, the pre-link build step won't work,
+ so you will need to invoke nmake manually, using an IA64 build
+ environment.
bz2
Python wrapper for the libbz2 compression library. Homepage
@@ -238,17 +241,6 @@
XXX doesn't cause a test to fail when it happens (exceptions in
XXX threads are invisible to unittest).
- XXX 11-Apr-2004 tim
- XXX On WinXP Pro, I got one failure from test_bsddb3:
- XXX
- XXX ERROR: test04_n_flag (bsddb.test.test_compat.CompatibilityTestCase)
- XXX Traceback (most recent call last):
- XXX File "C:\Code\python\lib\bsddb\test\test_compat.py", line 86, in test04_n_flag
- XXX f = hashopen(self.filename, 'n')
- XXX File "C:\Code\python\lib\bsddb\__init__.py", line 293, in hashopen
- XXX d.open(file, db.DB_HASH, flags, mode)
- XXX DBInvalidArgError: (22, 'Invalid argument -- DB_TRUNCATE illegal with locking specified')
-
_ssl
Python wrapper for the secure sockets library.
@@ -260,6 +252,7 @@
not
openssl-engine-0.9.7d.tar.gz
+ (see #1233049 for using 0.9.8).
Unpack into the "dist" directory, retaining the folder name from
the archive - for example, the latest stable OpenSSL will install as
dist/openssl-0.9.7d
Index: zlib.vcproj
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/zlib.vcproj,v
retrieving revision 1.6.6.1
retrieving revision 1.6.6.2
diff -u -d -r1.6.6.1 -r1.6.6.2
--- zlib.vcproj 7 Jan 2005 07:04:33 -0000 1.6.6.1
+++ zlib.vcproj 16 Oct 2005 05:24:05 -0000 1.6.6.2
@@ -21,7 +21,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\Include,..\PC,..\..\zlib-1.2.1"
+ AdditionalIncludeDirectories="..\Include,..\PC,..\..\zlib-1.2.3"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
@@ -37,7 +37,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\zlib-1.2.1\zlib.lib"
+ AdditionalDependencies="..\..\zlib-1.2.3\zlib.lib"
OutputFile="./zlib_d.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
@@ -63,7 +63,7 @@
<Tool
Name="VCPreLinkEventTool"
Description="Checking static zlib has been built"
- CommandLine="cd ..\..\zlib-1.2.1
+ CommandLine="cd ..\..\zlib-1.2.3
nmake -nologo -f win32\Makefile.msc zlib.lib
"/>
<Tool
@@ -92,7 +92,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\Include,..\PC,..\..\zlib-1.2.1"
+ AdditionalIncludeDirectories="..\Include,..\PC,..\..\zlib-1.2.3"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
StringPooling="TRUE"
RuntimeLibrary="2"
@@ -110,7 +110,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\zlib-1.2.1\zlib.lib"
+ AdditionalDependencies="..\..\zlib-1.2.3\zlib.lib"
OutputFile="./zlib.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
@@ -136,7 +136,7 @@
<Tool
Name="VCPreLinkEventTool"
Description="Checking static zlib has been built"
- CommandLine="cd ..\..\zlib-1.2.1
+ CommandLine="cd ..\..\zlib-1.2.3
nmake -nologo -f win32\Makefile.msc zlib.lib
"/>
<Tool
@@ -166,7 +166,7 @@
AdditionalOptions=" /USECL:MS_ITANIUM"
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include,..\PC,..\..\zlib-1.2.1"
+ AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include,..\PC,..\..\zlib-1.2.3"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
StringPooling="TRUE"
BasicRuntimeChecks="0"
@@ -188,7 +188,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
- AdditionalDependencies="..\..\zlib-1.2.1\zlib.lib"
+ AdditionalDependencies="..\..\zlib-1.2.3\zlib.lib"
OutputFile="./zlib.pyd"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
@@ -214,7 +214,7 @@
<Tool
Name="VCPreLinkEventTool"
Description="Checking static zlib has been built"
- CommandLine="cd ..\..\zlib-1.2.1
+ CommandLine="cd ..\..\zlib-1.2.3
nmake -nologo -f win32\Makefile.msc zlib.lib
"/>
<Tool
More information about the Python-checkins
mailing list