[Python-checkins] r43000 - in python/branches/release24-maint: PCbuild/bz2.vcproj PCbuild/readme.txt Tools/buildbot/build.bat Tools/buildbot/external.bat

martin.v.loewis python-checkins at python.org
Mon Mar 13 14:06:48 CET 2006 

Author: martin.v.loewis
Date: Mon Mar 13 14:06:46 2006
New Revision: 43000

Added:
   python/branches/release24-maint/Tools/buildbot/external.bat
Modified:
   python/branches/release24-maint/PCbuild/bz2.vcproj
   python/branches/release24-maint/PCbuild/readme.txt
   python/branches/release24-maint/Tools/buildbot/build.bat
Log:
Backport of 42993:

Update to bzip2 1.0.3
Make buildbot slaves automatically fetch bzip2 1.0.3.

Modified: python/branches/release24-maint/PCbuild/bz2.vcproj
==============================================================================
--- python/branches/release24-maint/PCbuild/bz2.vcproj	(original)
+++ python/branches/release24-maint/PCbuild/bz2.vcproj	Mon Mar 13 14:06:46 2006
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Include,..\PC,..\..\bzip2-1.0.2"
+				AdditionalIncludeDirectories="..\Include,..\PC,..\..\bzip2-1.0.3"
 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
@@ -37,7 +37,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\bzip2-1.0.2\libbz2.lib"
+				AdditionalDependencies="..\..\bzip2-1.0.3\libbz2.lib"
 				OutputFile="./bz2_d.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -62,7 +62,7 @@
 				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCPreLinkEventTool"
-				CommandLine="cd ..\..\bzip2-1.0.2
+				CommandLine="cd ..\..\bzip2-1.0.3
 nmake /nologo /f makefile.msc
 "/>
 			<Tool
@@ -91,7 +91,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\Include,..\PC,..\..\bzip2-1.0.2"
+				AdditionalIncludeDirectories="..\Include,..\PC,..\..\bzip2-1.0.3"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -109,7 +109,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\bzip2-1.0.2\libbz2.lib"
+				AdditionalDependencies="..\..\bzip2-1.0.3\libbz2.lib"
 				OutputFile="./bz2.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -134,7 +134,7 @@
 				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCPreLinkEventTool"
-				CommandLine="cd ..\..\bzip2-1.0.2
+				CommandLine="cd ..\..\bzip2-1.0.3
 nmake /nologo /f makefile.msc lib
 "/>
 			<Tool
@@ -164,7 +164,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,..\..\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"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
@@ -186,7 +186,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
-				AdditionalDependencies="..\..\bzip2-1.0.2\libbz2.lib"
+				AdditionalDependencies="..\..\bzip2-1.0.3\libbz2.lib"
 				OutputFile="./bz2.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -211,7 +211,7 @@
 				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCPreLinkEventTool"
-				CommandLine="cd ..\..\bzip2-1.0.2
+				CommandLine="cd ..\..\bzip2-1.0.3
 nmake /nologo /f makefile.msc lib
 "/>
 			<Tool

Modified: python/branches/release24-maint/PCbuild/readme.txt
==============================================================================
--- python/branches/release24-maint/PCbuild/readme.txt	(original)
+++ python/branches/release24-maint/PCbuild/readme.txt	Mon Mar 13 14:06:46 2006
@@ -139,17 +139,15 @@
 bz2
     Python wrapper for the libbz2 compression library.  Homepage
         http://sources.redhat.com/bzip2/
-    Download the source tarball, bzip2-1.0.2.tar.gz.
-    Unpack into dist\bzip2-1.0.2.  WARNING:  If you're using WinZip, you
-    must disable its "TAR file smart CR/LF conversion" feature (under
-    Options -> Configuration -> Miscellaneous -> Other) for the duration.
+    Download the source from the python.org copy:
+    svn export http://svn.python.org/projects/external/bzip2-1.0.3
 
     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
     linked in PCbuild\.
     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
-    you need to clean up bzip2-1.0.2\ by hand.
+    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.3\ by hand.
 
     The build step shouldn't yield any warnings or errors, and should end
     by displaying 6 blocks each terminated with
@@ -157,7 +155,7 @@
     If FC finds differences, see the warning abou WinZip above (when I
     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.
 
 

Modified: python/branches/release24-maint/Tools/buildbot/build.bat
==============================================================================
--- python/branches/release24-maint/Tools/buildbot/build.bat	(original)
+++ python/branches/release24-maint/Tools/buildbot/build.bat	Mon Mar 13 14:06:46 2006
@@ -1,3 +1,4 @@
 @rem Used by the buildbot "compile" step.
+cmd /c Tools\buildbot\external.bat
 call "%VS71COMNTOOLS%vsvars32.bat"
 devenv.com /useenv /build Debug PCbuild\pcbuild.sln

Added: python/branches/release24-maint/Tools/buildbot/external.bat
==============================================================================
--- (empty file)
+++ python/branches/release24-maint/Tools/buildbot/external.bat	Mon Mar 13 14:06:46 2006
@@ -0,0 +1,8 @@
+ at rem Fetches (and builds if necessary) external dependencies
+
+ at rem Assume we start inside the Python source directory
+cd ..
+
+ at rem bzip
+if not exist bzip2-1.0.3 svn export http://svn.python.org/projects/external/bzip2-1.0.3
+

More information about the Python-checkins mailing list