mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 11:23:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Update to bzip2 1.0.3

Browse source 
Make buildbot slaves automatically fetch bzip2 1.0.3.
This commit is contained in:
Martin v. Löwis 2006-03-13 10:52:04 +00:00
parent a022789ab3
commit 14c1cf88ad
4 changed files with 26 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

24
PCbuild/bz2.vcproj
View file

@ -21,7 +21,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\Include,..\PC,..\..\bzip2-1.0.2" AdditionalIncludeDirectories="..\Include,..\PC,..\..\bzip2-1.0.3"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS" PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
RuntimeLibrary="3" RuntimeLibrary="3"
UsePrecompiledHeader="2" UsePrecompiledHeader="2"
@ -33,7 +33,7 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="..\..\bzip2-1.0.2\libbz2.lib" AdditionalDependencies="..\..\bzip2-1.0.3\libbz2.lib"
OutputFile="./bz2_d.pyd" OutputFile="./bz2_d.pyd"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
@ -52,7 +52,7 @@
Name="VCPreBuildEventTool"/> Name="VCPreBuildEventTool"/>
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"
CommandLine="cd ..\..\bzip2-1.0.2 CommandLine="cd ..\..\bzip2-1.0.3
nmake /nologo /f makefile.msc nmake /nologo /f makefile.msc
"/> "/>
<Tool <Tool
@ -79,7 +79,7 @@ nmake /nologo /f makefile.msc
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Include,..\PC,..\..\bzip2-1.0.2" AdditionalIncludeDirectories="..\Include,..\PC,..\..\bzip2-1.0.3"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
StringPooling="TRUE" StringPooling="TRUE"
RuntimeLibrary="2" RuntimeLibrary="2"
@ -93,7 +93,7 @@ nmake /nologo /f makefile.msc
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="..\..\bzip2-1.0.2\libbz2.lib" AdditionalDependencies="..\..\bzip2-1.0.3\libbz2.lib"
OutputFile="./bz2.pyd" OutputFile="./bz2.pyd"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
@ -112,7 +112,7 @@ nmake /nologo /f makefile.msc
Name="VCPreBuildEventTool"/> Name="VCPreBuildEventTool"/>
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"
CommandLine="cd ..\..\bzip2-1.0.2 CommandLine="cd ..\..\bzip2-1.0.3
nmake /nologo /f makefile.msc lib nmake /nologo /f makefile.msc lib
"/> "/>
<Tool <Tool
@ -140,7 +140,7 @@ nmake /nologo /f makefile.msc lib
AdditionalOptions=" /USECL:MS_ITANIUM" AdditionalOptions=" /USECL:MS_ITANIUM"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include,..\PC,..\..\bzip2-1.0.2" AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include,..\PC,..\..\bzip2-1.0.3"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
@ -158,7 +158,7 @@ nmake /nologo /f makefile.msc lib
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
AdditionalDependencies="..\..\bzip2-1.0.2\libbz2.lib" AdditionalDependencies="..\..\bzip2-1.0.3\libbz2.lib"
OutputFile="./bz2.pyd" OutputFile="./bz2.pyd"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
@ -177,7 +177,7 @@ nmake /nologo /f makefile.msc lib
Name="VCPreBuildEventTool"/> Name="VCPreBuildEventTool"/>
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"
CommandLine="cd ..\..\bzip2-1.0.2 CommandLine="cd ..\..\bzip2-1.0.3
nmake /nologo /f makefile.msc lib nmake /nologo /f makefile.msc lib
"/> "/>
<Tool <Tool
@ -205,7 +205,7 @@ nmake /nologo /f makefile.msc lib
AdditionalOptions=" /USECL:MS_OPTERON" AdditionalOptions=" /USECL:MS_OPTERON"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl\amd64;{MSSDKPATH}\include\Win64\crt\amd64;{MSSDKPATH}\include\Win64\crt\amd64\sys;{MSSDKPATH}\include\Win64\mfc\amd64;..\Include,..\PC,..\..\bzip2-1.0.2" AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl\amd64;{MSSDKPATH}\include\Win64\crt\amd64;{MSSDKPATH}\include\Win64\crt\amd64\sys;{MSSDKPATH}\include\Win64\mfc\amd64;..\Include,..\PC,..\..\bzip2-1.0.3"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS" PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
StringPooling="TRUE" StringPooling="TRUE"
BasicRuntimeChecks="0" BasicRuntimeChecks="0"
@ -223,7 +223,7 @@ nmake /nologo /f makefile.msc lib
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
AdditionalDependencies="..\..\bzip2-1.0.2\libbz2.lib" AdditionalDependencies="..\..\bzip2-1.0.3\libbz2.lib"
OutputFile="./bz2.pyd" OutputFile="./bz2.pyd"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
@ -242,7 +242,7 @@ nmake /nologo /f makefile.msc lib
Name="VCPreBuildEventTool"/> Name="VCPreBuildEventTool"/>
<Tool <Tool
Name="VCPreLinkEventTool" Name="VCPreLinkEventTool"
CommandLine="cd ..\..\bzip2-1.0.2 CommandLine="cd ..\..\bzip2-1.0.3
nmake /nologo /f makefile.msc lib nmake /nologo /f makefile.msc lib
"/> "/>
<Tool <Tool

