| OLD | NEW |
| 1 { | 1 { |
| 2 'variables': { | 2 'variables': { |
| 3 'version_py': '<(DEPTH)/build/util/version.py', | 3 'version_py': '<(DEPTH)/build/util/version.py', |
| 4 'version_path': '../../chrome/VERSION', | 4 'version_path': '../../chrome/VERSION', |
| 5 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE', | 5 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE', |
| 6 # 'branding_dir' is set in the 'conditions' section at the bottom. | 6 # 'branding_dir' is set in the 'conditions' section at the bottom. |
| 7 'msvs_use_common_release': 0, | 7 'msvs_use_common_release': 0, |
| 8 'msvs_use_common_linker_extras': 0, | 8 'msvs_use_common_linker_extras': 0, |
| 9 'mini_installer_internal_deps%': 0, | 9 'mini_installer_internal_deps%': 0, |
| 10 'mini_installer_official_deps%': 0, | 10 'mini_installer_official_deps%': 0, |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 'python', '<(version_py)', | 159 'python', '<(version_py)', |
| 160 '-f', '<(version_path)', | 160 '-f', '<(version_path)', |
| 161 '-f', '<(lastchange_path)', | 161 '-f', '<(lastchange_path)', |
| 162 '-f', '<(branding_dir)/BRANDING', | 162 '-f', '<(branding_dir)/BRANDING', |
| 163 '<(template_input_path)', | 163 '<(template_input_path)', |
| 164 '<@(_outputs)', | 164 '<@(_outputs)', |
| 165 ], | 165 ], |
| 166 'process_outputs_as_sources': 1, | 166 'process_outputs_as_sources': 1, |
| 167 'message': 'Generating version information' | 167 'message': 'Generating version information' |
| 168 }, | 168 }, |
| 169 ], |
| 170 'actions': [ |
| 169 { | 171 { |
| 170 'rule_name': 'installer_archive', | 172 'action_name': 'installer_archive', |
| 171 'extension': 'release', | |
| 172 'variables': { | 173 'variables': { |
| 173 'create_installer_archive_py_path': | 174 'create_installer_archive_py_path': |
| 174 '../tools/build/win/create_installer_archive.py', | 175 '../tools/build/win/create_installer_archive.py', |
| 175 }, | 176 }, |
| 176 'conditions': [ | 177 'conditions': [ |
| 177 ['enable_hidpi == 1', { | 178 ['enable_hidpi == 1', { |
| 178 'variables': { | 179 'variables': { |
| 179 'enable_hidpi_flag': '--enable_hidpi=1', | 180 'enable_hidpi_flag': '--enable_hidpi=1', |
| 180 }, | 181 }, |
| 181 }, { | 182 }, { |
| 182 'variables': { | 183 'variables': { |
| 183 'enable_hidpi_flag': '', | 184 'enable_hidpi_flag': '', |
| 184 }, | 185 }, |
| 185 }], | 186 }], |
| 186 ['component == "shared_library"', { | 187 ['component == "shared_library"', { |
| 187 'variables': { | 188 'variables': { |
| 188 'component_build_flag': '--component_build=1', | 189 'component_build_flag': '--component_build=1', |
| 189 }, | 190 }, |
| 190 }, { | 191 }, { |
| 191 'variables': { | 192 'variables': { |
| 192 'component_build_flag': '', | 193 'component_build_flag': '', |
| 193 }, | 194 }, |
| 194 'outputs': [ | 195 'outputs': [ |
| 195 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).packed.7z', | 196 '<(PRODUCT_DIR)/chrome.packed.7z', |
| 196 ], | 197 ], |
| 197 }], | 198 }], |
| 198 ['disable_nacl==1', { | 199 ['disable_nacl==1', { |
| 199 'inputs!': [ | 200 'inputs!': [ |
| 200 '<(PRODUCT_DIR)/nacl64.exe', | 201 '<(PRODUCT_DIR)/nacl64.exe', |
| 201 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', | 202 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', |
| 202 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', | 203 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', |
| 203 ], | 204 ], |
| 204 }], | 205 }], |
| 205 ['target_arch=="x64"', { | 206 ['target_arch=="x64"', { |
| (...skipping 26 matching lines...) Expand all Loading... |
| 232 }], | 233 }], |
| 233 ], | 234 ], |
| 234 'inputs': [ | 235 'inputs': [ |
| 235 '<(create_installer_archive_py_path)', | 236 '<(create_installer_archive_py_path)', |
| 236 '<(PRODUCT_DIR)/chrome.exe', | 237 '<(PRODUCT_DIR)/chrome.exe', |
| 237 '<(PRODUCT_DIR)/chrome.dll', | 238 '<(PRODUCT_DIR)/chrome.dll', |
| 238 '<(PRODUCT_DIR)/nacl64.exe', | 239 '<(PRODUCT_DIR)/nacl64.exe', |
| 239 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', | 240 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', |
| 240 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', | 241 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', |
| 241 '<(PRODUCT_DIR)/locales/en-US.pak', | 242 '<(PRODUCT_DIR)/locales/en-US.pak', |
| 243 'mini_installer/chrome.release', |
| 242 ], | 244 ], |
| 243 'outputs': [ | 245 'outputs': [ |
| 244 # Also note that chrome.packed.7z is defined as an output in a | 246 # Also note that chrome.packed.7z is defined as an output in a |
| 245 # conditional above. | 247 # conditional above. |
| 246 'xxx2.out', | 248 '<(PRODUCT_DIR)/chrome.7z', |
| 247 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z', | |
| 248 '<(PRODUCT_DIR)/setup.ex_', | 249 '<(PRODUCT_DIR)/setup.ex_', |
| 249 '<(INTERMEDIATE_DIR)/packed_files.rc', | 250 '<(INTERMEDIATE_DIR)/packed_files.rc', |
| 250 ], | 251 ], |
| 252 'depfile': '<(INTERMEDIATE_DIR)/installer_archive.d', |
| 251 'action': [ | 253 'action': [ |
| 252 'python', | 254 'python', |
| 253 '<(create_installer_archive_py_path)', | 255 '<(create_installer_archive_py_path)', |
| 254 '--build_dir', '<(PRODUCT_DIR)', | 256 '--build_dir', '<(PRODUCT_DIR)', |
| 255 '--staging_dir', '<(INTERMEDIATE_DIR)', | 257 '--staging_dir', '<(INTERMEDIATE_DIR)', |
| 256 '--input_file', '<(RULE_INPUT_PATH)', | 258 '--input_file', 'mini_installer/chrome.release', |
| 257 '--resource_file_path', '<(INTERMEDIATE_DIR)/packed_files.rc', | 259 '--resource_file_path', '<(INTERMEDIATE_DIR)/packed_files.rc', |
| 260 '--depfile', '<(INTERMEDIATE_DIR)/installer_archive.d', |
| 258 '<(enable_hidpi_flag)', | 261 '<(enable_hidpi_flag)', |
| 259 '<(component_build_flag)', | 262 '<(component_build_flag)', |
| 260 '<(target_arch_flag)', | 263 '<(target_arch_flag)', |
| 261 # TODO(sgk): may just use environment variables | 264 # TODO(sgk): may just use environment variables |
| 262 #'--distribution=$(CHROMIUM_BUILD)', | 265 #'--distribution=$(CHROMIUM_BUILD)', |
| 263 '--distribution=_google_chrome', | 266 '--distribution=_google_chrome', |
| 264 # Optional arguments to generate diff installer | 267 # Optional arguments to generate diff installer |
| 265 #'--last_chrome_installer=C:/Temp/base', | 268 #'--last_chrome_installer=C:/Temp/base', |
| 266 #'--setup_exe_format=DIFF', | 269 #'--setup_exe_format=DIFF', |
| 267 #'--diff_algorithm=COURGETTE', | 270 #'--diff_algorithm=COURGETTE', |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 313 'variables': { | 316 'variables': { |
| 314 'branding_dir': '../app/theme/google_chrome', | 317 'branding_dir': '../app/theme/google_chrome', |
| 315 }, | 318 }, |
| 316 }, { # else branding!="Chrome" | 319 }, { # else branding!="Chrome" |
| 317 'variables': { | 320 'variables': { |
| 318 'branding_dir': '../app/theme/chromium', | 321 'branding_dir': '../app/theme/chromium', |
| 319 }, | 322 }, |
| 320 }], | 323 }], |
| 321 ], | 324 ], |
| 322 } | 325 } |
| OLD | NEW |