Revert "Create a chrome_resources.vcproj that holds grd files that hold"

This reverts commit r9631.
TBR=deanm

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


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

3 files changed, 2 insertions, 38 deletions

diff --git a/tools/grit/build/grit_resource_file.bat b/tools/grit/build/grit_resource_file.bat
index bc5af21..9769bef 100644
--- a/tools/grit/build/grit_resource_file.bat
+++ b/tools/grit/build/grit_resource_file.bat
@@ -9,24 +9,11 @@ set InFile=%~1
 set SolutionDir=%~2
 set OutDir=%~3
 
-:: We treat the next five args as preprocessor defines for grit.
-set PreProc1=%~4
-set PreProc2=%~5
-set PreProc3=%~6
-set PreProc4=%~7
-set PreProc5=%~8
-
 IF NOT EXIST %OutDir% (
 mkdir %OutDir%
 )
 
-IF NOT (%PreProc1%)==() set PreProc1=-D %PreProc1%
-IF NOT (%PreProc2%)==() set PreProc2=-D %PreProc2%
-IF NOT (%PreProc3%)==() set PreProc3=-D %PreProc3%
-IF NOT (%PreProc4%)==() set PreProc4=-D %PreProc4%
-IF NOT (%PreProc5%)==() set PreProc5=-D %PreProc5%
-
 :: Put cygwin in the path
 call %SolutionDir%\..\third_party\cygwin\setup_env.bat
 
-%SolutionDir%\..\third_party\python_24\python.exe %SolutionDir%\..\tools\grit\grit.py -i %InFile% build -o %OutDir% %PreProc1% %PreProc2% %PreProc3% %PreProc4% %PreProc5%
+%SolutionDir%\..\third_party\python_24\python.exe %SolutionDir%\..\tools\grit\grit.py -i %InFile% build -o %OutDir%
diff --git a/tools/grit/build/grit_resources.rules b/tools/grit/build/grit_resources.rules
index d686fed..0f1614c 100644
--- a/tools/grit/build/grit_resources.rules
+++ b/tools/grit/build/grit_resources.rules
@@ -7,21 +7,13 @@
 		<CustomBuildRule
 			Name="GRIT Generated Resources"
 			DisplayName="GRIT Generated Resources"
-			CommandLine="$(SolutionDir)..\tools\grit\build\grit_resource_file.bat [inputs] &quot;$(SolutionDir)&quot; &quot;$(OutDir)\grit_derived_sources&quot; [AllOptions]"
+			CommandLine="$(SolutionDir)..\tools\grit\build\grit_resource_file.bat [inputs] &quot;$(SolutionDir)&quot; &quot;$(OutDir)\grit_derived_sources&quot;"
 			Outputs="$(OutDir)\grit_derived_sources\$(InputName).h"
 			AdditionalDependencies="$(SolutionDir)..\tools\grit\build\grit_resource_file.bat;$(SolutionDir)..\tools\grit\grit.py"
 			FileExtensions="*.grd"
 			ExecutionDescription="Generating resources..."
 			>
 			<Properties>
-			  <StringProperty
-			    Name="PreprocessorDefinitions"
-			    DisplayName="Preprocessor Definitions"
-			    Description="Defines a text macro with the given name."
-			    Switch="&quot;[value]&quot;"
-			    Delimited="true"
-			    Inheritable="true"
-        />
 			</Properties>
 		</CustomBuildRule>
 	</Rules>
diff --git a/tools/grit/grit/tool/build.py b/tools/grit/grit/tool/build.py
index 9e45859..ab89809 100644
--- a/tools/grit/grit/tool/build.py
+++ b/tools/grit/grit/tool/build.py
@@ -10,7 +10,6 @@ SCons build system.
 import os
 import getopt
 import types
-import shutil
 import sys
 
 from grit import grd_reader
@@ -190,20 +189,6 @@ are exported to translation interchange files (e.g. XMB files), etc.
       self.ProcessNode(self.res, output, outfile)
       
       outfile.close()
-
-      # Generate the header and also put a copy in a grit subdir.  We do this
-      # so our include paths can have 'grit' in them.
-      # TODO(tc): Once we transition all the #include lines to have 'grit' in
-      # the path, we can only generate one header.
-      if output.GetType() == 'rc_header':
-        dir_name, header_name = os.path.split(output.GetOutputFilename())
-        dir_name = os.path.join(dir_name, 'grit')
-        try:
-          os.makedirs(dir_name)
-        except OSError, e:
-          pass
-        shutil.copy2(output.GetOutputFilename(),
-                     os.path.join(dir_name, header_name))
       self.VerboseOut(' done.\n')
     
     # Print warnings if there are any duplicate shortcuts.