12
PCbuild/readme.txt
View file

@ -127,17 +127,15 @@ _tkinter
bz2 bz2
Python wrapper for the libbz2 compression library. Homepage Python wrapper for the libbz2 compression library. Homepage
http://sources.redhat.com/bzip2/ http://sources.redhat.com/bzip2/
Download the source tarball, bzip2-1.0.2.tar.gz. Download the source from the python.org copy:
Unpack into dist\bzip2-1.0.2. WARNING: If you're using WinZip, you svn export http://svn.python.org/projects/external/bzip2-1.0.3
must disable its "TAR file smart CR/LF conversion" feature (under
Options -> Configuration -> Miscellaneous -> Other) for the duration.
A custom pre-link step in the bz2 project settings should manage to A custom pre-link step in the bz2 project settings should manage to
build bzip2-1.0.2\libbz2.lib by magic before bz2.pyd (or bz2_d.pyd) is build bzip2-1.0.2\libbz2.lib by magic before bz2.pyd (or bz2_d.pyd) is
linked in PCbuild\. linked in PCbuild\.
However, the bz2 project is not smart enough to remove anything under However, the bz2 project is not smart enough to remove anything under
bzip2-1.0.2\ when you do a clean, so if you want to rebuild bzip2.lib bzip2-1.0.3\ when you do a clean, so if you want to rebuild bzip2.lib
you need to clean up bzip2-1.0.2\ by hand. you need to clean up bzip2-1.0.3\ by hand.
The build step shouldn't yield any warnings or errors, and should end The build step shouldn't yield any warnings or errors, and should end
by displaying 6 blocks each terminated with by displaying 6 blocks each terminated with
@ -145,7 +143,7 @@ bz2
If FC finds differences, see the warning abou WinZip above (when I If FC finds differences, see the warning abou WinZip above (when I
first tried it, sample3.ref failed due to CRLF conversion). first tried it, sample3.ref failed due to CRLF conversion).
All of this managed to build bzip2-1.0.2\libbz2.lib, which the Python All of this managed to build bzip2-1.0.3\libbz2.lib, which the Python
project links in. project links in.

1
Tools/buildbot/build.bat
View file

@ -1,3 +1,4 @@
@rem Used by the buildbot "compile" step. @rem Used by the buildbot "compile" step.
cmd /c Tools\buildbot\external.bat
call "%VS71COMNTOOLS%vsvars32.bat" call "%VS71COMNTOOLS%vsvars32.bat"
devenv.com /useenv /build Debug PCbuild\pcbuild.sln devenv.com /useenv /build Debug PCbuild\pcbuild.sln

8
Tools/buildbot/external.bat Normal file
View file

@ -0,0 +1,8 @@
@rem Fetches (and builds if necessary) external dependencies
@rem Assume we start inside the Python source directory
cd ..
@rem bzip
if not exist bzip2-1.0.3 svn export http://svn.python.org/projects/external/bzip2-1.0.3