summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/app/chromium_strings.grd2
-rw-r--r--chrome/app/generated_resources.grd2
-rw-r--r--chrome/app/google_chrome_strings.grd2
-rwxr-xr-xchrome/app/resources/locale_settings.grd2
-rw-r--r--chrome/app/theme/theme_resources.grd2
-rw-r--r--chrome/browser/browser_resources.grd2
-rwxr-xr-xchrome/browser/debugger/resources/debugger_resources.grd2
-rwxr-xr-xchrome/common/common_resources.grd2
-rwxr-xr-xchrome/renderer/renderer_resources.grd2
-rw-r--r--net/base/net_resources.grd2
-rw-r--r--tools/grit/grit/scons.py7
-rw-r--r--tools/grit/grit/tool/build.py20
-rw-r--r--webkit/glue/webkit_resources.grd2
-rw-r--r--webkit/glue/webkit_strings.grd2
-rw-r--r--webkit/tools/test_shell/test_shell_gtk.cc6
-rw-r--r--webkit/tools/test_shell/test_shell_mac.mm4
-rw-r--r--webkit/tools/test_shell/test_shell_resources.grd2
17 files changed, 21 insertions, 42 deletions
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
index aad04c6..07e4230 100644
--- a/chrome/app/chromium_strings.grd
+++ b/chrome/app/chromium_strings.grd
@@ -6,7 +6,7 @@ be available for now. -->
<grit base_dir="." latest_public_release="0" current_release="1"
source_lang_id="en" enc_check="möl">
<outputs>
- <output filename="chromium_strings.h" type="rc_header">
+ <output filename="grit/chromium_strings.h" type="rc_header">
<emit emit_type='prepend'></emit>
</output>
<output filename="chromium_strings_ar.rc" type="rc_all" lang="ar" />
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 463736a..96b4f9b 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6,7 +6,7 @@ each locale. -->
<grit base_dir="." latest_public_release="0" current_release="1"
source_lang_id="en" enc_check="möl">
<outputs>
- <output filename="generated_resources.h" type="rc_header">
+ <output filename="grit/generated_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>
</output>
<output filename="generated_resources_ar.rc" type="rc_all" lang="ar" />
diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd
index 6d71ed7..747c303 100644
--- a/chrome/app/google_chrome_strings.grd
+++ b/chrome/app/google_chrome_strings.grd
@@ -6,7 +6,7 @@ Chrome supports. -->
<grit base_dir="." latest_public_release="0" current_release="1"
source_lang_id="en" enc_check="möl">
<outputs>
- <output filename="google_chrome_strings.h" type="rc_header">
+ <output filename="grit/google_chrome_strings.h" type="rc_header">
<emit emit_type='prepend'></emit>
</output>
<output filename="google_chrome_strings_ar.rc" type="rc_all" lang="ar" />
diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd
index 15735db..163bf39 100755
--- a/chrome/app/resources/locale_settings.grd
+++ b/chrome/app/resources/locale_settings.grd
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1">
<outputs>
- <output filename="locale_settings.h" type="rc_header">
+ <output filename="grit/locale_settings.h" type="rc_header">
<emit emit_type='prepend'></emit>
</output>
<output filename="locale_settings_ar.rc" type="rc_all" lang="ar" />
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index e2cf280..12d25d7 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1">
<outputs>
- <output filename="theme_resources.h" type="rc_header">
+ <output filename="grit/theme_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>
</output>
<output filename="theme_resources.rc" type="rc_all" />
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index 232b88d..c97a02c 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1">
<outputs>
- <output filename="browser_resources.h" type="rc_header">
+ <output filename="grit/browser_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>
</output>
<output filename="browser_resources.rc" type="rc_all" />
diff --git a/chrome/browser/debugger/resources/debugger_resources.grd b/chrome/browser/debugger/resources/debugger_resources.grd
index 37bf7a3..37c1ff4 100755
--- a/chrome/browser/debugger/resources/debugger_resources.grd
+++ b/chrome/browser/debugger/resources/debugger_resources.grd
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1">
<outputs>
- <output filename="debugger_resources.h" type="rc_header">
+ <output filename="grit/debugger_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>
</output>
<output filename="debugger_resources.rc" type="rc_all" />
diff --git a/chrome/common/common_resources.grd b/chrome/common/common_resources.grd
index 07ccf1d..271d219 100755
--- a/chrome/common/common_resources.grd
+++ b/chrome/common/common_resources.grd
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1">
<outputs>
- <output filename="common_resources.h" type="rc_header">
+ <output filename="grit/common_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>
</output>
<output filename="common_resources.rc" type="rc_all" />
diff --git a/chrome/renderer/renderer_resources.grd b/chrome/renderer/renderer_resources.grd
index 30b7d65..6db6ffa 100755
--- a/chrome/renderer/renderer_resources.grd
+++ b/chrome/renderer/renderer_resources.grd
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1">
<outputs>
- <output filename="renderer_resources.h" type="rc_header">
+ <output filename="grit/renderer_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>
</output>
<output filename="renderer_resources.rc" type="rc_all" />
diff --git a/net/base/net_resources.grd b/net/base/net_resources.grd
index 4e64c72..f64dd60 100644
--- a/net/base/net_resources.grd
+++ b/net/base/net_resources.grd
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1">
<outputs>
- <output filename="net_resources.h" type="rc_header">
+ <output filename="grit/net_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>
</output>
<output filename="net_resources.rc" type="rc_all" />
diff --git a/tools/grit/grit/scons.py b/tools/grit/grit/scons.py
index ba1c6c12f..946c72c 100644
--- a/tools/grit/grit/scons.py
+++ b/tools/grit/grit/scons.py
@@ -84,9 +84,6 @@ def _Emitter(target, source, env):
target = []
lang_folders = {}
- # TODO(tc): new_header_output is a hack while we migrate to
- # grit_derived_sources/grit/ as the new output dir for headers.
- new_header_output = None
# Add all explicitly-specified output files
for output in grd.GetOutputFiles():
path = os.path.join(base_dir, output.GetFilename())
@@ -94,7 +91,6 @@ def _Emitter(target, source, env):
if path.endswith('.h'):
path, filename = os.path.split(path)
- new_header_output = os.path.join(path, 'grit', filename)
if _IsDebugEnabled():
print "GRIT: Added target %s" % path
if output.attrs['lang'] != '':
@@ -115,9 +111,6 @@ def _Emitter(target, source, env):
if _IsDebugEnabled():
print "GRIT: Added target %s" % path
- if new_header_output:
- target.append(new_header_output)
-
# GRIT is not thread safe so we should only build one grit target at a time.
# We tell scons about this by making a fake side effect target.
env.SideEffect('grit_lock', target)
diff --git a/tools/grit/grit/tool/build.py b/tools/grit/grit/tool/build.py
index 9e45859..e3e43d6 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
@@ -173,6 +172,11 @@ are exported to translation interchange files (e.g. XMB files), etc.
encoding = 'cp1252'
else:
encoding = 'utf_16'
+
+ # Make the output directory if it doesn't exist.
+ outdir = os.path.split(output.GetOutputFilename())[0]
+ if not os.path.exists(outdir):
+ os.path.makedirs(outdir)
outfile = self.fo_create(output.GetOutputFilename(), 'wb')
if output.GetType() != 'data_package':
@@ -188,22 +192,8 @@ are exported to translation interchange files (e.g. XMB files), etc.
# Iterate in-order through entire resource tree, calling formatters on
# the entry into a node and on exit out of it.
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.
diff --git a/webkit/glue/webkit_resources.grd b/webkit/glue/webkit_resources.grd
index da3d833..2970b70 100644
--- a/webkit/glue/webkit_resources.grd
+++ b/webkit/glue/webkit_resources.grd
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1">
<outputs>
- <output filename="webkit_resources.h" type="rc_header">
+ <output filename="grit/webkit_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>
</output>
<output filename="webkit_resources.rc" type="rc_all" />
diff --git a/webkit/glue/webkit_strings.grd b/webkit/glue/webkit_strings.grd
index e483b69..33dc30c 100644
--- a/webkit/glue/webkit_strings.grd
+++ b/webkit/glue/webkit_strings.grd
@@ -42,7 +42,7 @@ below:
(http://wiki/Main/GritUsersGuide) for more details.
Note that all output references are relative to the output directory
which is specified at build time. -->
- <output filename="webkit_strings.h" type="rc_header">
+ <output filename="grit/webkit_strings.h" type="rc_header">
<emit emit_type='prepend'></emit>
</output>
<output filename="webkit_strings_ar.rc" type="rc_all" lang="ar" />
diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc
index 1fa1d20..5cde156 100644
--- a/webkit/tools/test_shell/test_shell_gtk.cc
+++ b/webkit/tools/test_shell/test_shell_gtk.cc
@@ -19,6 +19,8 @@
#include "base/string16.h"
#include "base/string_piece.h"
#include "base/string_util.h"
+#include "grit/test_shell_resources.h"
+#include "grit/webkit_resources.h"
#include "net/base/mime_util.h"
#include "net/base/net_util.h"
#include "webkit/glue/plugins/plugin_list.h"
@@ -31,10 +33,6 @@
#include "webkit/tools/test_shell/test_navigation_controller.h"
#include "webkit/tools/test_shell/test_webview_delegate.h"
-// Generated by GRIT
-#include "test_shell_resources.h"
-#include "webkit_resources.h"
-
namespace {
// Convert a FilePath into an FcChar* (used by fontconfig).
diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm
index 0f9db5c..55cacd9 100644
--- a/webkit/tools/test_shell/test_shell_mac.mm
+++ b/webkit/tools/test_shell/test_shell_mac.mm
@@ -24,6 +24,7 @@
#include "base/string16.h"
#include "base/string_piece.h"
#include "base/string_util.h"
+#include "grit/webkit_resources.h"
#include "net/base/mime_util.h"
#include "skia/ext/bitmap_platform_device.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -40,9 +41,6 @@
#include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
#include "webkit/tools/test_shell/test_navigation_controller.h"
-// Generated by GRIT
-#include "webkit_resources.h"
-
#import "skia/include/SkBitmap.h"
#import "mac/DumpRenderTreePasteboard.h"
diff --git a/webkit/tools/test_shell/test_shell_resources.grd b/webkit/tools/test_shell/test_shell_resources.grd
index 7f7e93d..f2296b0 100644
--- a/webkit/tools/test_shell/test_shell_resources.grd
+++ b/webkit/tools/test_shell/test_shell_resources.grd
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1">
<outputs>
- <output filename="test_shell_resources.h" type="rc_header">
+ <output filename="grit/test_shell_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>
</output>
<output filename="test_shell_resources.pak" type="data_package" />
generated by cgit v1.1 at 2025-02-19 14:56:05 +0000