Ship VS2012 redist DLLs.

Atom Shell has been built with VS2013 so we should not ship VS2010's DLLs.
This commit is contained in:
Cheng Zhao 2014-07-31 14:12:01 +08:00
parent 4a7e98e398
commit 546e4e431d
5 changed files with 13 additions and 6 deletions

View file

@ -379,9 +379,10 @@
'<(libchromiumcontent_resources_dir)/ui_resources_200_percent.pak', '<(libchromiumcontent_resources_dir)/ui_resources_200_percent.pak',
'<(libchromiumcontent_resources_dir)/webkit_resources_200_percent.pak', '<(libchromiumcontent_resources_dir)/webkit_resources_200_percent.pak',
'external_binaries/d3dcompiler_43.dll', 'external_binaries/d3dcompiler_43.dll',
'external_binaries/msvcp120.dll',
'external_binaries/msvcr120.dll',
'external_binaries/vccorlib120.dll',
'external_binaries/xinput1_3.dll', 'external_binaries/xinput1_3.dll',
'vendor/third_party/microsoft/msvcp100.dll',
'vendor/third_party/microsoft/msvcr100.dll',
], ],
}, },
{ {

View file

@ -36,12 +36,15 @@ TARGET_BINARIES = {
'atom.exe', 'atom.exe',
'chromiumcontent.dll', 'chromiumcontent.dll',
'content_shell.pak', 'content_shell.pak',
'd3dcompiler_43.dll',
'ffmpegsumo.dll', 'ffmpegsumo.dll',
'icudtl.dat', 'icudtl.dat',
'libEGL.dll', 'libEGL.dll',
'libGLESv2.dll', 'libGLESv2.dll',
'd3dcompiler_43.dll', 'msvcp120.dll',
'msvcr120.dll',
'ui_resources_200_percent.pak', 'ui_resources_200_percent.pak',
'vccorlib120.dll',
'webkit_resources_200_percent.pak', 'webkit_resources_200_percent.pak',
'xinput1_3.dll', 'xinput1_3.dll',
], ],

View file

@ -4,10 +4,10 @@ import errno
import sys import sys
import os import os
from lib.util import safe_mkdir, extract_zip, tempdir, download from lib.util import safe_mkdir, rm_rf, extract_zip, tempdir, download
VERSION = 'v0.0.3' VERSION = 'v0.1.0'
SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
FRAMEWORKS_URL = 'https://github.com/atom/atom-shell-frameworks/releases' \ FRAMEWORKS_URL = 'https://github.com/atom/atom-shell-frameworks/releases' \
'/download/' + VERSION '/download/' + VERSION
@ -17,10 +17,12 @@ def main():
os.chdir(SOURCE_ROOT) os.chdir(SOURCE_ROOT)
version_file = os.path.join(SOURCE_ROOT, 'external_binaries', '.version') version_file = os.path.join(SOURCE_ROOT, 'external_binaries', '.version')
safe_mkdir('external_binaries')
if (is_updated(version_file, VERSION)): if (is_updated(version_file, VERSION)):
return return
rm_rf('external_binaries')
safe_mkdir('external_binaries')
with open(version_file, 'w') as f: with open(version_file, 'w') as f:
f.write(VERSION) f.write(VERSION)
@ -30,6 +32,7 @@ def main():
download_and_unzip('Squirrel') download_and_unzip('Squirrel')
elif sys.platform in ['cygwin', 'win32']: elif sys.platform in ['cygwin', 'win32']:
download_and_unzip('directxsdk') download_and_unzip('directxsdk')
download_and_unzip('vs2012_crt')
def is_updated(version_file, version): def is_updated(version_file, version):

Binary file not shown.

Binary file not shown.