summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-05 21:58:01 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-05 21:58:01 +0000
commita05fffa7acec4c20372eac4a9f3401602fe72efc (patch)
tree2b57e8c3815f12f7daee3dec16efd1702aa82315 /tools
parentca2865d4a3c9c007d713eb16a6dc7aea036b7964 (diff)
downloadchromium_src-a05fffa7acec4c20372eac4a9f3401602fe72efc.zip
chromium_src-a05fffa7acec4c20372eac4a9f3401602fe72efc.tar.gz
chromium_src-a05fffa7acec4c20372eac4a9f3401602fe72efc.tar.bz2
Some more GRIT refactoring.
Moved the grit .vsprops file from chrome/tools/build/win/ to /tools/grit/build and renamed to using_generated_resources.vsprops. Updated non-chrome projects to use the this new vsprops file. Created a new .rules file and renamed the old one. Now there are grit_resources.rules and grit_localized_resources.rules. The latter is what we use now, but I'll be adding some grd files that use the former in a follow up change. This is just vsprops reshuffling for now. I'll also add a using_generated_resources.scons in a follow up change. Review URL: http://codereview.chromium.org/14901 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7560 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rw-r--r--tools/grit/build/grit_localized_resources.rules (renamed from tools/grit/build/grit_resource_file.rules)6
-rw-r--r--tools/grit/build/grit_resources.rules20
-rw-r--r--tools/grit/build/using_generated_resources.vsprops11
3 files changed, 34 insertions, 3 deletions
diff --git a/tools/grit/build/grit_resource_file.rules b/tools/grit/build/grit_localized_resources.rules
index 2f9e7f9..9c3a53b 100644
--- a/tools/grit/build/grit_resource_file.rules
+++ b/tools/grit/build/grit_localized_resources.rules
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<VisualStudioToolFile
- Name="GRIT resource data file"
+ Name="GRIT localized resources"
Version="8.00"
>
<Rules>
<CustomBuildRule
- Name="GRIT Generated Resources"
- DisplayName="GRIT Generated Resources"
+ Name="GRIT Generated Localized Resources"
+ DisplayName="GRIT Generated Localized Resources"
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;
$(OutDir)\grit_derived_sources\$(InputName)_ar.rc;
diff --git a/tools/grit/build/grit_resources.rules b/tools/grit/build/grit_resources.rules
new file mode 100644
index 0000000..0f1614c
--- /dev/null
+++ b/tools/grit/build/grit_resources.rules
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<VisualStudioToolFile
+ Name="GRIT resources"
+ Version="8.00"
+ >
+ <Rules>
+ <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;"
+ 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>
+ </Properties>
+ </CustomBuildRule>
+ </Rules>
+</VisualStudioToolFile>
diff --git a/tools/grit/build/using_generated_resources.vsprops b/tools/grit/build/using_generated_resources.vsprops
new file mode 100644
index 0000000..4295061
--- /dev/null
+++ b/tools/grit/build/using_generated_resources.vsprops
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="using_generated_resources"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="&quot;$(OutDir)\grit_derived_sources&quot;"
+ />
+</VisualStudioPropertySheet>