diff options
| author | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2010-09-18 22:53:25 (GMT) |
|---|---|---|
| committer | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2010-09-18 22:53:25 (GMT) |
| commit | dc92bd889045bf3bd722c2dbf1db59422137784d (patch) | |
| tree | 6202bb11889968a3b25ba1fe14332b171fa48d5b | |
| parent | 6fab1f69e244f364b3db73457cb96cb6d0810692 (diff) | |
| download | cpython-dc92bd889045bf3bd722c2dbf1db59422137784d.zip cpython-dc92bd889045bf3bd722c2dbf1db59422137784d.tar.gz cpython-dc92bd889045bf3bd722c2dbf1db59422137784d.tar.bz2 | |
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.
........
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | PCbuild/bz2.vcproj | 84 |
2 files changed, 63 insertions, 24 deletions
@@ -565,6 +565,9 @@ Extension Modules 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 be built as a shared library. Patch by Sébastien Sablé. diff --git a/PCbuild/bz2.vcproj b/PCbuild/bz2.vcproj index 2c16eb0..afda578 100644 --- 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)
if exist $(PlatformName)-Debug\libbz2.lib exit 0
if not exist $(PlatformName)-Debug mkdir $(PlatformName)-Debug
nmake /nologo /f makefile.msc lib
copy libbz2.lib $(PlatformName)-Debug
nmake /nologo /f makefile.msc clean
" /> <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)
if exist $(PlatformName)-Debug\libbz2.lib exit 0
if not exist $(PlatformName)-Debug mkdir $(PlatformName)-Debug
nmake /nologo /f makefile.msc lib
copy libbz2.lib $(PlatformName)-Debug
nmake /nologo /f makefile.msc clean
" /> <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)
if exist $(PlatformName)-Release\libbz2.lib exit 0
if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release
nmake /nologo /f makefile.msc lib
copy libbz2.lib $(PlatformName)-Release
nmake /nologo /f makefile.msc clean
" /> <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)
if exist $(PlatformName)-Release\libbz2.lib exit 0
if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release
nmake /nologo /f makefile.msc lib
copy libbz2.lib $(PlatformName)-Release
nmake /nologo /f makefile.msc clean
" /> <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)
if exist $(PlatformName)-Release\libbz2.lib exit 0
if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release
nmake /nologo /f makefile.msc lib
copy libbz2.lib $(PlatformName)-Release
nmake /nologo /f makefile.msc clean
" /> <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)
if exist $(PlatformName)-Release\libbz2.lib exit 0
if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release
nmake /nologo /f makefile.msc lib
copy libbz2.lib $(PlatformName)-Release
nmake /nologo /f makefile.msc clean
" /> <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)
if exist $(PlatformName)-Release\libbz2.lib exit 0
if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release
nmake /nologo /f makefile.msc lib
copy libbz2.lib $(PlatformName)-Release
nmake /nologo /f makefile.msc clean
" /> <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)
if exist $(PlatformName)-Release\libbz2.lib exit 0
if not exist $(PlatformName)-Release mkdir $(PlatformName)-Release
nmake /nologo /f makefile.msc lib
copy libbz2.lib $(PlatformName)-Release
nmake /nologo /f makefile.msc clean
" /> <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> |