From: Martin v. Löwis <martin@v.loewis.de>
Date: Fri, 18 May 2012 13:34:22 +0000 (+0200)
Subject: merge 3.2
X-Git-Tag: v3.3.0a4~135
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f90311bfeb87b869d7db5ea852dbd594de3378e;p=python

merge 3.2
---

3f90311bfeb87b869d7db5ea852dbd594de3378e
diff --cc PC/VS9.0/pyproject.vsprops
index b3c1b4be82,6a94a6835b..fa3dad7468
--- a/PC/VS9.0/pyproject.vsprops
+++ b/PC/VS9.0/pyproject.vsprops
@@@ -56,13 -56,9 +56,13 @@@
  		Name="bz2Dir"
  		Value="$(externalsDir)\bzip2-1.0.6"
  	/>
 +	<UserMacro
 +		Name="lzmaDir"
 +		Value="$(externalsDir)\xz-5.0.3"
 +	/>
  	<UserMacro
  		Name="opensslDir"
- 		Value="$(externalsDir)\openssl-1.0.0a"
+ 		Value="$(externalsDir)\openssl-1.0.0j"
  	/>
  	<UserMacro
  		Name="tcltkDir"
diff --cc PCbuild/pyproject.props
index fbeb5ae812,0000000000..522ac88fa7
mode 100644,000000..100644
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@@ -1,96 -1,0 +1,96 @@@
 +<?xml version="1.0" encoding="utf-8"?>
 +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +  <PropertyGroup Label="UserMacros">
 +    <PyDllName>python33</PyDllName>
 +    <PythonExe>$(SolutionDir)\python.exe</PythonExe>
 +    <externalsDir>..\..</externalsDir>
 +    <sqlite3Dir>$(externalsDir)\sqlite-3.7.12</sqlite3Dir>
 +    <bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir>
 +    <lzmaDir>$(externalsDir)\xz-5.0.3</lzmaDir>
-     <opensslDir>$(externalsDir)\openssl-1.0.0a</opensslDir>
++    <opensslDir>$(externalsDir)\openssl-1.0.0j</opensslDir>
 +    <tcltkDir>$(externalsDir)\tcltk</tcltkDir>
 +    <tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir>
 +    <tcltkLib>$(tcltkDir)\lib\tcl85.lib;$(tcltkDir)\lib\tk85.lib</tcltkLib>
 +    <tcltkLibDebug>$(tcltkDir)\lib\tcl85g.lib;$(tcltkDir)\lib\tk85g.lib</tcltkLibDebug>
 +    <tcltk64Lib>$(tcltk64Dir)\lib\tcl85.lib;$(tcltk64Dir)\lib\tk85.lib</tcltk64Lib>
 +    <tcltk64LibDebug>$(tcltk64Dir)\lib\tcl85g.lib;$(tcltk64Dir)\lib\tk85g.lib</tcltk64LibDebug>
 +  </PropertyGroup>
 +  <PropertyGroup>
 +    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
 +    <OutDir>$(SolutionDir)\</OutDir>
 +    <IntDir>$(SolutionDir)$(PlatformName)-temp-$(Configuration)\$(ProjectName)\</IntDir>
 +    <LinkIncremental>false</LinkIncremental>
 +    <TargetExt>.dll</TargetExt>
 +  </PropertyGroup>
 +  <ItemDefinitionGroup>
 +    <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
 +      <IntrinsicFunctions>true</IntrinsicFunctions>
 +      <AdditionalIncludeDirectories>..\Include; ..\PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <StringPooling>true</StringPooling>
 +      <ExceptionHandling>
 +      </ExceptionHandling>
 +      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 +      <FunctionLevelLinking>true</FunctionLevelLinking>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <CompileAs>Default</CompileAs>
 +    </ClCompile>
 +    <Link>
 +      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 +      <SubSystem>Windows</SubSystem>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <DataExecutionPrevention>
 +      </DataExecutionPrevention>
 +      <TargetMachine>MachineX86</TargetMachine>
 +    </Link>
 +    <ResourceCompile>
 +      <AdditionalIncludeDirectories>..\PC;..\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +    </ResourceCompile>
 +  </ItemDefinitionGroup>
 +  <ItemGroup>
 +    <BuildMacro Include="PyDllName">
 +      <Value>$(PyDllName)</Value>
 +    </BuildMacro>
 +    <BuildMacro Include="PythonExe">
 +      <Value>$(PythonExe)</Value>
 +    </BuildMacro>
 +    <BuildMacro Include="externalsDir">
 +      <Value>$(externalsDir)</Value>
 +    </BuildMacro>
 +    <BuildMacro Include="sqlite3Dir">
 +      <Value>$(sqlite3Dir)</Value>
 +    </BuildMacro>
 +    <BuildMacro Include="bz2Dir">
 +      <Value>$(bz2Dir)</Value>
 +    </BuildMacro>
 +    <BuildMacro Include="lzmaDir">
 +      <Value>$(lzmaDir)</Value>
 +    </BuildMacro>
 +    <BuildMacro Include="opensslDir">
 +      <Value>$(opensslDir)</Value>
 +    </BuildMacro>
 +    <BuildMacro Include="tcltkDir">
 +      <Value>$(tcltkDir)</Value>
 +    </BuildMacro>
 +    <BuildMacro Include="tcltk64Dir">
 +      <Value>$(tcltk64Dir)</Value>
 +    </BuildMacro>
 +    <BuildMacro Include="tcltkLib">
 +      <Value>$(tcltkLib)</Value>
 +    </BuildMacro>
 +    <BuildMacro Include="tcltkLibDebug">
 +      <Value>$(tcltkLibDebug)</Value>
 +    </BuildMacro>
 +    <BuildMacro Include="tcltk64Lib">
 +      <Value>$(tcltk64Lib)</Value>
 +    </BuildMacro>
 +    <BuildMacro Include="tcltk64LibDebug">
 +      <Value>$(tcltk64LibDebug)</Value>
 +    </BuildMacro>
 +  </ItemGroup>
 +</Project>
