Revert last checkin to fix resources in Release builds.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/119075

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

9 files changed, 60 insertions, 56 deletions

diff --git a/chrome/app/chrome_dll.vcproj b/chrome/app/chrome_dll.vcproj
index 7e6c65f..a75157d 100644
--- a/chrome/app/chrome_dll.vcproj
+++ b/chrome/app/chrome_dll.vcproj
@@ -170,7 +170,7 @@
 				>
 			</File>
 			<File
-				RelativePath="$(OutDir)\obj\global_intermediate_dir\chrome\browser_resources.rc"
+				RelativePath="$(OutDir)\grit_derived_sources\browser_resources.rc"
 				>
 			</File>
 			<File
@@ -202,7 +202,7 @@
 				>
 			</File>
 			<File
-				RelativePath="$(OutDir)\obj\global_intermediate_dir\chrome\common_resources.rc"
+				RelativePath="$(OutDir)\grit_derived_sources\common_resources.rc"
 				>
 			</File>
 			<File
@@ -210,7 +210,7 @@
 				>
 			</File>
 			<File
-				RelativePath="$(OutDir)\obj\global_intermediate_dir\chrome\debugger_resources.rc"
+				RelativePath="$(OutDir)\grit_derived_sources\debugger_resources.rc"
 				>
 			</File>
 			<File
@@ -218,7 +218,7 @@
 				>
 			</File>
 			<File
-				RelativePath="$(OutDir)\obj\global_intermediate_dir\chrome\renderer_resources.rc"
+				RelativePath="$(OutDir)\grit_derived_sources\renderer_resources.rc"
 				>
 			</File>
 			<File
diff --git a/chrome/app/locales/locales.gyp b/chrome/app/locales/locales.gyp
index c2f0ed7..8295030 100644
--- a/chrome/app/locales/locales.gyp
+++ b/chrome/app/locales/locales.gyp
@@ -1,7 +1,9 @@
 {
   'variables': {
     'chromium_code': 1,
-    'chrome_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
+    # Switch to with chrome.sln landing.
+    #'chrome_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
+    'chrome_grit_out_dir': '$(OutDir)/grit_derived_sources',
     'app_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/app',
     'webkit_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit',
 
diff --git a/chrome/app/theme/theme_dll.vcproj b/chrome/app/theme/theme_dll.vcproj
index 7f0078b..a1c0c66 100644
--- a/chrome/app/theme/theme_dll.vcproj
+++ b/chrome/app/theme/theme_dll.vcproj
@@ -140,7 +140,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="$(OutDir)\obj\global_intermediate\chrome\theme_resources.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\theme_resources.rc"
 			>
 		</File>
 		<File
diff --git a/chrome/browser/browser.vcproj b/chrome/browser/browser.vcproj
index 7347be9..d11b0dc 100644
--- a/chrome/browser/browser.vcproj
+++ b/chrome/browser/browser.vcproj
@@ -2765,7 +2765,7 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\obj\global_intermediate\chrome\grit\theme_resources_map.cc"
+			RelativePath="$(OutDir)\grit_derived_sources\grit\theme_resources_map.cc"
 			>
 		</File>
 		<File
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 78a346d..2398f2c 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -62,6 +62,7 @@
       'target_name': 'chrome_resources',
       'type': 'none',
       'msvs_guid': 'B95AB527-F7DB-41E9-AD91-EB51EE0F56BE',
+      'msvs_existing_vcproj': 'app/chrome_resources.vcproj',
       'rules': [
         {
           'rule_name': 'grit',
@@ -84,11 +85,11 @@
             '../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)',
           ],
@@ -104,7 +105,7 @@
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '<(grit_out_dir)',
+          '<(SHARED_INTERMEDIATE_DIR)/chrome',
         ],
       },
       'conditions': [
@@ -121,6 +122,7 @@
       'target_name': 'chrome_strings',
       'type': 'none',
       'msvs_guid': 'D9DDAF60-663F-49CC-90DC-3D08CC3D1B28',
+      'msvs_existing_vcproj': 'app/chrome_strings.vcproj',
       'rules': [
         {
           'rule_name': 'grit',
@@ -141,14 +143,14 @@
             '../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)',
         },
@@ -162,7 +164,7 @@
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '<(grit_out_dir)',
+          '<(SHARED_INTERMEDIATE_DIR)/chrome',
         ],
       },
       'conditions': [
@@ -211,7 +213,7 @@
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '<(grit_out_dir)',
+          '<(SHARED_INTERMEDIATE_DIR)/chrome',
         ],
       },
       'conditions': [
@@ -1554,7 +1556,7 @@
         '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"', {
@@ -2416,10 +2418,10 @@
               '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',
                 ],
@@ -2439,7 +2441,7 @@
               'variables': {
                 'pak_inputs': [
                   '<(SHARED_INTERMEDIATE_DIR)/app/app_resources.pak',
-                  '<(grit_out_dir)/theme_resources.pak',
+                  '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.pak',
                 ],
               },
               'inputs': [
@@ -2465,18 +2467,18 @@
               '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',
                       ]
                   }],
                 ],
@@ -2509,18 +2511,18 @@
               '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',
                       ]
                   }],
                 ],
@@ -2549,18 +2551,18 @@
               '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',
                       ]
                   }],
                 ],
@@ -2588,18 +2590,18 @@
               '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',
                       ]
                   }],
                 ],
