| 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') | 5 Import('env') |
| 6 | 6 |
| 7 env = env.Clone() | 7 env = env.Clone() |
| 8 | 8 |
| 9 env.ApplySConscript([ | 9 env.ApplySConscript([ |
| 10 '$GTEST_DIR/../using_gtest.scons', | 10 '$GTEST_DIR/../using_gtest.scons', |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 '/DYNAMICBASE:NO', | 68 '/DYNAMICBASE:NO', |
| 69 | 69 |
| 70 '/PDB:${TARGETS[1]}', | 70 '/PDB:${TARGETS[1]}', |
| 71 #'/MAP:${TARGETS[2]}', | 71 #'/MAP:${TARGETS[2]}', |
| 72 ], | 72 ], |
| 73 LIBS = [ | 73 LIBS = [ |
| 74 'shlwapi', | 74 'shlwapi', |
| 75 ], | 75 ], |
| 76 ) | 76 ) |
| 77 | 77 |
| 78 input_files = [ | 78 input_files = ChromeFileList([ |
| 79 "mini_installer.cc", | 79 # TODO(sgk): violate standard indentation so we don't have to |
| 80 "pe_resource.cc", | 80 # reindent too much when we remove the explicit MSVSFilter() calls |
| 81 ] | 81 # in favor of generating the hierarchy to reflect the file system. |
| 82 MSVSFilter('resources', [ |
| 83 'mini_installer.ico', |
| 84 'mini_installer.rc', |
| 85 'mini_installer_exe_version.rc.version', |
| 86 'mini_installer_resource.h', |
| 87 ]), |
| 88 'chrome.release', |
| 89 'mini_installer.cc', |
| 90 'mini_installer.h', |
| 91 'pe_resource.cc', |
| 92 'pe_resource.h', |
| 93 ]) |
| 82 | 94 |
| 83 if env.Bit('windows'): | 95 if env.Bit('windows'): |
| 84 input_files.extend([ | 96 additional_dependencies = [ |
| 85 "$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/memset.obj", | 97 "$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/memset.obj", |
| 86 "$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/P4_memset.obj", | 98 "$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/P4_memset.obj", |
| 87 ]) | 99 ] |
| 88 input_files.extend(resources) | |
| 89 | 100 |
| 90 # TODO(port): | 101 # TODO(port): |
| 91 if env.Bit('windows'): | 102 if env.Bit('windows'): |
| 92 env.ChromeProgram('mini_installer', input_files) | 103 env.ChromeProgram('mini_installer', |
| 104 input_files + additional_dependencies + resources) |
| 93 | 105 |
| 94 | 106 |
| 95 env.AppendENVPath('PATH', r'C:\WINDOWS\system32') | 107 env.AppendENVPath('PATH', r'C:\WINDOWS\system32') |
| 96 | 108 |
| 97 # TODO(port): | 109 # TODO(port): |
| 98 if env.Bit('windows'): | 110 if env.Bit('windows'): |
| 99 packed = env.Command('$DESTINATION_ROOT/packed_files.txt', | 111 packed = env.Command('$DESTINATION_ROOT/packed_files.txt', |
| 100 ['$CHROME_DIR/tools/build/win/create_installer_archive.py
', | 112 [('$CHROME_DIR/tools/' |
| 113 + 'build/win/create_installer_archive.py'), |
| 101 '$CHROME_DIR/installer/mini_installer/chrome.release'], | 114 '$CHROME_DIR/installer/mini_installer/chrome.release'], |
| 102 ('$PYTHON ${SOURCES[0]}' | 115 ('$PYTHON ${SOURCES[0]}' |
| 103 ' --output_dir=${TARGET.dir}' | 116 ' --output_dir=${TARGET.dir}' |
| 104 ' --input_file=${SOURCES[1]}')) | 117 ' --input_file=${SOURCES[1]}')) |
| 105 env.Depends(packed, '$DESTINATION_ROOT/setup.exe') | 118 env.Depends(packed, '$DESTINATION_ROOT/setup.exe') |
| 106 | 119 |
| 107 # mini_installer.rc depends on the generated packed_files.txt | 120 # mini_installer.rc depends on the generated packed_files.txt |
| 108 # TODO(sgk): implicit dependency should be picked up automatically | 121 # TODO(sgk): implicit dependency should be picked up automatically |
| 109 env.Depends(resources, packed) | 122 env.Depends(resources, packed) |
| 110 | 123 |
| 111 | 124 |
| 112 # TODO(port): | 125 # TODO(port): |
| 113 if env.Bit('windows'): | 126 if env.Bit('windows'): |
| 114 exe_version_rc = env.ChromeVersionRC('mini_installer_exe_version.rc', | 127 exe_version_rc = env.ChromeVersionRC('mini_installer_exe_version.rc', |
| 115 'mini_installer_exe_version.rc.version', | 128 'mini_installer_exe_version.rc.version', |
| 116 PWD=Dir('.')) | 129 PWD=Dir('.')) |
| 117 | 130 |
| 118 # TODO(sgk): implicit dependency should be picked up automatically | 131 # TODO(sgk): implicit dependency should be picked up automatically |
| 119 env_res.Depends(resources, exe_version_rc) | 132 env_res.Depends(resources, exe_version_rc) |
| 120 | 133 |
| 121 env.ChromeMSVSProject('$CHROME_DIR/installer/mini_installer/mini_installer.vcpro
j', | 134 p = env.ChromeMSVSProject('mini_installer.vcproj', |
| 122 dependencies = [ | 135 dest=('$CHROME_SRC_DIR/chrome/installer/' |
| 123 '$CHROME_DIR/app/locales/et.vcproj', | 136 + 'mini_installer/mini_installer.vcproj'), |
| 124 '$CHROME_DIR/app/locales/pt-PT.vcproj', | 137 guid='{24A5AC7C-280B-4899-9153-6BA570A081E7}', |
| 125 '$CHROME_DIR/app/locales/fr.vcproj', | 138 keyword='Win32Proj', |
| 126 '$CHROME_DIR/app/locales/uk.vcproj', | 139 dependencies = [ |
| 127 '$CHROME_DIR/installer/setup/setup.vcproj', | 140 '$CHROME_DIR/app/locales/et.vcproj', |
| 128 '$CHROME_DIR/app/locales/th.vcproj', | 141 '$CHROME_DIR/app/locales/pt-PT.vcproj', |
| 129 '$CHROME_DIR/app/locales/hi.vcproj', | 142 '$CHROME_DIR/app/locales/fr.vcproj', |
| 130 '$CHROME_DIR/app/locales/gu.vcproj', | 143 '$CHROME_DIR/app/locales/uk.vcproj', |
| 131 '$CHROME_DIR/app/locales/it.vcproj', | 144 '$CHROME_DIR/installer/setup/setup.vcproj', |
| 132 '$CHROME_DIR/app/locales/pt-BR.vcproj', | 145 '$CHROME_DIR/app/locales/th.vcproj', |
| 133 '$CHROME_DIR/app/locales/sr.vcproj', | 146 '$CHROME_DIR/app/locales/hi.vcproj', |
| 134 '$CHROME_DIR/app/locales/ko.vcproj', | 147 '$CHROME_DIR/app/locales/gu.vcproj', |
| 135 '$CHROME_DIR/app/locales/en-GB.vcproj', | 148 '$CHROME_DIR/app/locales/it.vcproj', |
| 136 '$CHROME_DIR/app/locales/fil.vcproj', | 149 '$CHROME_DIR/app/locales/pt-BR.vcproj', |
| 137 '$CHROME_DIR/app/locales/ar.vcproj', | 150 '$CHROME_DIR/app/locales/sr.vcproj', |
| 138 '$CHROME_DIR/app/locales/kn.vcproj', | 151 '$CHROME_DIR/app/locales/ko.vcproj', |
| 139 '$CHROME_DIR/app/locales/bn.vcproj', | 152 '$CHROME_DIR/app/locales/en-GB.vcproj', |
| 140 '$CHROME_DIR/app/locales/es.vcproj', | 153 '$CHROME_DIR/app/locales/fil.vcproj', |
| 141 '$CHROME_DIR/app/locales/bg.vcproj', | 154 '$CHROME_DIR/app/locales/ar.vcproj', |
| 142 '$CHROME_DIR/app/locales/nl.vcproj', | 155 '$CHROME_DIR/app/locales/kn.vcproj', |
| 143 '$CHROME_DIR/app/locales/fi.vcproj', | 156 '$CHROME_DIR/app/locales/bn.vcproj', |
| 144 '$CHROME_DIR/app/locales/tr.vcproj', | 157 '$CHROME_DIR/app/locales/es.vcproj', |
| 145 '$CHROME_DIR/app/locales/ta.vcproj', | 158 '$CHROME_DIR/app/locales/bg.vcproj', |
| 146 '$CHROME_DIR/app/chrome_exe.vcproj', | 159 '$CHROME_DIR/app/locales/nl.vcproj', |
| 147 '$CHROME_DIR/app/locales/ru.vcproj', | 160 '$CHROME_DIR/app/locales/fi.vcproj', |
| 148 '$CHROME_DIR/app/locales/cs.vcproj', | 161 '$CHROME_DIR/app/locales/tr.vcproj', |
| 149 '$CHROME_DIR/app/locales/lt.vcproj', | 162 '$CHROME_DIR/app/locales/ta.vcproj', |
| 150 '$CHROME_DIR/app/locales/sk.vcproj', | 163 '$CHROME_DIR/app/chrome_exe.vcproj', |
| 151 ('$CHROME_DIR/tools/crash_service/' + | 164 '$CHROME_DIR/app/locales/ru.vcproj', |
| 152 'crash_service.vcproj'), | 165 '$CHROME_DIR/app/locales/cs.vcproj', |
| 153 '$CHROME_DIR/app/locales/te.vcproj', | 166 '$CHROME_DIR/app/locales/lt.vcproj', |
| 154 '$CHROME_DIR/app/locales/pl.vcproj', | 167 '$CHROME_DIR/app/locales/sk.vcproj', |
| 155 '$ICU38_DIR/build/icudt.vcproj', | 168 ('$CHROME_DIR/tools/crash_service/' + |
| 156 '$CHROME_DIR/app/locales/he.vcproj', | 169 'crash_service.vcproj'), |
| 157 '$CHROME_DIR/app/locales/mr.vcproj', | 170 '$CHROME_DIR/app/locales/te.vcproj', |
| 158 '$CHROME_DIR/app/locales/da.vcproj', | 171 '$CHROME_DIR/app/locales/pl.vcproj', |
| 159 '$CHROME_DIR/app/locales/lv.vcproj', | 172 '$ICU38_DIR/build/icudt.vcproj', |
| 160 '$CHROME_DIR/app/locales/hu.vcproj', | 173 '$CHROME_DIR/app/locales/he.vcproj', |
| 161 '$CHROME_DIR/app/locales/sv.vcproj', | 174 '$CHROME_DIR/app/locales/mr.vcproj', |
| 162 '$CHROME_DIR/app/locales/ja.vcproj', | 175 '$CHROME_DIR/app/locales/da.vcproj', |
| 163 '$CHROME_DIR/app/locales/nb.vcproj', | 176 '$CHROME_DIR/app/locales/lv.vcproj', |
| 164 '$CHROME_DIR/app/locales/de.vcproj', | 177 '$CHROME_DIR/app/locales/hu.vcproj', |
| 165 '$RLZ_DIR/rlz.vcproj', | 178 '$CHROME_DIR/app/locales/sv.vcproj', |
| 166 '$CHROME_DIR/app/chrome_dll.vcproj', | 179 '$CHROME_DIR/app/locales/ja.vcproj', |
| 167 '$CHROME_DIR/app/locales/zh-CN.vcproj', | 180 '$CHROME_DIR/app/locales/nb.vcproj', |
| 168 '$CHROME_DIR/app/locales/sl.vcproj', | 181 '$CHROME_DIR/app/locales/de.vcproj', |
| 169 '$CHROME_DIR/app/locales/ro.vcproj', | 182 '$RLZ_DIR/rlz.vcproj', |
| 170 '$CHROME_DIR/app/locales/ml.vcproj', | 183 '$CHROME_DIR/app/chrome_dll.vcproj', |
| 171 '$CHROME_DIR/app/locales/en-US.vcproj', | 184 '$CHROME_DIR/app/locales/zh-CN.vcproj', |
| 172 '$CHROME_DIR/app/locales/hr.vcproj', | 185 '$CHROME_DIR/app/locales/sl.vcproj', |
| 173 '$CHROME_DIR/app/locales/el.vcproj', | 186 '$CHROME_DIR/app/locales/ro.vcproj', |
| 174 '$CHROME_DIR/app/locales/vi.vcproj', | 187 '$CHROME_DIR/app/locales/ml.vcproj', |
| 175 '$CHROME_DIR/app/locales/or.vcproj', | 188 '$CHROME_DIR/app/locales/en-US.vcproj', |
| 176 '$BSDIFF_DIR/bsdiff.vcproj', | 189 '$CHROME_DIR/app/locales/hr.vcproj', |
| 177 '$CHROME_DIR/app/locales/id.vcproj', | 190 '$CHROME_DIR/app/locales/el.vcproj', |
| 178 '$CHROME_DIR/app/locales/zh-TW.vcproj', | 191 '$CHROME_DIR/app/locales/vi.vcproj', |
| 179 '$CHROME_DIR/app/locales/ca.vcproj', | 192 '$CHROME_DIR/app/locales/or.vcproj', |
| 180 '$CHROME_DIR/app/locales/es-419.vcproj', | 193 '$BSDIFF_DIR/bsdiff.vcproj', |
| 181 '$CHROME_DIR/app/theme/theme_dll.vcproj', | 194 '$CHROME_DIR/app/locales/id.vcproj', |
| 182 ], | 195 '$CHROME_DIR/app/locales/zh-TW.vcproj', |
| 183 guid='{24A5AC7C-280B-4899-9153-6BA570A081E7}') | 196 '$CHROME_DIR/app/locales/ca.vcproj', |
| 197 '$CHROME_DIR/app/locales/es-419.vcproj', |
| 198 '$CHROME_DIR/app/theme/theme_dll.vcproj', |
| 199 ], |
| 200 # TODO(sgk): when we can intuit the hierarchy |
| 201 # from the built targets. |
| 202 #buildtargets=TODO, |
| 203 files=input_files, |
| 204 relative_path_prefix='./', |
| 205 tools=[ |
| 206 MSVSTool('create installer archive', |
| 207 LastChromeInstaller='$(LAST_CHROME_INSTALLER)', |
| 208 LastChromeVersion='$(LAST_CHROME_VERSION)', |
| 209 SkipRebuildArchive='$(SKIP_REBUILD_CHROME_ARCHIVE)' |
| 210 ), |
| 211 'Version', |
| 212 'VCCLCompilerTool', |
| 213 'VCResourceCompilerTool', |
| 214 'VCLinkerTool', |
| 215 'VCManifestTool', |
| 216 ], |
| 217 ConfigurationType='1') |
| 218 |
| 219 p.AddToolFile('$CHROME_DIR/tools/build/win/release.rules') |
| 220 p.AddToolFile('$CHROME_DIR/tools/build/win/version.rules') |
| 221 |
| 222 p.AddConfig('Debug|Win32', |
| 223 InheritedPropertySheets=[ |
| 224 './mini_installer_debug.vsprops', |
| 225 '$(SolutionDir)../testing/using_gtest.vsprops', |
| 226 ]) |
| 227 |
| 228 p.AddConfig('Release|Win32', |
| 229 InheritedPropertySheets=[ |
| 230 './mini_installer_release.vsprops', |
| 231 '$(SolutionDir)../testing/using_gtest.vsprops', |
| 232 ]) |
| OLD | NEW |