diff --cc Tools/buildbot/external-common.bat
index 59b9696113,2165b8a1f0..39c316ad82
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@@ -14,8 -14,8 +14,8 @@@ cd .
  @rem if exist tk8.4.16 rd /s/q tk8.4.16
  @rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1
  @rem if exist db-4.4.20 rd /s/q db-4.4.20
- @rem if exist openssl-1.0.0a rd /s/q openssl-1.0.0a
+ @rem if exist openssl-1.0.0j rd /s/q openssl-1.0.0j
 -@rem if exist sqlite-3.7.4 rd /s/q sqlite-3.7.4    
 +@rem if exist sqlite-3.7.12 rd /s/q sqlite-3.7.12    
  
  @rem bzip
  if not exist bzip2-1.0.6 (
@@@ -24,22 -24,17 +24,22 @@@
  )
  
  @rem OpenSSL
- if not exist openssl-1.0.0a svn export http://svn.python.org/projects/external/openssl-1.0.0a
+ if not exist openssl-1.0.0j svn export http://svn.python.org/projects/external/openssl-1.0.0j
  
  @rem tcl/tk
 -if not exist tcl-8.5.9.0 (
 +if not exist tcl-8.5.11.0 (
     rd /s/q tcltk tcltk64
 -   svn export http://svn.python.org/projects/external/tcl-8.5.9.0
 +   svn export http://svn.python.org/projects/external/tcl-8.5.11.0
  )
 -if not exist tk-8.5.9.0 svn export http://svn.python.org/projects/external/tk-8.5.9.0
 +if not exist tk-8.5.11.0 svn export http://svn.python.org/projects/external/tk-8.5.11.0
  
  @rem sqlite3
 -if not exist sqlite-3.7.4 (
 -  rd /s/q sqlite-source-3.6.21
 -  svn export http://svn.python.org/projects/external/sqlite-3.7.4
 +if not exist sqlite-3.7.12 (
 +  rd /s/q sqlite-source-3.7.4
 +  svn export http://svn.python.org/projects/external/sqlite-3.7.12
 +)
 +
 +@rem lzma
 +if not exist xz-5.0.3 (
 +  svn export http://svn.python.org/projects/external/xz-5.0.3
  )