Issue #9810: Compile bzip2 source files in python's project file

directly. It used to be built with bzip2's makefile.

diff --git a/Misc/NEWS b/Misc/NEWS
index 43c55df5f10873ba4f3fed94bc62b349f6522298..60b62b2c20301c3cff6a597f58edfd1d5dbf5150 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -183,6 +183,9 @@ Tests
 Build
 -----
 
+- Issue #9810: Compile bzip2 source files in python's project file
+  directly. It used to be built with bzip2's makefile.
+
 - Issue #9848: Stopping trying to build _weakref in setup.py as it is a
   built-in module.
 

diff --git a/PCbuild/bz2.vcproj b/PCbuild/bz2.vcproj
index 2c16eb0cbb5ac06021bea14c69b1d1b85bad6c4d..afda578e4363bf15746cadcae15be05b9c8644c6 100644 (file)
--- a/PCbuild/bz2.vcproj
+++ b/PCbuild/bz2.vcproj
@@ -43,6 +43,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="$(bz2Dir)"
+                               PreprocessorDefinitions="WIN32;_FILE_OFFSET_BITS=64"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
@@ -52,12 +53,10 @@
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               Description="Build libbz2"
-                               CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-Debug\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-Debug mkdir $(PlatformName)-Debug&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-Debug&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Debug\libbz2.lib"
+                               BaseAddress="0x1D170000"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -106,6 +105,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="$(bz2Dir)"
+                               PreprocessorDefinitions="WIN32;_FILE_OFFSET_BITS=64"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
@@ -115,12 +115,10 @@
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               Description="Build libbz2"
-                               CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-Debug\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-Debug mkdir $(PlatformName)-Debug&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-Debug&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Debug\libbz2.lib"
+                               BaseAddress="0x1D170000"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -169,6 +167,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="$(bz2Dir)"
+                               PreprocessorDefinitions="WIN32;_FILE_OFFSET_BITS=64"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
@@ -178,12 +177,10 @@
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               Description="Build libbz2"
-                               CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-Release\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib"
+                               BaseAddress="0x1D170000"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -233,6 +230,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="$(bz2Dir)"
+                               PreprocessorDefinitions="WIN32;_FILE_OFFSET_BITS=64"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
@@ -242,12 +240,10 @@
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               Description="Build libbz2"
-                               CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-Release\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib"
+                               BaseAddress="0x1D170000"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -296,6 +292,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="$(bz2Dir)"
+                               PreprocessorDefinitions="WIN32;_FILE_OFFSET_BITS=64"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
@@ -305,12 +302,10 @@
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               Description="Build libbz2"
-                               CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-Release\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib"
+                               BaseAddress="0x1D170000"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -360,6 +355,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="$(bz2Dir)"
+                               PreprocessorDefinitions="WIN32;_FILE_OFFSET_BITS=64"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
@@ -369,12 +365,10 @@
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               Description="Build libbz2"
-                               CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-Release\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib"
+                               BaseAddress="0x1D170000"
                                TargetMachine="17"
                        />
                        <Tool
@@ -424,6 +418,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="$(bz2Dir)"
+                               PreprocessorDefinitions="WIN32;_FILE_OFFSET_BITS=64"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
@@ -433,12 +428,10 @@
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               Description="Build libbz2"
-                               CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-Release\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib"
+                               BaseAddress="0x1D170000"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -488,6 +481,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="$(bz2Dir)"
+                               PreprocessorDefinitions="WIN32;_FILE_OFFSET_BITS=64"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
@@ -497,12 +491,10 @@
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               Description="Build libbz2"
-                               CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-Release\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-Release&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib"
+                               BaseAddress="0x1D170000"
                                TargetMachine="17"
                        />
                        <Tool
@@ -539,6 +531,50 @@
                                >
                        </File>
                </Filter>
+               <Filter
+                       Name="bzip2 1.0.5 Header Files"
+                       >
+                       <File
+                               RelativePath="$(bz2Dir)\bzlib.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="$(bz2Dir)\bzlib_private.h"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="bzip2 1.0.5 Source Files"
+                       >
+                       <File
+                               RelativePath="$(bz2Dir)\blocksort.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="$(bz2Dir)\bzlib.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="$(bz2Dir)\compress.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="$(bz2Dir)\crctable.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="$(bz2Dir)\decompress.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="$(bz2Dir)\huffman.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="$(bz2Dir)\randtable.c"
+                               >
+                       </File>
+               </Filter>
        </Files>
        <Globals>
        </Globals>