Added missing Visual C runtime DLLs.

cztomczak · cztomczak · commit 63ee3ba38d52 · 2012-12-02T18:42:02.000-08:00
diff --git a/cefpython/cef3/subprocess/subprocess.vcproj b/cefpython/cef3/subprocess/subprocess.vcproj
@@ -136,6 +136,7 @@
 				AdditionalDependencies="libcef.lib libcef_dll_wrapper.lib"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="../windows/setup/"
+				GenerateManifest="false"
 				ManifestFile="../windows/cefpython.pyd.manifest"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -148,6 +149,7 @@
 			/>
 			<Tool
 				Name="VCManifestTool"
+				AdditionalManifestFiles="../windows/cefpython.pyd.manifest"
 			/>
 			<Tool
 				Name="VCXDCMakeTool"
diff --git a/cefpython/cef3/windows/binaries/Microsoft.VC90.CRT.manifest b/cefpython/cef3/windows/binaries/Microsoft.VC90.CRT.manifest
@@ -0,0 +1,6 @@
+﻿<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+    <noInheritable></noInheritable>
+    <assemblyIdentity type="win32" name="Microsoft.VC90.CRT" version="9.0.30729.6161" processorArchitecture="x86" publicKeyToken="1fc8b3b9a1e18e3b"></assemblyIdentity>
+    <file name="msvcr90.dll" hashalg="SHA1" hash="7021457b391b35606e708c69987e4b6f606609ee"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>S83+LBs1RkUxSkzia1WysaAhLbk=</dsig:DigestValue></asmv2:hash></file> <file name="msvcp90.dll" hashalg="SHA1" hash="88549dd3ce8eaa62ca8aad0e96ddd9fec2203628"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>cKyCmIKF+fcGn6qaBhKuun+wAcQ=</dsig:DigestValue></asmv2:hash></file> <file name="msvcm90.dll" hashalg="SHA1" hash="65ef374affa5b48827e539b35b3275c201b41fc9"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>r+4y/NnOFgaANxNXoHL1jF95DUg=</dsig:DigestValue></asmv2:hash></file>
+</assembly>
diff --git a/cefpython/cef3/windows/binaries/debug.log b/cefpython/cef3/windows/binaries/debug.log
diff --git a/cefpython/cef3/windows/cefpython.pyd.manifest b/cefpython/cef3/windows/cefpython.pyd.manifest
@@ -9,7 +9,7 @@
   </trustInfo>
   <dependency>
     <dependentAssembly>
-      <assemblyIdentity type='win32' name='Microsoft.VC90.CRT' version='9.0.21022.8' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b' />
+      <assemblyIdentity type='win32' name='Microsoft.VC90.CRT' version='9.0.30729.6161' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b' />
     </dependentAssembly>
   </dependency>
 </assembly>
diff --git a/cefpython/cef3/windows/compile.bat b/cefpython/cef3/windows/compile.bat
@@ -25,7 +25,6 @@ ECHO ON
 for /R %~dp0setup\ %%f in (*.pyx) do @del "%%f"
 
 rmdir /S /Q "build\"
-
 @if %ERRORLEVEL% neq 0 pause
 @if %ERRORLEVEL% neq 0 exit
 
@@ -35,11 +34,15 @@ call "C:\Program Files\Microsoft SDKs\Windows\v6.0A\bin\mt.exe" -nologo -manifes
 @if %ERRORLEVEL% neq 0 exit
 
 move "cefpython_py%PYVERSION%.pyd" "../binaries/cefpython_py%PYVERSION%.pyd"
-
 @if %ERRORLEVEL% neq 0 pause
 @if %ERRORLEVEL% neq 0 exit
 
 cd ..
+
+copy "%~dp0..\subprocess\Release\subprocess.exe" "%~dp0binaries\subprocess.exe"
+@if %ERRORLEVEL% neq 0 pause
+@if %ERRORLEVEL% neq 0 exit
+
 cd binaries
 
 call python "example.py"
