From 18e7450c31c39aec9581d10f79eb56c78957bcd5 Mon Sep 17 00:00:00 2001 From: "mseaborn@chromium.org" Date: Tue, 10 May 2011 18:45:25 +0000 Subject: NaCl: Add the integrated runtime (IRT) library to Windows install images The dependencies in mini_installer.gyp should be OK, because the target that produces chrome.exe also copies nacl_irt_* into <(PRODUCT_DIR) as a side effect. BUG=http://code.google.com/p/nativeclient/issues/detail?id=1595 TEST=not sure how to test this, apart from manually testing the install images that are produced after this is committed Review URL: http://codereview.chromium.org/6995015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84826 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/installer/mini_installer.gyp | 2 ++ chrome/installer/mini_installer/chrome.release | 2 ++ chrome/tools/build/win/FILES | 2 ++ chrome/tools/build/win/FILES.cfg | 14 ++++++++++++++ 4 files changed, 20 insertions(+) diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp index a531e90..0e893b8 100644 --- a/chrome/installer/mini_installer.gyp +++ b/chrome/installer/mini_installer.gyp @@ -189,6 +189,8 @@ '<(PRODUCT_DIR)/nacl64.exe', '<(PRODUCT_DIR)/nacl64.dll', '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', + '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', + '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', '<(PRODUCT_DIR)/locales/en-US.dll', '<(PRODUCT_DIR)/icudt.dll', ], diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release index 328032e..1457df1 100644 --- a/chrome/installer/mini_installer/chrome.release +++ b/chrome/installer/mini_installer/chrome.release @@ -35,6 +35,8 @@ chrome.dll: %(VersionDir)s\ nacl64.exe: %(VersionDir)s\ nacl64.dll: %(VersionDir)s\ ppGoogleNaClPluginChrome.dll: %(VersionDir)s\ +nacl_irt_x86_32.nexe: %(VersionDir)s\ +nacl_irt_x86_64.nexe: %(VersionDir)s\ icudt.dll: %(VersionDir)s\ resources.pak: %(VersionDir)s\ locales\*.dll: %(VersionDir)s\Locales diff --git a/chrome/tools/build/win/FILES b/chrome/tools/build/win/FILES index 6c9e1cb..0ecbdfb 100644 --- a/chrome/tools/build/win/FILES +++ b/chrome/tools/build/win/FILES @@ -8,6 +8,8 @@ nacl64.dll crash_service.exe First Run ppGoogleNaClPluginChrome.dll +nacl_irt_x86_32.nexe +nacl_irt_x86_64.nexe icudt.dll locales/ar.dll locales/bg.dll diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg index 8d9a025..5736c14 100644 --- a/chrome/tools/build/win/FILES.cfg +++ b/chrome/tools/build/win/FILES.cfg @@ -363,9 +363,23 @@ FILES = [ 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, + # Native Client plugin files: { 'filename': 'ppGoogleNaClPluginChrome.dll', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, + # Windows Chrome does not have separate x86-32 and x86-64 installs. + # A single install supports both x86-32 and x86-64 versions of NaCl, + # so the 'arch' field does not seem to make much sense in this case. + { + 'filename': 'nacl_irt_x86_32.nexe', + 'arch': ['32bit', '64bit'], + 'buildtype': ['dev', 'official'], + }, + { + 'filename': 'nacl_irt_x86_64.nexe', + 'arch': ['32bit', '64bit'], + 'buildtype': ['dev', 'official'], + }, ] -- cgit v1.1