DevTools l10n: merge Inspector's and DevTools's strings; also, disable l10n until mgr agreeement.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/173267

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24094 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 85 insertions, 46 deletions

diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index c228e47..7191e32d 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -1254,9 +1254,8 @@
       'msvs_guid': 'C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09',
       'dependencies': [
         '../net/net.gyp:net',
-        'devtools_strings',
         'inspector_resources',
-        'inspector_strings',
+        'localized_strings',
         'webcore',
         'webkit',
         'webkit_resources',
@@ -1579,32 +1578,32 @@
       'type': 'none',
       'msvs_guid': '14F3FA5A-C401-4A7F-8F25-C23739D1C0BE',
       'variables': {
-	'grit_path': '../tools/grit/grit.py',
-	'grit_out_dir': '<(PRODUCT_DIR)/resources/inspector/l10n',
+        'grit_path': '../tools/grit/grit.py',
+        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit/glue/inspector',
       },
       'actions': [
-	{
-	  'action_name': 'inspector_strings',
-	  'variables': {
-	    'input_path': 'glue/inspector_strings.grd',
-	  },
-	  'inputs': [
-	    '<(input_path)',
-	  ],
-	  'outputs': [
-	    '<(grit_out_dir)/inspectorStrings_da.js',
-	    '<(grit_out_dir)/inspectorStrings_en-US.js',
-	    '<(grit_out_dir)/inspectorStrings_he.js',
-	    '<(grit_out_dir)/inspectorStrings_zh-TW.js',
-	  ],
-	  'action': ['python', '<(grit_path)', '-i', '<(input_path)', 'build', '-o', '<(grit_out_dir)'],
-	  'message': 'Generating resources from <(input_path)',
-	},
+        {
+          'action_name': 'inspector_strings',
+          'variables': {
+            'input_path': 'glue/inspector_strings.grd',
+          },
+          'inputs': [
+            '<(input_path)',
+          ],
+          'outputs': [
+            '<(grit_out_dir)/inspectorStrings_da.js',
+            '<(grit_out_dir)/inspectorStrings_en-US.js',
+            '<(grit_out_dir)/inspectorStrings_he.js',
+            '<(grit_out_dir)/inspectorStrings_zh-TW.js',
+          ],
+          'action': ['python', '<(grit_path)', '-i', '<(input_path)', 'build', '-o', '<(grit_out_dir)'],
+          'message': 'Generating resources from <(input_path)',
+        },
       ],
       'conditions': [
-	['OS=="win"', {
-	  'dependencies': ['../build/win/system.gyp:cygwin'],
-	}],
+        ['OS=="win"', {
+          'dependencies': ['../build/win/system.gyp:cygwin'],
+        }],
       ],
     },
     {
@@ -1612,32 +1611,72 @@
       'type': 'none',
       'msvs_guid': 'AE42E1EB-E848-4FD2-B42F-800604062918',
       'variables': {
-	'grit_path': '../tools/grit/grit.py',
-	'grit_out_dir': '<(PRODUCT_DIR)/resources/inspector/l10n',
+        'grit_path': '../tools/grit/grit.py',
+        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit/glue/inspector',
+      },
+      'actions': [
+        {
+          'action_name': 'devtools_strings',
+          'variables': {
+            'input_path': 'glue/devtools_strings.grd',
+          },
+          'inputs': [
+            '<(input_path)',
+          ],
+          'outputs': [
+            '<(grit_out_dir)/devtoolsStrings_da.js',
+            '<(grit_out_dir)/devtoolsStrings_en-US.js',
+            '<(grit_out_dir)/devtoolsStrings_he.js',
+            '<(grit_out_dir)/devtoolsStrings_zh-TW.js',
+          ],
+          'action': ['python', '<(grit_path)', '-i', '<(input_path)', 'build', '-o', '<(grit_out_dir)'],
+          'message': 'Generating resources from <(input_path)',
+        },
+      ],
+      'conditions': [
+        ['OS=="win"', {
+          'dependencies': ['../build/win/system.gyp:cygwin'],
+        }],
+      ],
+    },
+    {
+      'target_name': 'localized_strings',
+      'type': 'none',
+      'msvs_guid': '6CC1A748-A343-4469-BB17-11038E354858',
+      'dependencies': [
+        'inspector_strings',
+        'devtools_strings',
+      ],
+      'variables': {
+        'merge_strings_cmd': ['python', 'tools/build/merge_localized_strings.py',],
+        'l10n_out_dir': '<(PRODUCT_DIR)/resources/inspector/l10n',
+        # TODO(mnaganov): use the same list as in 'chrome.gyp'.
+        'locales': ['en-US',],
       },
       'actions': [
-	{
-	  'action_name': 'devtools_strings',
-	  'variables': {
-	    'input_path': 'glue/devtools_strings.grd',
-	  },
-	  'inputs': [
-	    '<(input_path)',
-	  ],
-	  'outputs': [
-	    '<(grit_out_dir)/devtoolsStrings_da.js',
-	    '<(grit_out_dir)/devtoolsStrings_en-US.js',
-	    '<(grit_out_dir)/devtoolsStrings_he.js',
-	    '<(grit_out_dir)/devtoolsStrings_zh-TW.js',
-	  ],
-	  'action': ['python', '<(grit_path)', '-i', '<(input_path)', 'build', '-o', '<(grit_out_dir)'],
-	  'message': 'Generating resources from <(input_path)',
-	},
+        {
+          'action_name': 'localized_strings',
+          'variables': {
+            'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit/glue/inspector',
+          },
+          'inputs': [
+            'tools/build/merge_localized_strings.py',
+            '>!@(<@(merge_strings_cmd) -i -g \'<(grit_out_dir)\' -l \'<(l10n_out_dir)\' <@(locales))',
+          ],
+          'outputs': [
+            '>!@(<@(merge_strings_cmd) -o -g \'<(grit_out_dir)\' -l \'<(l10n_out_dir)\' <@(locales))',
+          ],
+          'action': ['<@(merge_strings_cmd)',
+            '-g', '<(grit_out_dir)',
+            '-l', '<(l10n_out_dir)',
+            '<@(locales)'],
+          'message': 'Merging localized strings',
+        },
       ],
       'conditions': [
-	['OS=="win"', {
-	  'dependencies': ['../build/win/system.gyp:cygwin'],
-	}],
+        ['OS=="win"', {
+          'dependencies': ['../build/win/system.gyp:cygwin'],
+        }],
       ],
     },
   ],