| OLD | NEW |
| 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 Import('env', 'env_res', 'env_test') | 5 Import('env', 'env_res', 'env_test') |
| 6 | 6 |
| 7 | 7 |
| 8 env = env.Clone() | 8 env = env.Clone() |
| 9 | 9 |
| 10 env['LIBS'].remove('DelayImp.lib') | 10 env['LIBS'].remove('DelayImp.lib') |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 "$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/memset.obj", | 65 "$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/memset.obj", |
| 66 "$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/P4_memset.obj", | 66 "$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/P4_memset.obj", |
| 67 "$TARGET_ROOT/chrome_dll.lib", | 67 "$TARGET_ROOT/chrome_dll.lib", |
| 68 ] | 68 ] |
| 69 | 69 |
| 70 input_files = [ | 70 input_files = [ |
| 71 "mini_installer.cc", | 71 "mini_installer.cc", |
| 72 "pe_resource.cc", | 72 "pe_resource.cc", |
| 73 ] | 73 ] |
| 74 | 74 |
| 75 if env['PLATFORM'] == 'win32': | 75 exe = env.ChromeProgram('mini_installer', components + resources + input_files) |
| 76 targets = [ | |
| 77 'mini_installer.exe', | |
| 78 'mini_installer.pdb', | |
| 79 'mini_installer.map', | |
| 80 ] | |
| 81 else: | |
| 82 targets = ['mini_installer'] | |
| 83 | |
| 84 exe = env.ChromeProgram(targets, components + resources + input_files) | |
| 85 i = env.Install('$TARGET_ROOT', exe) | 76 i = env.Install('$TARGET_ROOT', exe) |
| 86 env.Alias('chrome', i) | 77 env.Alias('chrome', i) |
| 87 | 78 |
| 88 | 79 |
| 89 env.AppendENVPath('PATH', r'C:\WINDOWS\system32') | 80 env.AppendENVPath('PATH', r'C:\WINDOWS\system32') |
| 90 | 81 |
| 91 packed = env.Command('$TARGET_ROOT/packed_files.txt', | 82 packed = env.Command('$TARGET_ROOT/packed_files.txt', |
| 92 ['$CHROME_DIR/tools/build/win/create_installer_archive.py', | 83 ['$CHROME_DIR/tools/build/win/create_installer_archive.py', |
| 93 '$CHROME_DIR/installer/mini_installer/chrome.release'], | 84 '$CHROME_DIR/installer/mini_installer/chrome.release'], |
| 94 ('$PYTHON ${SOURCES[0]}' | 85 ('$PYTHON ${SOURCES[0]}' |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 | 149 |
| 159 libs = [ | 150 libs = [ |
| 160 '../util/util.lib', | 151 '../util/util.lib', |
| 161 ] | 152 ] |
| 162 | 153 |
| 163 exe = env_test.ChromeTestProgram('installer_unittests', input_files + libs) | 154 exe = env_test.ChromeTestProgram('installer_unittests', input_files + libs) |
| 164 i = env_test.Install('$TARGET_ROOT', exe) | 155 i = env_test.Install('$TARGET_ROOT', exe) |
| 165 | 156 |
| 166 env.Alias('chrome', i) | 157 env.Alias('chrome', i) |
| 167 | 158 |
| OLD | NEW |