Revert last checkin to fix resources in Release builds.

chrome/chrome.gyp

 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
     # Define the common dependencies that contain all the actual
     # Chromium functionality.  This list gets pulled in below by
     # the link of the actual chrome (or chromium) executable on
@@ skipping 44 matching lines @@
   },
   'targets': [
     {
       # TODO(mark): It would be better if each static library that needed
       # to run grit would list its own .grd files, but unfortunately some
       # of the static libraries currently have circular dependencies among
       # generated headers.
       'target_name': 'chrome_resources',
       'type': 'none',
       'msvs_guid': 'B95AB527-F7DB-41E9-AD91-EB51EE0F56BE',
+      'msvs_existing_vcproj': 'app/chrome_resources.vcproj',
       'rules': [
         {
           'rule_name': 'grit',
           'extension': 'grd',
           'variables': {
             'conditions': [
               ['branding=="Chrome"', {
                 # TODO(mmoss) The .grd files look for _google_chrome, but for
                 # consistency they should look for GOOGLE_CHROME_BUILD like C++.
                 # Clean this up when Windows moves to gyp.
                 'chrome_build': '_google_chrome',
                 'branded_env': 'CHROMIUM_BUILD=google_chrome',
               }, {  # else: branding!="Chrome"
                 'chrome_build': '_chromium',
                 'branded_env': 'CHROMIUM_BUILD=chromium',
               }],
             ],
           },
           'inputs': [
             '../tools/grit/grit.py',
           ],
           'outputs': [
-            '<(grit_out_dir)/grit/<(RULE_INPUT_ROOT).h',
-            '<(grit_out_dir)/<(RULE_INPUT_ROOT).pak',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/grit/<(RULE_INPUT_ROOT).h',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/<(RULE_INPUT_ROOT).pak',
           ],
           'action': ['python', '<@(_inputs)', '-i', '<(RULE_INPUT_PATH)',
-            'build', '-o', '<(grit_out_dir)',
+            'build', '-o', '<(SHARED_INTERMEDIATE_DIR)/chrome',
             '-D', '<(chrome_build)',
             '-E', '<(branded_env)',
           ],
           'message': 'Generating resources from <(RULE_INPUT_PATH)',
         },
       ],
       'sources': [
         # Data resources.
         'browser/debugger/resources/debugger_resources.grd',
         'browser/browser_resources.grd',
         'common/common_resources.grd',
         'renderer/renderer_resources.grd',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '<(grit_out_dir)',
+          '<(SHARED_INTERMEDIATE_DIR)/chrome',
         ],
       },
       'conditions': [
         ['OS=="win"', {
           'dependencies': ['../build/win/system.gyp:cygwin'],
         }],
       ],
     },
     {
       # TODO(mark): It would be better if each static library that needed
       # to run grit would list its own .grd files, but unfortunately some
       # of the static libraries currently have circular dependencies among
       # generated headers.
       'target_name': 'chrome_strings',
       'type': 'none',
       'msvs_guid': 'D9DDAF60-663F-49CC-90DC-3D08CC3D1B28',
+      'msvs_existing_vcproj': 'app/chrome_strings.vcproj',
       'rules': [
         {
           'rule_name': 'grit',
           'extension': 'grd',
           'variables': {
             'conditions': [
               ['branding=="Chrome"', {
                 # TODO(mmoss) The .grd files look for _google_chrome, but for
                 # consistency they should look for GOOGLE_CHROME_BUILD like C++.
                 # Clean this up when Windows moves to gyp.
                 'chrome_build': '_google_chrome',
               }, {  # else: branding!="Chrome"
                 'chrome_build': '_chromium',
               }],
             ],
           },
           'inputs': [
             '../tools/grit/grit.py',
           ],
           'outputs': [
-            '<(grit_out_dir)/grit/<(RULE_INPUT_ROOT).h',
-            '<(grit_out_dir)/<(RULE_INPUT_ROOT)_da.pak',
-            '<(grit_out_dir)/<(RULE_INPUT_ROOT)_en-US.pak',
-            '<(grit_out_dir)/<(RULE_INPUT_ROOT)_he.pak',
-            '<(grit_out_dir)/<(RULE_INPUT_ROOT)_zh-TW.pak',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/grit/<(RULE_INPUT_ROOT).h',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/<(RULE_INPUT_ROOT)_da.pak',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/<(RULE_INPUT_ROOT)_en-US.pak',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/<(RULE_INPUT_ROOT)_he.pak',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/<(RULE_INPUT_ROOT)_zh-TW.pak',
           ],
           'action': ['python', '<@(_inputs)', '-i', '<(RULE_INPUT_PATH)',
-            'build', '-o', '<(grit_out_dir)',
+            'build', '-o', '<(SHARED_INTERMEDIATE_DIR)/chrome',
             '-D', '<(chrome_build)'],
           'message': 'Generating resources from <(RULE_INPUT_PATH)',
         },
       ],
       'sources': [
         # Localizable resources.
         'app/resources/locale_settings.grd',
         'app/chromium_strings.grd',
         'app/generated_resources.grd',
         'app/google_chrome_strings.grd',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '<(grit_out_dir)',
+          '<(SHARED_INTERMEDIATE_DIR)/chrome',
         ],
       },
       'conditions': [
         ['OS=="win"', {
           'dependencies': ['../build/win/system.gyp:cygwin'],
         }],
       ],
     },
     {
       # theme_resources also generates a .cc file, so it can't use the rules above.
@@ skipping 28 matching lines @@
             '<(grit_out_dir)/theme_resources.pak',
             '<(grit_out_dir)/theme_resources.rc',
           ],
           'action': ['python', '<(grit_path)', '-i', '<(input_path)', 'build',
             '-o', '<(grit_out_dir)', '-D', '<(chrome_build)'],
           'message': 'Generating resources from <(input_path)',
         },
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '<(grit_out_dir)',
+          '<(SHARED_INTERMEDIATE_DIR)/chrome',
         ],
       },
       'conditions': [
         ['OS=="win"', {
           'dependencies': ['../build/win/system.gyp:cygwin'],
         }],
       ],
     },
     {
       'target_name': 'common',
@@ skipping 1322 matching lines @@
         'browser/window_sizer_linux.cc',
         'browser/window_sizer_win.cc',
         'browser/worker_host/worker_process_host.cc',
         'browser/worker_host/worker_process_host.h',
         'browser/worker_host/worker_service.cc',
         'browser/worker_host/worker_service.h',
         'tools/build/win/precompiled_wtl.h',
         'tools/build/win/precompiled_wtl.cc',
 
         # This file is generated by GRIT.
-        '<(grit_out_dir)/grit/theme_resources_map.cc',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome/grit/theme_resources_map.cc',
       ],
       'conditions': [
         ['javascript_engine=="v8"', {
           'defines': [
             'CHROME_V8',
           ],
         }],
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
@@ skipping 841 matching lines @@
             'app/chrome_dll_resource.h',
           ],
           'variables': {
             'repack_path': '../tools/data_pack/repack.py',
           },
           'actions': [
             {
               'action_name': 'repack_chrome',
               'variables': {
                 'pak_inputs': [
-                  '<(grit_out_dir)/browser_resources.pak',
-                  '<(grit_out_dir)/debugger_resources.pak',
-                  '<(grit_out_dir)/common_resources.pak',
-                  '<(grit_out_dir)/renderer_resources.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/chrome/debugger_resources.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
                 ],
               },
               'inputs': [
                 '<(repack_path)',
                 '<@(pak_inputs)',
               ],
               'outputs': [
                 '<(INTERMEDIATE_DIR)/repack/chrome.pak',
               ],
               'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
               'process_outputs_as_mac_bundle_resources': 1,
             },
             {
               'action_name': 'repack_theme',
               'variables': {
                 'pak_inputs': [
                   '<(SHARED_INTERMEDIATE_DIR)/app/app_resources.pak',
-                  '<(grit_out_dir)/theme_resources.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.pak',
                 ],
               },
               'inputs': [
                 '<(repack_path)',
                 '<@(pak_inputs)',
               ],
               'outputs': [
                 '<(INTERMEDIATE_DIR)/repack/theme.pak',
               ],
               'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
               'process_outputs_as_mac_bundle_resources': 1,
               'conditions': [
                 ['OS=="linux"', {
                   'outputs=': [
                     '<(INTERMEDIATE_DIR)/repack/default.pak',
                   ]
                 }],
               ],
             },
             {
               # TODO(mark): Make this work with more languages than the
               # hardcoded da, en-US, he, zh-TW.
               'action_name': 'repack_locale_da',
               'variables': {
                 'pak_inputs': [
-                  '<(grit_out_dir)/generated_resources_da.pak',
-                  '<(grit_out_dir)/locale_settings_da.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/chrome/generated_resources_da.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/chrome/locale_settings_da.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_da.pak',
                 ],
                 'conditions': [
                   ['branding=="Chrome"', {
                     'pak_inputs': [
-                        '<(grit_out_dir)/google_chrome_strings_da.pak',
+                        '<(SHARED_INTERMEDIATE_DIR)/chrome/google_chrome_strings_da.pak',
                       ]
                   }, {  # else: branding!="Chrome"
                     'pak_inputs': [
-                        '<(grit_out_dir)/chromium_strings_da.pak',
+                        '<(SHARED_INTERMEDIATE_DIR)/chrome/chromium_strings_da.pak',
                       ]
                   }],
                 ],
               },
               'inputs': [
                 '<(repack_path)',
                 '<@(pak_inputs)',
               ],
               'conditions': [
                 ['OS=="mac"', {
@@ skipping 12 matching lines @@
                 }],
               ],
               'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
             },
             {
               # TODO(mark): Make this work with more languages than the
               # hardcoded da, en-US, he, zh-TW.
               'action_name': 'repack_locale_en_us',
               'variables': {
                 'pak_inputs': [
-                  '<(grit_out_dir)/generated_resources_en-US.pak',
-                  '<(grit_out_dir)/locale_settings_en-US.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/chrome/generated_resources_en-US.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/chrome/locale_settings_en-US.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
                 ],
                 'conditions': [
                   ['branding=="Chrome"', {
                     'pak_inputs': [
-                        '<(grit_out_dir)/google_chrome_strings_en-US.pak',
+                        '<(SHARED_INTERMEDIATE_DIR)/chrome/google_chrome_strings_en-US.pak',
                       ]
                   }, {  # else: branding!="Chrome"
                     'pak_inputs': [
-                        '<(grit_out_dir)/chromium_strings_en-US.pak',
+                        '<(SHARED_INTERMEDIATE_DIR)/chrome/chromium_strings_en-US.pak',
                       ]
                   }],
                 ],
               },
               'inputs': [
                 '<(repack_path)',
                 '<@(pak_inputs)',
               ],
               'conditions': [
                 ['OS=="mac"', {
                   'outputs': [
                     '<(INTERMEDIATE_DIR)/repack/en.lproj/locale.pak',
                   ],
                 }, {  # else: OS!="mac"
                   'outputs': [
                     '<(INTERMEDIATE_DIR)/repack/en-US.pak',
                   ],
                 }],
               ],
               'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
               'process_outputs_as_mac_bundle_resources': 1,
             },
             {
               # TODO(mark): Make this work with more languages than the
               # hardcoded da, en-US, he, zh-TW.
               'action_name': 'repack_locale_he',
               'variables': {
                 'pak_inputs': [
-                  '<(grit_out_dir)/generated_resources_he.pak',
-                  '<(grit_out_dir)/locale_settings_he.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/chrome/generated_resources_he.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/chrome/locale_settings_he.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_he.pak',
                 ],
                 'conditions': [
                   ['branding=="Chrome"', {
                     'pak_inputs': [
-                        '<(grit_out_dir)/google_chrome_strings_he.pak',
+                        '<(SHARED_INTERMEDIATE_DIR)/chrome/google_chrome_strings_he.pak',
                       ]
                   }, {  # else: branding!="Chrome"
                     'pak_inputs': [
-                        '<(grit_out_dir)/chromium_strings_he.pak',
+                        '<(SHARED_INTERMEDIATE_DIR)/chrome/chromium_strings_he.pak',
                       ]
                   }],
                 ],
               },
               'inputs': [
                 '<(repack_path)',
                 '<@(pak_inputs)',
               ],
               'conditions': [
                 ['OS=="mac"', {
                   'outputs': [
                     # '<(INTERMEDIATE_DIR)/repack/he.lproj/locale.pak',
                   ],
                 }, {  # else: OS!="mac"
                   'outputs': [
                     '<(INTERMEDIATE_DIR)/repack/he.pak',
                   ],
                 }],
               ],
               'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
             },
             {
               # TODO(mark): Make this work with more languages than the
               # hardcoded da, en-US, he, zh-TW.
               'action_name': 'repack_locale_zh_tw',
               'variables': {
                 'pak_inputs': [
-                  '<(grit_out_dir)/generated_resources_zh-TW.pak',
-                  '<(grit_out_dir)/locale_settings_zh-TW.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/chrome/generated_resources_zh-TW.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/chrome/locale_settings_zh-TW.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_zh-TW.pak',
                 ],
                 'conditions': [
                   ['branding=="Chrome"', {
                     'pak_inputs': [
-                        '<(grit_out_dir)/google_chrome_strings_zh-TW.pak',
+                        '<(SHARED_INTERMEDIATE_DIR)/chrome/google_chrome_strings_zh-TW.pak',
                       ]
                   }, {  # else: branding!="Chrome"
                     'pak_inputs': [
-                        '<(grit_out_dir)/chromium_strings_zh-TW.pak',
+                        '<(SHARED_INTERMEDIATE_DIR)/chrome/chromium_strings_zh-TW.pak',
                       ]
                   }],
                 ],
               },
               'inputs': [
                 '<(repack_path)',
                 '<@(pak_inputs)',
               ],
               'conditions': [
                 ['OS=="mac"', {
@@ skipping 1040 matching lines @@
           ],
           'rules': [
             {
               'rule_name': 'win_version',
               'extension': 'version',
               'variables': {
                 'version_py': '../chrome/tools/build/version.py',
                 'VERSION': '../chrome/VERSION',
                 'template_input_path': 'app/chrome_dll_version.rc.version',
                 'template_output_path':
-                '<(grit_out_dir)/chrome_dll_version.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_dll_version.rc',
               },
               'conditions': [
                 [ 'branding == "Chrome"', {
                   'variables': {
                      'BRANDING':
                        '../chrome/app/theme/google_chrome/BRANDING',
                   },
                 }, { # else branding!="Chrome"
                   'variables': {
                      'BRANDING':
                        '../chrome/app/theme/chromium/BRANDING',
                   },
                 }],
               ],
               'inputs': [
                 '<(template_input_path)',
                 '<(VERSION)',
                 '<(BRANDING)',
               ],
               'outputs': [
                 # Use a non-existant output so this action always runs and
                 # generates version information, e.g. to capture revision
                 # changes, which aren't captured by file dependencies.
-                '<(grit_out_dir)/chrome_dll_version.bogus',
+                '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_dll_version.bogus',
 
                 # And this is the real output, so that the build system knows
                 # what action generates it.
                 '<(template_output_path)',
               ],
               'action': [
                 'python',
                 '<(version_py)',
                 '-f', '<(VERSION)',
                 '-f', '<(BRANDING)',
@@ skipping 590 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],
   ],  # 'conditions'
 }