{
'target_name': 'installer_util_strings',
'type': 'none',
- 'rules': [
+ 'actions': [
{
- 'rule_name': 'installer_util_strings',
- 'extension': 'grd',
+ 'action_name': 'installer_util_strings',
'variables': {
- 'create_string_rc_py' : 'installer/util/prebuild/create_string_rc.py',
+ 'create_string_rc_py': 'installer/util/prebuild/create_string_rc.py',
},
+ 'conditions': [
+ ['branding=="Chrome"', {
+ 'variables': {
+ 'brand_strings': 'google_chrome_strings',
+ },
+ }, {
+ 'variables': {
+ 'brand_strings': 'chromium_strings',
+ },
+ }],
+ ],
'inputs': [
'<(create_string_rc_py)',
- '<(RULE_INPUT_PATH)',
+ 'app/<(brand_strings).grd',
],
'outputs': [
- # Don't use <(RULE_INPUT_ROOT) to create the output file
- # name, because the base name of the input
- # (generated_resources.grd) doesn't match the generated file
- # (installer_util_strings.h).
'<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strings.h',
'<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strings.rc',
],
'action': ['python',
'<(create_string_rc_py)',
- '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings',
- '<(branding)',],
- 'message': 'Generating resources from <(RULE_INPUT_PATH)',
+ '-i', 'app/<(brand_strings).grd:resources',
+ '-n', 'installer_util_strings',
+ '-o', '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings',],
+ 'message': 'Generating installer_util_strings',
},
],
- 'sources': [
- 'app/chromium_strings.grd',
- ],
'direct_dependent_settings': {
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)/installer_util_strings',
],
},
'sources': [
+ '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strings.rc',
'installer/mini_installer/chrome.release',
'installer/setup/archive_patch_helper.cc',
'installer/setup/archive_patch_helper.h',
'installer/setup/uninstall.h',
],
'msvs_settings': {
+ 'VCCLCompilerTool': {
+ 'EnableEnhancedInstructionSet': '4', # NoExtensions
+ },
'VCLinkerTool': {
'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
},
'rule_name': 'setup_version',
'extension': 'version',
'variables': {
- 'version_py_path': '../chrome/tools/build/version.py',
+ 'version_py_path': '<(DEPTH)/build/util/version.py',
'template_input_path': 'installer/setup/setup_exe_version.rc.version',
},
'inputs': [
'process_outputs_as_sources': 1,
'message': 'Generating version information'
},
- {
- 'rule_name': 'server_dlls',
- 'extension': 'release',
- 'variables': {
- 'scan_server_dlls_py' : 'tools/build/win/scan_server_dlls.py',
- 'template_file': 'installer/mini_installer/chrome.release',
- },
- 'inputs': [
- '<(scan_server_dlls_py)',
- '<(template_file)'
- ],
- 'outputs': [
- '<(INTERMEDIATE_DIR)/registered_dlls.h',
- ],
- 'action': [
- 'python',
- '<(scan_server_dlls_py)',
- '--output_dir=<(PRODUCT_DIR)',
- '--input_file=<(RULE_INPUT_PATH)',
- '--header_output_dir=<(INTERMEDIATE_DIR)',
- # TODO(sgk): may just use environment variables
- #'--distribution=$(CHROMIUM_BUILD)',
- '--distribution=_google_chrome',
- ],
- },
],
'conditions': [
- ['component == "shared_library"', {
- 'variables': {
- 'win_use_external_manifest': 1,
- },
- }],
# TODO(mark): <(branding_dir) should be defined by the
# global condition block at the bottom of the file, but
# this doesn't work due to the following issue:
'installer/setup/setup_util_unittest.cc',
'installer/setup/setup_util_unittest.h',
],
- 'rules': [
- {
- 'rule_name': 'server_dlls', # Move to lib
- 'extension': 'release',
- 'variables': {
- 'scan_server_dlls_py' : 'tools/build/win/scan_server_dlls.py',
- 'template_file': 'installer/mini_installer/chrome.release',
- },
- 'inputs': [
- '<(scan_server_dlls_py)',
- '<(template_file)'
- ],
- 'outputs': [
- '<(INTERMEDIATE_DIR)/registered_dlls.h',
- ],
- 'action': [
- 'python',
- '<(scan_server_dlls_py)',
- '--output_dir=<(PRODUCT_DIR)',
- '--input_file=<(RULE_INPUT_PATH)',
- '--header_output_dir=<(INTERMEDIATE_DIR)',
- # TODO(sgk): may just use environment variables
- #'--distribution=$(CHROMIUM_BUILD)',
- '--distribution=_google_chrome',
- ],
- },
- ],
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267, ],
},
},
], # actions
}], # buildtype=="Official"
- ['branding=="Chrome" and buildtype=="Official"', {
- 'actions': [
- {
- # copy_keychain_reauthorize.sh explains why this isn't in a
- # 'copies' block, but briefly: this is a prebuilt signed
- # binary component that relies on a correct signature to
- # function properly, and a normal 'copies' block sadly makes
- # a trivial modification to the file such that its signature
- # is no longer valid.
- 'action_name': 'Copy keychain_reauthorize',
- 'variables': {
- 'keychain_reauthorize_path': 'tools/build/mac/copy_keychain_reauthorize.sh',
- 'keychain_reauthorize_normal_path': 'installer/mac/internal/keychain_reauthorize/com.google.Chrome',
- 'keychain_reauthorize_canary_path': 'installer/mac/internal/keychain_reauthorize/com.google.Chrome.canary',
- 'keychain_reauthorize_output_dir': '<(mac_packaging_dir)/.keychain_reauthorize',
- },
- 'inputs': [
- '<(keychain_reauthorize_path)',
- '<(keychain_reauthorize_normal_path)',
- '<(keychain_reauthorize_canary_path)',
- ],
- 'outputs': [
- '<(keychain_reauthorize_output_dir)/com.google.Chrome',
- '<(keychain_reauthorize_output_dir)/com.google.Chrome.canary',
- ],
- 'action': [
- '<(keychain_reauthorize_path)',
- '<(keychain_reauthorize_output_dir)',
- '<(keychain_reauthorize_normal_path)',
- '<(keychain_reauthorize_canary_path)',
- ],
- },
- ], # actions
- }], # branding=="Chrome" and buildtype=="Official"
], # conditions
'copies': [
{
}], # mac_keystone
['branding=="Chrome" and buildtype=="Official"', {
'files': [
- 'app/theme/google_chrome/app_canary.icns',
- 'app/theme/google_chrome/document_canary.icns',
+ 'app/theme/google_chrome/mac/app_canary.icns',
+ 'app/theme/google_chrome/mac/document_canary.icns',
'installer/mac/internal/chrome_canary_dmg_dsstore',
'installer/mac/internal/chrome_canary_dmg_icon.icns',
'installer/mac/internal/chrome_dmg_background.png',
projects / platform / framework / web / crosswalk.git / blobdiff