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

Side by Side Diff: trunk/src/remoting/remoting.gyp

Issue 141003004: Revert 245489 "make utf-8 default encoding for remoting_localize.py" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | trunk/src/remoting/tools/build/remoting_localize.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 8
9 'variables': { 9 'variables': {
10 'conditions': [ 10 'conditions': [
(...skipping 787 matching lines...) Expand 10 before | Expand all | Expand 10 after
798 '"<(SHARED_INTERMEDIATE_DIR)/remoting/host_plugin_resources/ @{json_suffix}.lproj/InfoPlist.strings" ' 798 '"<(SHARED_INTERMEDIATE_DIR)/remoting/host_plugin_resources/ @{json_suffix}.lproj/InfoPlist.strings" '
799 '--print_only <(remoting_locales))', 799 '--print_only <(remoting_locales))',
800 ], 800 ],
801 'action': [ 801 'action': [
802 'python', 802 'python',
803 '<(remoting_localize_path)', 803 '<(remoting_localize_path)',
804 '--locale_dir', '<(webapp_locale_dir)', 804 '--locale_dir', '<(webapp_locale_dir)',
805 '--template', 'host/plugin/host_plugin-InfoPlist.strings.jinja2' , 805 '--template', 'host/plugin/host_plugin-InfoPlist.strings.jinja2' ,
806 '--locale_output', 806 '--locale_output',
807 '<(SHARED_INTERMEDIATE_DIR)/remoting/host_plugin_resources/@{jso n_suffix}.lproj/InfoPlist.strings', 807 '<(SHARED_INTERMEDIATE_DIR)/remoting/host_plugin_resources/@{jso n_suffix}.lproj/InfoPlist.strings',
808 '--encoding', 'utf-8',
808 '<@(remoting_locales)', 809 '<@(remoting_locales)',
809 ], 810 ],
810 }, 811 },
811 { 812 {
812 'action_name': 'generate_host_strings', 813 'action_name': 'generate_host_strings',
813 'inputs': [ 814 'inputs': [
814 '<(remoting_localize_path)', 815 '<(remoting_localize_path)',
815 'host/remoting_me2me_host-InfoPlist.strings.jinja2', 816 'host/remoting_me2me_host-InfoPlist.strings.jinja2',
816 ], 817 ],
817 'outputs': [ 818 'outputs': [
818 '<!@pymod_do_main(remoting_localize --locale_output ' 819 '<!@pymod_do_main(remoting_localize --locale_output '
819 '"<(SHARED_INTERMEDIATE_DIR)/remoting/host_resources/@{json_ suffix}.lproj/InfoPlist.strings" ' 820 '"<(SHARED_INTERMEDIATE_DIR)/remoting/host_resources/@{json_ suffix}.lproj/InfoPlist.strings" '
820 '--print_only <(remoting_locales))', 821 '--print_only <(remoting_locales))',
821 ], 822 ],
822 'action': [ 823 'action': [
823 'python', 824 'python',
824 '<(remoting_localize_path)', 825 '<(remoting_localize_path)',
825 '--locale_dir', '<(webapp_locale_dir)', 826 '--locale_dir', '<(webapp_locale_dir)',
826 '--template', 'host/remoting_me2me_host-InfoPlist.strings.jinja2 ', 827 '--template', 'host/remoting_me2me_host-InfoPlist.strings.jinja2 ',
827 '--locale_output', 828 '--locale_output',
828 '<(SHARED_INTERMEDIATE_DIR)/remoting/host_resources/@{json_suffi x}.lproj/InfoPlist.strings', 829 '<(SHARED_INTERMEDIATE_DIR)/remoting/host_resources/@{json_suffi x}.lproj/InfoPlist.strings',
830 '--encoding', 'utf-8',
829 '<@(remoting_locales)', 831 '<@(remoting_locales)',
830 ], 832 ],
831 }, 833 },
832 { 834 {
833 'action_name': 'generate_preference_pane_strings', 835 'action_name': 'generate_preference_pane_strings',
834 'inputs': [ 836 'inputs': [
835 '<(remoting_localize_path)', 837 '<(remoting_localize_path)',
836 'host/mac/me2me_preference_pane-InfoPlist.strings.jinja2', 838 'host/mac/me2me_preference_pane-InfoPlist.strings.jinja2',
837 ], 839 ],
838 'outputs': [ 840 'outputs': [
839 '<!@pymod_do_main(remoting_localize --locale_output ' 841 '<!@pymod_do_main(remoting_localize --locale_output '
840 '"<(SHARED_INTERMEDIATE_DIR)/remoting/preference_pane_resour ces/@{json_suffix}.lproj/InfoPlist.strings" ' 842 '"<(SHARED_INTERMEDIATE_DIR)/remoting/preference_pane_resour ces/@{json_suffix}.lproj/InfoPlist.strings" '
841 '--print_only <(remoting_locales))', 843 '--print_only <(remoting_locales))',
842 ], 844 ],
843 'action': [ 845 'action': [
844 'python', 846 'python',
845 '<(remoting_localize_path)', 847 '<(remoting_localize_path)',
846 '--locale_dir', '<(webapp_locale_dir)', 848 '--locale_dir', '<(webapp_locale_dir)',
847 '--template', 'host/mac/me2me_preference_pane-InfoPlist.strings. jinja2', 849 '--template', 'host/mac/me2me_preference_pane-InfoPlist.strings. jinja2',
848 '--locale_output', 850 '--locale_output',
849 '<(SHARED_INTERMEDIATE_DIR)/remoting/preference_pane_resources/@ {json_suffix}.lproj/InfoPlist.strings', 851 '<(SHARED_INTERMEDIATE_DIR)/remoting/preference_pane_resources/@ {json_suffix}.lproj/InfoPlist.strings',
852 '--encoding', 'utf-8',
850 '<@(remoting_locales)', 853 '<@(remoting_locales)',
851 ], 854 ],
852 }, 855 },
853 { 856 {
854 'action_name': 'generate_uninstaller_strings', 857 'action_name': 'generate_uninstaller_strings',
855 'inputs': [ 858 'inputs': [
856 '<(remoting_localize_path)', 859 '<(remoting_localize_path)',
857 'host/installer/mac/uninstaller/remoting_uninstaller-InfoPlist.s trings.jinja2', 860 'host/installer/mac/uninstaller/remoting_uninstaller-InfoPlist.s trings.jinja2',
858 ], 861 ],
859 'outputs': [ 862 'outputs': [
860 '<!@pymod_do_main(remoting_localize --locale_output ' 863 '<!@pymod_do_main(remoting_localize --locale_output '
861 '"<(SHARED_INTERMEDIATE_DIR)/remoting/uninstaller_resources/ @{json_suffix}.lproj/InfoPlist.strings" ' 864 '"<(SHARED_INTERMEDIATE_DIR)/remoting/uninstaller_resources/ @{json_suffix}.lproj/InfoPlist.strings" '
862 '--print_only <(remoting_locales))', 865 '--print_only <(remoting_locales))',
863 ], 866 ],
864 'action': [ 867 'action': [
865 'python', 868 'python',
866 '<(remoting_localize_path)', 869 '<(remoting_localize_path)',
867 '--locale_dir', '<(webapp_locale_dir)', 870 '--locale_dir', '<(webapp_locale_dir)',
868 '--template', 'host/installer/mac/uninstaller/remoting_uninstall er-InfoPlist.strings.jinja2', 871 '--template', 'host/installer/mac/uninstaller/remoting_uninstall er-InfoPlist.strings.jinja2',
869 '--locale_output', 872 '--locale_output',
870 '<(SHARED_INTERMEDIATE_DIR)/remoting/uninstaller_resources/@{jso n_suffix}.lproj/InfoPlist.strings', 873 '<(SHARED_INTERMEDIATE_DIR)/remoting/uninstaller_resources/@{jso n_suffix}.lproj/InfoPlist.strings',
874 '--encoding', 'utf-8',
871 '<@(remoting_locales)', 875 '<@(remoting_locales)',
872 ], 876 ],
873 }, 877 },
874 ], 878 ],
875 }, # end of target 'remoting_infoplist_strings' 879 }, # end of target 'remoting_infoplist_strings'
876 ], # end of 'targets' 880 ], # end of 'targets'
877 }], # 'enable_remoting_host==1' 881 }], # 'enable_remoting_host==1'
878 882
879 ['OS!="win" and enable_remoting_host==1', { 883 ['OS!="win" and enable_remoting_host==1', {
880 'conditions': [ 884 'conditions': [
(...skipping 750 matching lines...) Expand 10 before | Expand all | Expand 10 after
1631 'extension': 'jinja2', 1635 'extension': 'jinja2',
1632 'outputs': [ 1636 'outputs': [
1633 '<(SHARED_INTERMEDIATE_DIR)/remoting/core.rc' 1637 '<(SHARED_INTERMEDIATE_DIR)/remoting/core.rc'
1634 ], 1638 ],
1635 'action': [ 1639 'action': [
1636 'python', 1640 'python',
1637 '<(remoting_localize_path)', 1641 '<(remoting_localize_path)',
1638 '--locale_dir', '<(webapp_locale_dir)', 1642 '--locale_dir', '<(webapp_locale_dir)',
1639 '--template', '<(RULE_INPUT_PATH)', 1643 '--template', '<(RULE_INPUT_PATH)',
1640 '--output', '<@(_outputs)', 1644 '--output', '<@(_outputs)',
1641 '--encoding', 'utf-16',
1642 '<@(remoting_locales)', 1645 '<@(remoting_locales)',
1643 ], 1646 ],
1644 'message': 'Localizing the dialogs and strings' 1647 'message': 'Localizing the dialogs and strings'
1645 }, 1648 },
1646 ], 1649 ],
1647 }, # end of target 'remoting_core_resources' 1650 }, # end of target 'remoting_core_resources'
1648 { 1651 {
1649 'target_name': 'remoting_desktop', 1652 'target_name': 'remoting_desktop',
1650 'type': 'executable', 1653 'type': 'executable',
1651 'variables': { 'enable_wexit_time_destructors': 1, }, 1654 'variables': { 'enable_wexit_time_destructors': 1, },
(...skipping 603 matching lines...) Expand 10 before | Expand all | Expand 10 after
2255 '<(output)', 2258 '<(output)',
2256 ], 2259 ],
2257 'action': [ 2260 'action': [
2258 'python', 2261 'python',
2259 '<(remoting_localize_path)', 2262 '<(remoting_localize_path)',
2260 '--define', 'ME2ME_NATIVE_MESSAGING_HOST_PATH=<(me2me_native_mes saging_host_path)', 2263 '--define', 'ME2ME_NATIVE_MESSAGING_HOST_PATH=<(me2me_native_mes saging_host_path)',
2261 '--locale_dir', '<(webapp_locale_dir)', 2264 '--locale_dir', '<(webapp_locale_dir)',
2262 '--template', '<(input)', 2265 '--template', '<(input)',
2263 '--locale_output', 2266 '--locale_output',
2264 '<(output)', 2267 '<(output)',
2268 '--encoding', 'utf-8',
2265 'en', 2269 'en',
2266 ], 2270 ],
2267 }, 2271 },
2268 ], # actions 2272 ], # actions
2269 }, 2273 },
2270 ], 2274 ],
2271 ], # target_conditions 2275 ], # target_conditions
2272 }, # end of target 'remoting_me2me_native_messaging_manifest' 2276 }, # end of target 'remoting_me2me_native_messaging_manifest'
2273 { 2277 {
2274 'target_name': 'remoting_resources', 2278 'target_name': 'remoting_resources',
(...skipping 625 matching lines...) Expand 10 before | Expand all | Expand 10 after
2900 '../base/allocator/allocator.gyp:allocator', 2904 '../base/allocator/allocator.gyp:allocator',
2901 ], 2905 ],
2902 }, 2906 },
2903 ], 2907 ],
2904 ], 2908 ],
2905 }], # end of 'toolkit_uses_gtk == 1' 2909 }], # end of 'toolkit_uses_gtk == 1'
2906 ], # end of 'conditions' 2910 ], # end of 'conditions'
2907 }, # end of target 'remoting_unittests' 2911 }, # end of target 'remoting_unittests'
2908 ], # end of targets 2912 ], # end of targets
2909 } 2913 }
OLDNEW
« no previous file with comments | « no previous file | trunk/src/remoting/tools/build/remoting_localize.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698