Index: chrome/tools/build/win/create_installer_archive.py |
diff --git a/chrome/tools/build/win/create_installer_archive.py b/chrome/tools/build/win/create_installer_archive.py |
index 8675f17308fa6a3dc83f0b8dd2d0a4c32ac32184..44e112f8b900fa87e129e3b63ab9ade611e2559f 100755 |
--- a/chrome/tools/build/win/create_installer_archive.py |
+++ b/chrome/tools/build/win/create_installer_archive.py |
@@ -327,6 +327,23 @@ def DoComponentBuildTasks(staging_dir, build_dir, current_version): |
if not os.path.exists(installer_dir): |
os.mkdir(installer_dir) |
+ # Copy the VS2010 CRT DLLs to |build_dir|. |
+ crt_dlls = [] |
+ if build_dir.endswith('Debug/'): |
+ crt_dlls = glob.glob( |
+ "C:/Program Files (x86)/Microsoft Visual Studio 10.0/VC/redist/" |
+ "Debug_NonRedist/x86/Microsoft.*.DebugCRT/*.dll") |
+ elif build_dir.endswith('Release/'): |
+ crt_dlls = glob.glob( |
+ "C:/Program Files (x86)/Microsoft Visual Studio 10.0/VC/redist/x86/" |
+ "Microsoft.*.CRT/*.dll") |
+ else: |
+ print ("Warning: CRT DLLs not copied, could not determine build " |
+ "configuration from output directory.") |
+ |
+ for dll in crt_dlls: |
+ shutil.copy(dll, build_dir) |
+ |
# Copy all the DLLs in |build_dir| to the version directory. |
dlls = glob.glob(os.path.join(build_dir, '*.dll')) |
for dll in dlls: |
@@ -511,6 +528,8 @@ def _ParseOptions(): |
options, args = parser.parse_args() |
if not options.build_dir: |
parser.error('You must provide a build dir.') |
+ elif not options.build_dir.endswith('/'): |
gab
2012/05/15 23:02:19
The way create_installer_archive is currently bein
|
+ options.build_dir += '/' |
if not options.staging_dir: |
parser.error('You must provide a staging dir.') |