Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2269)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/chromeos/chromevox/chromevox.gyp

Issue 299703003: Build ChromeVox using gyp. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Address nits from Dominic. Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/resources/chromeos/chromevox/chromevox/background/kbexplorer_loader.js » ('j') | chrome/browser/resources/chromeos/chromevox/chromevox/background/kbexplorer_loader.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/chromeos/chromevox/chromevox.gyp
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox.gyp b/chrome/browser/resources/chromeos/chromevox/chromevox.gyp
index 6bc51f83b67b3b962c6422e3156176289ebab06a..06f9cadd896e317857b2047e181d272ad61119e8 100644
--- a/chrome/browser/resources/chromeos/chromevox/chromevox.gyp
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox.gyp
@@ -3,183 +3,186 @@
# found in the LICENSE file.
{
- 'variables': {
- 'chromevox_dest_dir': '<(PRODUCT_DIR)/resources/chromeos/chromevox',
- },
- 'targets': [
- {
- 'target_name': 'chromevox_resources',
- 'type': 'none',
- 'dependencies': [
- 'chromevox_assets',
- 'chromevox_static_files',
- 'chromevox_strings',
- 'chromevox_uncompiled_js_files',
- '<(DEPTH)/chrome/third_party/chromevox/chromevox.gyp:chromevox_third_party_resources',
- ],
- 'conditions': [
- ['disable_nacl==0 and disable_nacl_untrusted==0', {
+ 'conditions': [
+ ['chromeos==1', {
+ 'variables': {
+ # Whether to compress the 4 main ChromeVox scripts. Applicable if
+ # use_migrated_chromevox is true.
+ 'chromevox_compress_js%': '1',
+ 'chromevox_third_party_dir': '<(DEPTH)/chrome/third_party/chromevox',
+ 'closure_goog_dir': '<(chromevox_third_party_dir)/third_party/closure-library/closure/goog',
+ 'chromevox_dest_dir': '<(PRODUCT_DIR)/resources/chromeos/chromevox',
+ 'js_root_flags': [
+ '-r', '.',
+ '-r', '<(closure_goog_dir)',
+ ],
+ 'path_rewrite_flags': [
+ '-w', '<(closure_goog_dir):closure',
+ ],
+ 'background_script_loader_file': 'chromevox/background/loader.js',
+ 'content_script_loader_file': 'chromevox/injected/loader.js',
+ 'options_script_loader_file': 'chromevox/background/options_loader.js',
+ 'kbexplorer_loader_file': 'chromevox/background/kbexplorer_loader.js',
+ },
+ 'targets': [
+ {
+ 'target_name': 'chromevox_resources',
+ 'type': 'none',
'dependencies': [
- '<(DEPTH)/third_party/liblouis/liblouis_nacl.gyp:liblouis_nacl_wrapper_nacl',
+ 'chromevox_assets',
+ 'chromevox_static_files',
+ 'chromevox_strings',
+ 'chromevox_uncompiled_js_files',
+ '<(chromevox_third_party_dir)/chromevox.gyp:chromevox_third_party_resources',
],
- }],
- ],
- },
- {
- 'target_name': 'chromevox_assets',
- 'type': 'none',
- 'copies': [
- {
- 'destination': '<(chromevox_dest_dir)/chromevox',
- 'files': [
- 'chromevox/chromevox-128.png',
- 'chromevox/chromevox-16.png',
- 'chromevox/chromevox-19.png',
- 'chromevox/chromevox-48.png',
+ 'conditions': [
+ ['disable_nacl==0 and disable_nacl_untrusted==0', {
+ 'dependencies': [
+ '<(DEPTH)/third_party/liblouis/liblouis_nacl.gyp:liblouis_nacl_wrapper_nacl',
+ ],
+ }],
+ ['use_migrated_chromevox==1 and chromevox_compress_js==1', {
+ 'dependencies': [
+ 'chromevox_content_script',
+ 'chromevox_background_script',
+ 'chromevox_options_script',
+ 'chromevox_kbexplorer_script',
+ ],
+ }],
+ ['use_migrated_chromevox==1 and chromevox_compress_js==0', {
+ 'dependencies': [
+ 'chromevox_copied_scripts',
+ ],
+ }],
],
},
{
- 'destination': '<(chromevox_dest_dir)/chromevox/background/earcons',
- 'files': [
- 'chromevox/background/earcons/alert_modal.ogg',
- 'chromevox/background/earcons/alert_nonmodal.ogg',
- 'chromevox/background/earcons/bullet.ogg',
- 'chromevox/background/earcons/busy_progress_loop.ogg',
- 'chromevox/background/earcons/busy_working_loop.ogg',
- 'chromevox/background/earcons/button.ogg',
- 'chromevox/background/earcons/check_off.ogg',
- 'chromevox/background/earcons/check_on.ogg',
- 'chromevox/background/earcons/collapsed.ogg',
- 'chromevox/background/earcons/editable_text.ogg',
- 'chromevox/background/earcons/ellipsis.ogg',
- 'chromevox/background/earcons/expanded.ogg',
- 'chromevox/background/earcons/font_change.ogg',
- 'chromevox/background/earcons/invalid_keypress.ogg',
- 'chromevox/background/earcons/link.ogg',
- 'chromevox/background/earcons/listbox.ogg',
- 'chromevox/background/earcons/long_desc.ogg',
- 'chromevox/background/earcons/new_mail.ogg',
- 'chromevox/background/earcons/object_close.ogg',
- 'chromevox/background/earcons/object_delete.ogg',
- 'chromevox/background/earcons/object_deselect.ogg',
- 'chromevox/background/earcons/object_enter.ogg',
- 'chromevox/background/earcons/object_exit.ogg',
- 'chromevox/background/earcons/object_open.ogg',
- 'chromevox/background/earcons/object_select.ogg',
- 'chromevox/background/earcons/paragraph_break.ogg',
- 'chromevox/background/earcons/search_hit.ogg',
- 'chromevox/background/earcons/search_miss.ogg',
- 'chromevox/background/earcons/section.ogg',
- 'chromevox/background/earcons/selection.ogg',
- 'chromevox/background/earcons/selection_reverse.ogg',
- 'chromevox/background/earcons/special_content.ogg',
- 'chromevox/background/earcons/task_success.ogg',
- 'chromevox/background/earcons/wrap_edge.ogg',
- 'chromevox/background/earcons/wrap.ogg',
+ 'target_name': 'chromevox_assets',
+ 'type': 'none',
+ 'includes': [
+ 'chromevox_assets.gypi',
],
},
{
- 'destination': '<(chromevox_dest_dir)/chromevox/background/keymaps',
- 'files': [
- 'chromevox/background/keymaps/classic_keymap.json',
- 'chromevox/background/keymaps/experimental.json',
- 'chromevox/background/keymaps/flat_keymap.json',
- ],
- },
- {
- 'destination': '<(chromevox_dest_dir)/chromevox/background/mathmaps/functions',
- 'files': [
- 'chromevox/background/mathmaps/functions/algebra.json',
- 'chromevox/background/mathmaps/functions/elementary.json',
- 'chromevox/background/mathmaps/functions/hyperbolic.json',
- 'chromevox/background/mathmaps/functions/trigonometry.json',
+ 'target_name': 'chromevox_static_files',
+ 'type': 'none',
+ 'copies': [
+ {
+ 'destination': '<(chromevox_dest_dir)/chromevox/background',
+ 'files': [
+ 'chromevox/background/background.html',
+ 'chromevox/background/kbexplorer.html',
+ 'chromevox/background/options.html',
+ ],
+ },
],
},
{
- 'destination': '<(chromevox_dest_dir)/chromevox/background/mathmaps/symbols',
- 'files': [
- 'chromevox/background/mathmaps/symbols/greek-capital.json',
- 'chromevox/background/mathmaps/symbols/greek-mathfonts.json',
- 'chromevox/background/mathmaps/symbols/greek-scripts.json',
- 'chromevox/background/mathmaps/symbols/greek-small.json',
- 'chromevox/background/mathmaps/symbols/greek-symbols.json',
- 'chromevox/background/mathmaps/symbols/hebrew_letters.json',
- 'chromevox/background/mathmaps/symbols/latin-lower-double-accent.json',
- 'chromevox/background/mathmaps/symbols/latin-lower-normal.json',
- 'chromevox/background/mathmaps/symbols/latin-lower-phonetic.json',
- 'chromevox/background/mathmaps/symbols/latin-lower-single-accent.json',
- 'chromevox/background/mathmaps/symbols/latin-mathfonts.json',
- 'chromevox/background/mathmaps/symbols/latin-rest.json',
- 'chromevox/background/mathmaps/symbols/latin-upper-double-accent.json',
- 'chromevox/background/mathmaps/symbols/latin-upper-normal.json',
- 'chromevox/background/mathmaps/symbols/latin-upper-single-accent.json',
- 'chromevox/background/mathmaps/symbols/math_angles.json',
- 'chromevox/background/mathmaps/symbols/math_arrows.json',
- 'chromevox/background/mathmaps/symbols/math_characters.json',
- 'chromevox/background/mathmaps/symbols/math_delimiters.json',
- 'chromevox/background/mathmaps/symbols/math_digits.json',
- 'chromevox/background/mathmaps/symbols/math_geometry.json',
- 'chromevox/background/mathmaps/symbols/math_harpoons.json',
- 'chromevox/background/mathmaps/symbols/math_non_characters.json',
- 'chromevox/background/mathmaps/symbols/math_symbols.json',
- 'chromevox/background/mathmaps/symbols/math_whitespace.json',
- 'chromevox/background/mathmaps/symbols/other_stars.json',
+ # JavaScript files that are always directly included into the
+ # destination directory.
+ 'target_name': 'chromevox_uncompiled_js_files',
+ 'type': 'none',
+ 'copies': [
+ {
+ 'destination': '<(chromevox_dest_dir)/closure',
+ 'files': [
+ 'closure/closure_preinit.js',
+ ],
+ 'conditions': [
+ ['use_migrated_chromevox==0 or chromevox_compress_js==1', {
+ 'files': [ '<(closure_goog_dir)/base.js' ],
+ }],
+ ]
+ },
+ {
+ 'destination': '<(chromevox_dest_dir)/chromevox/injected',
+ 'files': [
+ 'chromevox/injected/api.js',
+ 'chromevox/injected/api_util.js',
+ ],
+ },
],
},
- ],
- },
- {
- 'target_name': 'chromevox_static_files',
- 'type': 'none',
- 'copies': [
{
- 'destination': '<(chromevox_dest_dir)/chromevox/background',
- 'files': [
- 'chromevox/background/background.html',
- 'chromevox/background/kbexplorer.html',
- 'chromevox/background/options.html',
+ 'target_name': 'chromevox_strings',
+ 'type': 'none',
+ 'actions': [
+ {
+ 'action_name': 'chromevox_strings',
+ 'variables': {
+ 'grit_grd_file': 'strings/chromevox_strings.grd',
+ # TODO(plundblad): Change to use PRODUCT_DIR when we have
+ # translations.
+ 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/resources/chromeos/chromevox',
+ # We don't generate any RC files, so no resource_ds file is needed.
+ 'grit_resource_ids': '',
+ },
+ 'includes': [ '../../../../../build/grit_action.gypi' ],
+ },
],
},
],
- },
- {
- # JavaScript that are always directly included into the destination
- # driectory.
- 'target_name': 'chromevox_uncompiled_js_files',
- 'type': 'none',
- 'copies': [
+ 'conditions': [
+ ['use_migrated_chromevox==1 and chromevox_compress_js==1', {
+ 'targets': [
{
- 'destination': '<(chromevox_dest_dir)/closure',
- 'files': [
- 'closure/closure_preinit.js',
+ 'target_name': 'chromevox_content_script',
+ 'type': 'none',
+ 'variables': {
+ 'output_file': '<(chromevox_dest_dir)/chromeVoxChromePageScript.js',
+ },
+ 'sources': [ '<(content_script_loader_file)' ],
+ 'includes': [ 'compress_js.gypi', ],
+ },
+ {
+ 'target_name': 'chromevox_background_script',
+ 'type': 'none',
+ 'variables': {
+ 'output_file': '<(chromevox_dest_dir)/chromeVoxChromeBackgroundScript.js',
+ },
+ 'sources': [ '<(background_script_loader_file)' ],
+ 'includes': [ 'compress_js.gypi', ],
+ },
+ {
+ 'target_name': 'chromevox_options_script',
+ 'type': 'none',
+ 'variables': {
+ 'output_file': '<(chromevox_dest_dir)/chromeVoxChromeOptionsScript.js',
+ },
+ 'sources': [ '<(options_script_loader_file)' ],
+ 'includes': [ 'compress_js.gypi', ],
+ },
+ {
+ 'target_name': 'chromevox_kbexplorer_script',
+ 'type': 'none',
+ 'variables': {
+ 'output_file': '<(chromevox_dest_dir)/chromeVoxKbExplorerScript.js',
+ },
+ 'sources': [ '<(kbexplorer_loader_file)' ],
+ 'includes': [ 'compress_js.gypi', ],
+ },
],
},
- {
- 'destination': '<(chromevox_dest_dir)/chromevox/injected',
- 'files': [
- 'chromevox/injected/api.js',
- 'chromevox/injected/api_util.js',
+ ],
+ ['use_migrated_chromevox==1 and chromevox_compress_js==0', {
+ 'targets': [
+ {
+ 'target_name': 'chromevox_copied_scripts',
+ 'type': 'none',
+ 'variables': {
+ 'dest_dir': '<(chromevox_dest_dir)',
+ },
+ 'sources': [
+ '<(background_script_loader_file)',
+ '<(content_script_loader_file)',
+ '<(kbexplorer_loader_file)',
+ '<(options_script_loader_file)',
+ ],
+ 'includes': [ 'copy_js.gypi', ],
+ },
],
- },
- ],
- },
- {
- 'target_name': 'chromevox_strings',
- 'type': 'none',
- 'actions': [
- {
- 'action_name': 'chromevox_strings',
- 'variables': {
- 'grit_grd_file': 'strings/chromevox_strings.grd',
- # TODO(plundblad): Change to use PRODUCT_DIR when we have
- # translations.
- 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/resources/chromeos/chromevox',
- # We don't generate any RC files, so no resource_ds file is needed.
- 'grit_resource_ids': '',
- },
- 'includes': [ '../../../../../build/grit_action.gypi' ],
- },
+ }],
],
- },
+ }],
],
}
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/resources/chromeos/chromevox/chromevox/background/kbexplorer_loader.js » ('j') | chrome/browser/resources/chromeos/chromevox/chromevox/background/kbexplorer_loader.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698