fix python build with VC2012

Change-Id: Ibaec87c929889f0038b44aac1e07e2552adc5cc5

python/Python-2.6.1-vc12.patch

+--- misc/build/Python-2.6.1/PC/VS10.0/_msi.vcxproj.orig	2012-08-22 17:28:56.856166700 -0400
++++ misc/build/Python-2.6.1/PC/VS10.0/_msi.vcxproj	2012-08-22 17:29:12.226731500 -0400
+@@ -151,7 +151,7 @@
+   </PropertyGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+     <Link>
+-      <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+       <BaseAddress>0x1D160000</BaseAddress>
+     </Link>
+   </ItemDefinitionGroup>
+@@ -160,13 +160,13 @@
+       <TargetEnvironment>X64</TargetEnvironment>
+     </Midl>
+     <Link>
+-      <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+       <BaseAddress>0x1D160000</BaseAddress>
+     </Link>
+   </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+     <Link>
+-      <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+       <BaseAddress>0x1D160000</BaseAddress>
+     </Link>
+   </ItemDefinitionGroup>
+@@ -175,13 +175,13 @@
+       <TargetEnvironment>X64</TargetEnvironment>
+     </Midl>
+     <Link>
+-      <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+       <BaseAddress>0x1D160000</BaseAddress>
+     </Link>
+   </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
+     <Link>
+-      <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+       <BaseAddress>0x1D160000</BaseAddress>
+     </Link>
+   </ItemDefinitionGroup>
+@@ -190,14 +190,14 @@
+       <TargetEnvironment>X64</TargetEnvironment>
+     </Midl>
+     <Link>
+-      <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+       <BaseAddress>0x1D160000</BaseAddress>
+       <TargetMachine>MachineX64</TargetMachine>
+     </Link>
+   </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
+     <Link>
+-      <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+       <BaseAddress>0x1D160000</BaseAddress>
+     </Link>
+   </ItemDefinitionGroup>
+@@ -206,7 +206,7 @@
+       <TargetEnvironment>X64</TargetEnvironment>
+     </Midl>
+     <Link>
+-      <AdditionalDependencies>fci.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>cabinet.lib;msi.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+       <BaseAddress>0x1D160000</BaseAddress>
+       <TargetMachine>MachineX64</TargetMachine>
+     </Link>

python/makefile.mk

@@ -162,6 +162,7 @@ BUILD_ACTION=$(ENV_BUILD) make && make install
 
 .IF "$(CCNUMVER)" >= "001600000000"
 PATCH_FILES+=Python-$(PYVERSION)-vc10.patch
+PATCH_FILES+=Python-$(PYVERSION)-vc12.patch
 BUILD_DIR=PC/VS10.0
 .ELIF "$(CCNUMVER)" >= "001500000000"
 BUILD_DIR=PCbuild
@@ -188,7 +189,9 @@ CONF=Release
 # Build python executable and then runs a minimal script. Running the minimal script
 # ensures that certain *.pyc files are generated which would otherwise be created on
 # solver during registration in insetoo_native
-.IF "$(CCNUMVER)" >= "001600000000"
+.IF "$(CCNUMVER)" >= "001700000000"
+BUILD_ACTION=MSBuild.exe pcbuild.sln /t:Build /p:Configuration=$(CONF) /p:PlatformToolset=v110
+.ELIF "$(CCNUMVER)" >= "001600000000"
 BUILD_ACTION=MSBuild.exe pcbuild.sln /t:Build /p:Configuration=$(CONF) /ToolsVersion:4.0
 .ELSE
 BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe pcbuild.sln "$(CONF)|$(ARCH)"