diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/chrome.gyp | 15 | ||||
| -rw-r--r-- | chrome/chrome_exe.gypi | 3 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 8 | ||||
| -rw-r--r-- | chrome/installer/mini_installer.gyp | 2 | ||||
| -rw-r--r-- | chrome/installer/mini_installer/chrome.release | 2 | ||||
| -rw-r--r-- | chrome/tools/build/win/FILES | 98 | ||||
| -rw-r--r-- | chrome/tools/build/win/FILES.cfg | 98 |
7 files changed, 118 insertions, 108 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 3662bfd..a15ea8f 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1602,6 +1602,21 @@ 'variables': { 'repack_path': '../tools/data_pack/repack.py', }, + 'dependencies': [ + # MSVS needs the dependencies explictly named, Make is able to + # derive the dependencies from the output files. + 'chrome_resources', + 'chrome_strings', + 'default_plugin/default_plugin.gyp:default_plugin_resources', + 'platform_locale_settings', + 'theme_resources', + '<(DEPTH)/net/net.gyp:net_resources', + '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings', + '<(DEPTH)/ui/ui.gyp:gfx_resources', + '<(DEPTH)/ui/ui.gyp:ui_resources', + '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources', + '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings', + ], 'actions': [ # TODO(mark): These actions are duplicated for the Mac in the # chrome_dll target. Can they be unified? diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index d24b3f5..aa4c491 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -182,7 +182,6 @@ # Needed for chrome_main.cc initialization of libraries. '../build/linux/system.gyp:dbus-glib', '../build/linux/system.gyp:gtk', - 'packed_resources', # Needed to use the master_preferences functions 'installer_util', ], @@ -443,6 +442,7 @@ ], 'dependencies': [ 'packed_extra_resources', + 'packed_resources', # Copy Flash Player files to PRODUCT_DIR if applicable. Let the .gyp # file decide what to do on a per-OS basis; on Mac, internal plugins # go inside the framework, so this dependency is in chrome_dll.gypi. @@ -479,7 +479,6 @@ '../breakpad/breakpad.gyp:breakpad_handler', '../breakpad/breakpad.gyp:breakpad_sender', '../sandbox/sandbox.gyp:sandbox', - 'app/locales/locales.gyp:*', 'app/policy/cloud_policy_codegen.gyp:policy', ], 'sources': [ diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 907aa8c..8c880ea 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -2164,11 +2164,6 @@ }], ], }], - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { - 'dependencies': [ - 'packed_resources', - ], - }], ['OS=="mac"', { # The test fetches resources which means Mac need the app bundle to # exist on disk so it can pull from it. @@ -2221,6 +2216,7 @@ 'dependencies': [ 'convert_dict_lib', 'packed_extra_resources', + 'packed_resources', '../third_party/hunspell/hunspell.gyp:hunspell', ], 'sources!': [ @@ -3216,7 +3212,6 @@ 'dependencies': [ '../build/linux/system.gyp:gtk', '../build/linux/system.gyp:ssl', - 'packed_resources' ], }], ['OS=="mac"', { @@ -3231,6 +3226,7 @@ },{ # OS!="mac" 'dependencies': [ 'packed_extra_resources', + 'packed_resources' ], }], ['OS=="linux" and chromeos==1', { diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp index f33432a..4295fb4 100644 --- a/chrome/installer/mini_installer.gyp +++ b/chrome/installer/mini_installer.gyp @@ -193,7 +193,7 @@ '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', - '<(PRODUCT_DIR)/locales/en-US.dll', + '<(PRODUCT_DIR)/locales/en-US.pak', '<(PRODUCT_DIR)/icudt.dll', ], 'outputs': [ diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release index 1457df1..555c3ee 100644 --- a/chrome/installer/mini_installer/chrome.release +++ b/chrome/installer/mini_installer/chrome.release @@ -39,7 +39,7 @@ nacl_irt_x86_32.nexe: %(VersionDir)s\ nacl_irt_x86_64.nexe: %(VersionDir)s\
icudt.dll: %(VersionDir)s\
resources.pak: %(VersionDir)s\
-locales\*.dll: %(VersionDir)s\Locales
+locales\*.pak: %(VersionDir)s\Locales
servers\*.dll: %(VersionDir)s\
servers\*.exe: %(VersionDir)s\
chrome_frame_helper.exe: %(VersionDir)s\
diff --git a/chrome/tools/build/win/FILES b/chrome/tools/build/win/FILES index d00e39d..338415b 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.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 +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 resources.pak wow_helper.exe gcswf32.dll diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg index 4fc4214..35657a3 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.dll', + 'filename': 'locales/ar.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/bg.dll', + 'filename': 'locales/bg.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/bn.dll', + 'filename': 'locales/bn.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/ca.dll', + 'filename': 'locales/ca.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/cs.dll', + 'filename': 'locales/cs.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/da.dll', + 'filename': 'locales/da.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/de.dll', + 'filename': 'locales/de.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/el.dll', + 'filename': 'locales/el.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/en-GB.dll', + 'filename': 'locales/en-GB.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/en-US.dll', + 'filename': 'locales/en-US.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/es-419.dll', + 'filename': 'locales/es-419.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/es.dll', + 'filename': 'locales/es.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/et.dll', + 'filename': 'locales/et.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/fi.dll', + 'filename': 'locales/fi.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/fil.dll', + 'filename': 'locales/fil.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/fr.dll', + 'filename': 'locales/fr.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/gu.dll', + 'filename': 'locales/gu.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/he.dll', + 'filename': 'locales/he.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/hi.dll', + 'filename': 'locales/hi.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/hr.dll', + 'filename': 'locales/hr.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/hu.dll', + 'filename': 'locales/hu.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/id.dll', + 'filename': 'locales/id.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/it.dll', + 'filename': 'locales/it.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/ja.dll', + 'filename': 'locales/ja.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/kn.dll', + 'filename': 'locales/kn.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/ko.dll', + 'filename': 'locales/ko.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/lt.dll', + 'filename': 'locales/lt.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/lv.dll', + 'filename': 'locales/lv.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/ml.dll', + 'filename': 'locales/ml.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/mr.dll', + 'filename': 'locales/mr.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/nb.dll', + 'filename': 'locales/nb.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/nl.dll', + 'filename': 'locales/nl.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/pl.dll', + 'filename': 'locales/pl.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/pt-BR.dll', + 'filename': 'locales/pt-BR.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/pt-PT.dll', + 'filename': 'locales/pt-PT.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/ro.dll', + 'filename': 'locales/ro.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/ru.dll', + 'filename': 'locales/ru.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/sk.dll', + 'filename': 'locales/sk.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/sl.dll', + 'filename': 'locales/sl.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/sr.dll', + 'filename': 'locales/sr.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/sv.dll', + 'filename': 'locales/sv.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/ta.dll', + 'filename': 'locales/ta.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/te.dll', + 'filename': 'locales/te.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/th.dll', + 'filename': 'locales/th.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/tr.dll', + 'filename': 'locales/tr.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/uk.dll', + 'filename': 'locales/uk.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/vi.dll', + 'filename': 'locales/vi.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/zh-CN.dll', + 'filename': 'locales/zh-CN.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, { - 'filename': 'locales/zh-TW.dll', + 'filename': 'locales/zh-TW.pak', 'arch': ['32bit', '64bit'], 'buildtype': ['dev', 'official'], }, |