Skip to content

C
cpython
Commit dc92bd88 authored by Hirokazu Yamamoto's avatar Hirokazu Yamamoto
Browse files
Options

Merged revisions 84851 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84851 | hirokazu.yamamoto | 2010-09-17 02:50:57 +0900 | 3 lines

  Issue #9810: Compile bzip2 source files in python's project file
  directly. It used to be built with bzip2's makefile.
........
parent 6fab1f69
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 24 deletions
Misc/NEWS
View file @ dc92bd88
...@@ -565,6 +565,9 @@ Extension Modules ...@@ -565,6 +565,9 @@ Extension Modules
Build Build
----- -----
- Issue #9810: Compile bzip2 source files in python's project file
directly. It used to be built with bzip2's makefile.
- Issue #941346: Improve the build process under AIX and allow Python to - Issue #941346: Improve the build process under AIX and allow Python to
be built as a shared library. Patch by Sébastien Sablé. be built as a shared library. Patch by Sébastien Sablé.
......
PCbuild/bz2.vcproj
View file @ dc92bd88
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(bz2Dir)" AdditionalIncludeDirectories="$(bz2Dir)"
PreprocessorDefinitions="WIN32;_FILE_OFFSET_BITS=64"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -52,12 +53,10 @@ ...@@ -52,12 +53,10 @@
/> />
<Tool <Tool
Name="VCPreLinkEventTool" 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 <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Debug\libbz2.lib" BaseAddress="0x1D170000"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -106,6 +105,7 @@ ...@@ -106,6 +105,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(bz2Dir)" AdditionalIncludeDirectories="$(bz2Dir)"
PreprocessorDefinitions="WIN32;_FILE_OFFSET_BITS=64"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -115,12 +115,10 @@ ...@@ -115,12 +115,10 @@
/> />
<Tool <Tool
Name="VCPreLinkEventTool" 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 <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Debug\libbz2.lib" BaseAddress="0x1D170000"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -169,6 +167,7 @@ ...@@ -169,6 +167,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(bz2Dir)" AdditionalIncludeDirectories="$(bz2Dir)"
PreprocessorDefinitions="WIN32;_FILE_OFFSET_BITS=64"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -178,12 +177,10 @@ ...@@ -178,12 +177,10 @@
/> />
<Tool <Tool
Name="VCPreLinkEventTool" 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 <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib" BaseAddress="0x1D170000"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -233,6 +230,7 @@ ...@@ -233,6 +230,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(bz2Dir)" AdditionalIncludeDirectories="$(bz2Dir)"
PreprocessorDefinitions="WIN32;_FILE_OFFSET_BITS=64"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -242,12 +240,10 @@ ...@@ -242,12 +240,10 @@
/> />
<Tool <Tool
Name="VCPreLinkEventTool" 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 <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib" BaseAddress="0x1D170000"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -296,6 +292,7 @@ ...@@ -296,6 +292,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(bz2Dir)" AdditionalIncludeDirectories="$(bz2Dir)"
PreprocessorDefinitions="WIN32;_FILE_OFFSET_BITS=64"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -305,12 +302,10 @@ ...@@ -305,12 +302,10 @@
/> />
<Tool <Tool
Name="VCPreLinkEventTool" 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 <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib" BaseAddress="0x1D170000"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -360,6 +355,7 @@ ...@@ -360,6 +355,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(bz2Dir)" AdditionalIncludeDirectories="$(bz2Dir)"
PreprocessorDefinitions="WIN32;_FILE_OFFSET_BITS=64"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -369,12 +365,10 @@ ...@@ -369,12 +365,10 @@
/> />
<Tool <Tool
Name="VCPreLinkEventTool" 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 <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib" BaseAddress="0x1D170000"
TargetMachine="17" TargetMachine="17"
/> />
<Tool <Tool
...@@ -424,6 +418,7 @@ ...@@ -424,6 +418,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(bz2Dir)" AdditionalIncludeDirectories="$(bz2Dir)"
PreprocessorDefinitions="WIN32;_FILE_OFFSET_BITS=64"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -433,12 +428,10 @@ ...@@ -433,12 +428,10 @@
/> />
<Tool <Tool
Name="VCPreLinkEventTool" 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 <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib" BaseAddress="0x1D170000"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -488,6 +481,7 @@ ...@@ -488,6 +481,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(bz2Dir)" AdditionalIncludeDirectories="$(bz2Dir)"
PreprocessorDefinitions="WIN32;_FILE_OFFSET_BITS=64"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -497,12 +491,10 @@ ...@@ -497,12 +491,10 @@
/> />
<Tool <Tool
Name="VCPreLinkEventTool" 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 <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib" BaseAddress="0x1D170000"
TargetMachine="17" TargetMachine="17"
/> />
<Tool <Tool
...@@ -539,6 +531,50 @@ ...@@ -539,6 +531,50 @@
> >
</File> </File>
</Filter> </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> </Files>
<Globals> <Globals>
</Globals> </Globals>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7