@@ -3660,7 +3662,7 @@
                 '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"', {
@@ -3684,7 +3686,7 @@
                 # 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.
diff --git a/chrome/test/browser/browser_tests_dll.vcproj b/chrome/test/browser/browser_tests_dll.vcproj
index eff0c84..553b4b5 100644
--- a/chrome/test/browser/browser_tests_dll.vcproj
+++ b/chrome/test/browser/browser_tests_dll.vcproj
@@ -226,7 +226,7 @@
 				>

 			</File>

 			<File

-				RelativePath="$(OutDir)\obj\global_intermediate\chrome\browser_resources.rc"

+				RelativePath="$(OutDir)\grit_derived_sources\browser_resources.rc"

 				>

 			</File>

 			<File

@@ -250,7 +250,7 @@
 				>

 			</File>

 			<File

-				RelativePath="$(OutDir)\obj\global_intermediate\chrome\common_resources.rc"

+				RelativePath="$(OutDir)\grit_derived_sources\common_resources.rc"

 				>

 			</File>

 			<File

@@ -258,7 +258,7 @@
 				>

 			</File>

 			<File

-				RelativePath="$(OutDir)\obj\global_intermediate\chrome\debugger_resources.rc"

+				RelativePath="$(OutDir)\grit_derived_sources\debugger_resources.rc"

 				>

 			</File>

 			<File

@@ -266,7 +266,7 @@
 				>

 			</File>

 			<File

-				RelativePath="$(OutDir)\obj\global_intermediate\chrome\renderer_resources.rc"

+				RelativePath="$(OutDir)\grit_derived_sources\renderer_resources.rc"

 				>

 			</File>

 			<File

diff --git a/chrome/test/interactive_ui/interactive_ui.vcproj b/chrome/test/interactive_ui/interactive_ui.vcproj
index 5038d88..8fb86d7 100644
--- a/chrome/test/interactive_ui/interactive_ui.vcproj
+++ b/chrome/test/interactive_ui/interactive_ui.vcproj
@@ -248,7 +248,7 @@
 				>
 			</File>
 			<File
-				RelativePath="$(OutDir)\obj\global_intermediate\chrome\browser_resources.rc"
+				RelativePath="$(OutDir)\grit_derived_sources\browser_resources.rc"
 				>
 			</File>
 			<File
@@ -272,7 +272,7 @@
 				>
 			</File>
 			<File
-				RelativePath="$(OutDir)\obj\global_intermediate\chrome\common_resources.rc"
+				RelativePath="$(OutDir)\grit_derived_sources\common_resources.rc"
 				>
 			</File>
 			<File
@@ -280,7 +280,7 @@
 				>
 			</File>
 			<File
-				RelativePath="$(OutDir)\obj\global_intermediate\chrome\debugger_resources.rc"
+				RelativePath="$(OutDir)\grit_derived_sources\debugger_resources.rc"
 				>
 			</File>
 			<File
@@ -288,7 +288,7 @@
 				>
 			</File>
 			<File
-				RelativePath="$(OutDir)\obj\global_intermediate\chrome\renderer_resources.rc"
+				RelativePath="$(OutDir)\grit_derived_sources\renderer_resources.rc"
 				>
 			</File>
 			<File
diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj
index 34fa37f..ad678b9 100644
--- a/chrome/test/unit/unittests.vcproj
+++ b/chrome/test/unit/unittests.vcproj
@@ -318,7 +318,7 @@
 				>
 			</File>
 			<File
-				RelativePath="$(OutDir)\obj\global_intermediate\chrome\browser_resources.rc"
+				RelativePath="$(OutDir)\grit_derived_sources\browser_resources.rc"
 				>
 			</File>
 			<File
@@ -342,7 +342,7 @@
 				>
 			</File>
 			<File
-				RelativePath="$(OutDir)\obj\global_intermediate\chrome\common_resources.rc"
+				RelativePath="$(OutDir)\grit_derived_sources\common_resources.rc"
 				>
 			</File>
 			<File
@@ -350,7 +350,7 @@
 				>
 			</File>
 			<File
-				RelativePath="$(OutDir)\obj\global_intermediate\chrome\debugger_resources.rc"
+				RelativePath="$(OutDir)\grit_derived_sources\debugger_resources.rc"
 				>
 			</File>
 			<File
@@ -358,7 +358,7 @@
 				>
 			</File>
 			<File
-				RelativePath="$(OutDir)\obj\global_intermediate\chrome\renderer_resources.rc"
+				RelativePath="$(OutDir)\grit_derived_sources\renderer_resources.rc"
 				>
 			</File>
 			<File
diff --git a/chrome/tools/build/win/language_dll.vsprops b/chrome/tools/build/win/language_dll.vsprops
index c7e8d03..732537e 100644
--- a/chrome/tools/build/win/language_dll.vsprops
+++ b/chrome/tools/build/win/language_dll.vsprops
@@ -11,6 +11,6 @@
 	/>
 	<Tool
 		Name="VCResourceCompilerTool"
-                AdditionalIncludeDirectories="$(OutDir)\obj\global_intermediate\webkit;$(OutDir)\obj\global_intermediate\chrome"
+                AdditionalIncludeDirectories="$(OutDir)\obj\global_intermediate\webkit;$(OutDir)\grit_derived_sources"
 	/>
 </VisualStudioPropertySheet>