summaryrefslogtreecommitdiffstats
path: root/chrome/tools
diff options
context:
space:
mode:
authorbattre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-26 16:20:21 +0000
committerbattre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-26 16:20:21 +0000
commit4ea09f19e7e3223022ddc8023679a39c6be9d72d (patch)
tree6aa710de30ea1075215a134a56dfbd3fea50a8d2 /chrome/tools
parent4a0eaee250e932c453dcff65e4c8874a38321c29 (diff)
downloadchromium_src-4ea09f19e7e3223022ddc8023679a39c6be9d72d.zip
chromium_src-4ea09f19e7e3223022ddc8023679a39c6be9d72d.tar.gz
chromium_src-4ea09f19e7e3223022ddc8023679a39c6be9d72d.tar.bz2
Revert 98103 - Switch to using .pak files for locale data on Windows.
We were using .dlls, but the .pak files are smaller and this will allow us to share more code across platforms. - Remove app/locales.gyp (used on win to generate the locale dlls) and references to it in other gyp(i) files. - Update various packaging scripts. - Move functions from resource_bundle_posix.cc to resource_bundle.cc (LoadResourcesDataPak, UnloadLocaleResources, GetLocalizedString, LoadLocaleResources) and delete the corresponding functions from resource_bundle_win.cc. Fixes from previous patch: - Made dependencies of packed_resources explicit (MSVS can't figure it out from the inputs). - Removed a couple cases where we were looking for dlls on Windows (in l10n_util.cc and l10n_util_unittest.cc). BUG=92724 TBR=cpu Review URL: http://codereview.chromium.org/7714028 TBR=tony@chromium.org Review URL: http://codereview.chromium.org/7744053 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98426 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/tools')
-rw-r--r--chrome/tools/build/win/FILES98
-rw-r--r--chrome/tools/build/win/FILES.cfg98
2 files changed, 98 insertions, 98 deletions
diff --git a/chrome/tools/build/win/FILES b/chrome/tools/build/win/FILES
index 338415b..d00e39d 100644
--- a/chrome/tools/build/win/FILES
+++ b/chrome/tools/build/win/FILES
@@ -12,55 +12,55 @@ ppGoogleNaClPluginChrome.dll
nacl_irt_x86_32.nexe
nacl_irt_x86_64.nexe
icudt.dll
-locales/ar.pak
-locales/bg.pak
-locales/bn.pak
-locales/ca.pak
-locales/cs.pak
-locales/da.pak
-locales/de.pak
-locales/el.pak
-locales/en-GB.pak
-locales/en-US.pak
-locales/es-419.pak
-locales/es.pak
-locales/et.pak
-locales/fi.pak
-locales/fil.pak
-locales/fr.pak
-locales/gu.pak
-locales/he.pak
-locales/hi.pak
-locales/hr.pak
-locales/hu.pak
-locales/id.pak
-locales/it.pak
-locales/ja.pak
-locales/kn.pak
-locales/ko.pak
-locales/lt.pak
-locales/lv.pak
-locales/ml.pak
-locales/mr.pak
-locales/nb.pak
-locales/nl.pak
-locales/pl.pak
-locales/pt-BR.pak
-locales/pt-PT.pak
-locales/ro.pak
-locales/ru.pak
-locales/sk.pak
-locales/sl.pak
-locales/sr.pak
-locales/sv.pak
-locales/ta.pak
-locales/te.pak
-locales/th.pak
-locales/tr.pak
-locales/uk.pak
-locales/vi.pak
-locales/zh-CN.pak
-locales/zh-TW.pak
+locales/ar.dll
+locales/bg.dll
+locales/bn.dll
+locales/ca.dll
+locales/cs.dll
+locales/da.dll
+locales/de.dll
+locales/el.dll
+locales/en-GB.dll
+locales/en-US.dll
+locales/es-419.dll
+locales/es.dll
+locales/et.dll
+locales/fi.dll
+locales/fil.dll
+locales/fr.dll
+locales/gu.dll
+locales/he.dll
+locales/hi.dll
+locales/hr.dll
+locales/hu.dll
+locales/id.dll
+locales/it.dll
+locales/ja.dll
+locales/kn.dll
+locales/ko.dll
+locales/lt.dll
+locales/lv.dll
+locales/ml.dll
+locales/mr.dll
+locales/nb.dll
+locales/nl.dll
+locales/pl.dll
+locales/pt-BR.dll
+locales/pt-PT.dll
+locales/ro.dll
+locales/ru.dll
+locales/sk.dll
+locales/sl.dll
+locales/sr.dll
+locales/sv.dll
+locales/ta.dll
+locales/te.dll
+locales/th.dll
+locales/tr.dll
+locales/uk.dll
+locales/vi.dll
+locales/zh-CN.dll
+locales/zh-TW.dll
resources.pak
wow_helper.exe
gcswf32.dll
diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg
index 35657a3..4fc4214 100644
--- a/chrome/tools/build/win/FILES.cfg
+++ b/chrome/tools/build/win/FILES.cfg
@@ -71,247 +71,247 @@ FILES = [
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/ar.pak',
+ 'filename': 'locales/ar.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/bg.pak',
+ 'filename': 'locales/bg.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/bn.pak',
+ 'filename': 'locales/bn.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/ca.pak',
+ 'filename': 'locales/ca.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/cs.pak',
+ 'filename': 'locales/cs.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/da.pak',
+ 'filename': 'locales/da.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/de.pak',
+ 'filename': 'locales/de.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/el.pak',
+ 'filename': 'locales/el.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/en-GB.pak',
+ 'filename': 'locales/en-GB.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/en-US.pak',
+ 'filename': 'locales/en-US.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/es-419.pak',
+ 'filename': 'locales/es-419.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/es.pak',
+ 'filename': 'locales/es.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/et.pak',
+ 'filename': 'locales/et.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/fi.pak',
+ 'filename': 'locales/fi.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/fil.pak',
+ 'filename': 'locales/fil.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/fr.pak',
+ 'filename': 'locales/fr.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/gu.pak',
+ 'filename': 'locales/gu.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/he.pak',
+ 'filename': 'locales/he.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/hi.pak',
+ 'filename': 'locales/hi.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/hr.pak',
+ 'filename': 'locales/hr.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/hu.pak',
+ 'filename': 'locales/hu.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/id.pak',
+ 'filename': 'locales/id.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/it.pak',
+ 'filename': 'locales/it.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/ja.pak',
+ 'filename': 'locales/ja.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/kn.pak',
+ 'filename': 'locales/kn.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/ko.pak',
+ 'filename': 'locales/ko.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/lt.pak',
+ 'filename': 'locales/lt.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/lv.pak',
+ 'filename': 'locales/lv.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/ml.pak',
+ 'filename': 'locales/ml.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/mr.pak',
+ 'filename': 'locales/mr.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/nb.pak',
+ 'filename': 'locales/nb.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/nl.pak',
+ 'filename': 'locales/nl.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/pl.pak',
+ 'filename': 'locales/pl.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/pt-BR.pak',
+ 'filename': 'locales/pt-BR.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/pt-PT.pak',
+ 'filename': 'locales/pt-PT.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/ro.pak',
+ 'filename': 'locales/ro.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/ru.pak',
+ 'filename': 'locales/ru.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/sk.pak',
+ 'filename': 'locales/sk.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/sl.pak',
+ 'filename': 'locales/sl.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/sr.pak',
+ 'filename': 'locales/sr.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/sv.pak',
+ 'filename': 'locales/sv.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/ta.pak',
+ 'filename': 'locales/ta.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/te.pak',
+ 'filename': 'locales/te.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/th.pak',
+ 'filename': 'locales/th.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/tr.pak',
+ 'filename': 'locales/tr.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/uk.pak',
+ 'filename': 'locales/uk.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/vi.pak',
+ 'filename': 'locales/vi.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/zh-CN.pak',
+ 'filename': 'locales/zh-CN.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'locales/zh-TW.pak',
+ 'filename': 'locales/zh-TW.dll',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},