From 3bd54b792080ff7599a319f4ebe8932232d8f24f Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Tue, 12 May 2015 17:08:27 +0800 Subject: [PATCH] Ship with vc++ redist files --- atom.gyp | 3 +++ script/create-dist.py | 3 +++ script/update-external-binaries.py | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/atom.gyp b/atom.gyp index 5169fda640e9..8e05a0d007d7 100644 --- a/atom.gyp +++ b/atom.gyp @@ -142,6 +142,9 @@ '<(libchromiumcontent_dir)/snapshot_blob.bin', 'external_binaries/d3dcompiler_47.dll', 'external_binaries/xinput1_3.dll', + 'external_binaries/msvcp120.dll', + 'external_binaries/msvcr120.dll', + 'external_binaries/vccorlib120.dll', ], }, { diff --git a/script/create-dist.py b/script/create-dist.py index 7a5b75b07b7b..6a6fa0d1a34b 100755 --- a/script/create-dist.py +++ b/script/create-dist.py @@ -35,12 +35,15 @@ TARGET_BINARIES = { 'icudtl.dat', 'libEGL.dll', 'libGLESv2.dll', + 'msvcp120.dll', + 'msvcr120.dll', 'node.dll', 'content_resources_200_percent.pak', 'ui_resources_200_percent.pak', 'xinput1_3.dll', 'natives_blob.bin', 'snapshot_blob.bin', + 'vccorlib120.dll', ], 'linux': [ PROJECT_NAME, # 'electron' diff --git a/script/update-external-binaries.py b/script/update-external-binaries.py index 0df5fcc03976..49e73435ab51 100755 --- a/script/update-external-binaries.py +++ b/script/update-external-binaries.py @@ -8,7 +8,7 @@ from lib.config import get_target_arch from lib.util import safe_mkdir, rm_rf, extract_zip, tempdir, download -VERSION = 'v0.6.0' +VERSION = 'v0.7.0' SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) FRAMEWORKS_URL = 'http://github.com/atom/atom-shell-frameworks/releases' \ '/download/' + VERSION @@ -30,6 +30,7 @@ def main(): download_and_unzip('Squirrel') elif sys.platform in ['cygwin', 'win32']: download_and_unzip('directxsdk-' + get_target_arch()) + download_and_unzip('vs2012-crt-' + get_target_arch()) with open(version_file, 'w') as f: f.write(VERSION)