Skip to content

GitLab

T
tangled
Commit c8fd3d44 authored by tony@chromium.org's avatar tony@chromium.org
Browse files
Options

Enable the packed_resources target on Windows. 

This target generates the locale .pak files on Windows.  Since nothing
depends on this target, it doesn't build by default (they're not used
yet).

Specific changes:
- Have locale_settings_win.grd generate .pak files.
- Use pymod_do_main to avoid some shell escaping problems (and it's a bit
  faster).
- Rewrite repack_locales.py to work with pymod_do_main.

BUG=92724


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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97012 0039d316-1c4b-4281-b951-d872f2087c98
parent cdb1ca5d
Hide whitespace changes
Inline Side-by-side
Showing with 123 additions and 76 deletions
build/gyp_chromium
View file @ c8fd3d44
......@@ -19,8 +19,9 @@ chrome_src = os.path.abspath(os.path.join(script_dir, os.pardir))
sys.path.insert(0, os.path.join(chrome_src, 'tools', 'gyp', 'pylib'))
import gyp
# Add tools/grit so that pymod_do_main(grit_info ...) can find grit_info.py.
# Add paths so that pymod_do_main(...) can import files.
sys.path.insert(1, os.path.join(chrome_src, 'tools', 'grit'))
sys.path.insert(1, os.path.join(chrome_src, 'chrome', 'tools', 'build'))
# On Windows, Psyco shortens warm runs of build/gyp_chromium by about
......
chrome/app/resources/locale_settings_win.grd
View file @ c8fd3d44
......@@ -59,6 +59,62 @@
<output filename="platform_locale_settings_zh-CN.rc" type="rc_all" lang="zh-CN" />
<output filename="platform_locale_settings_zh-TW.rc" type="rc_all" lang="zh-TW" />
<output filename="platform_locale_settings_fake-bidi.rc" type="rc_all" lang="fake-bidi" />
<output filename="platform_locale_settings_am.pak" type="data_package" lang="am" />
<output filename="platform_locale_settings_ar.pak" type="data_package" lang="ar" />
<output filename="platform_locale_settings_bg.pak" type="data_package" lang="bg" />
<output filename="platform_locale_settings_bn.pak" type="data_package" lang="bn" />
<output filename="platform_locale_settings_ca.pak" type="data_package" lang="ca" />
<output filename="platform_locale_settings_cs.pak" type="data_package" lang="cs" />
<output filename="platform_locale_settings_da.pak" type="data_package" lang="da" />
<output filename="platform_locale_settings_de.pak" type="data_package" lang="de" />
<output filename="platform_locale_settings_el.pak" type="data_package" lang="el" />
<output filename="platform_locale_settings_en-GB.pak" type="data_package" lang="en-GB" />
<output filename="platform_locale_settings_en-US.pak" type="data_package" lang="en" />
<output filename="platform_locale_settings_es.pak" type="data_package" lang="es" />
<output filename="platform_locale_settings_es-419.pak" type="data_package" lang="es-419" />
<output filename="platform_locale_settings_et.pak" type="data_package" lang="et" />
<output filename="platform_locale_settings_fa.pak" type="data_package" lang="fa" />
<output filename="platform_locale_settings_fi.pak" type="data_package" lang="fi" />
<output filename="platform_locale_settings_fil.pak" type="data_package" lang="fil" />
<output filename="platform_locale_settings_fr.pak" type="data_package" lang="fr" />
<output filename="platform_locale_settings_gu.pak" type="data_package" lang="gu" />
<output filename="platform_locale_settings_he.pak" type="data_package" lang="he" />
<output filename="platform_locale_settings_hi.pak" type="data_package" lang="hi" />
<output filename="platform_locale_settings_hr.pak" type="data_package" lang="hr" />
<output filename="platform_locale_settings_hu.pak" type="data_package" lang="hu" />
<output filename="platform_locale_settings_id.pak" type="data_package" lang="id" />
<output filename="platform_locale_settings_it.pak" type="data_package" lang="it" />
<output filename="platform_locale_settings_ja.pak" type="data_package" lang="ja" />
<output filename="platform_locale_settings_kn.pak" type="data_package" lang="kn" />
<output filename="platform_locale_settings_ko.pak" type="data_package" lang="ko" />
<output filename="platform_locale_settings_lt.pak" type="data_package" lang="lt" />
<output filename="platform_locale_settings_lv.pak" type="data_package" lang="lv" />
<output filename="platform_locale_settings_ml.pak" type="data_package" lang="ml" />
<output filename="platform_locale_settings_mr.pak" type="data_package" lang="mr" />
<output filename="platform_locale_settings_nl.pak" type="data_package" lang="nl" />
<!-- The translation console uses 'no' for Norwegian Bokmål. It should
be 'nb'. -->
<output filename="platform_locale_settings_nb.pak" type="data_package" lang="no" />
<output filename="platform_locale_settings_pl.pak" type="data_package" lang="pl" />
<output filename="platform_locale_settings_pt-BR.pak" type="data_package" lang="pt-BR" />
<output filename="platform_locale_settings_pt-PT.pak" type="data_package" lang="pt-PT" />
<output filename="platform_locale_settings_ro.pak" type="data_package" lang="ro" />
<output filename="platform_locale_settings_ru.pak" type="data_package" lang="ru" />
<output filename="platform_locale_settings_sk.pak" type="data_package" lang="sk" />
<output filename="platform_locale_settings_sl.pak" type="data_package" lang="sl" />
<output filename="platform_locale_settings_sr.pak" type="data_package" lang="sr" />
<output filename="platform_locale_settings_sv.pak" type="data_package" lang="sv" />
<output filename="platform_locale_settings_sw.pak" type="data_package" lang="sw" />
<output filename="platform_locale_settings_ta.pak" type="data_package" lang="ta" />
<output filename="platform_locale_settings_te.pak" type="data_package" lang="te" />
<output filename="platform_locale_settings_th.pak" type="data_package" lang="th" />
<output filename="platform_locale_settings_tr.pak" type="data_package" lang="tr" />
<output filename="platform_locale_settings_uk.pak" type="data_package" lang="uk" />
<output filename="platform_locale_settings_vi.pak" type="data_package" lang="vi" />
<output filename="platform_locale_settings_zh-CN.pak" type="data_package" lang="zh-CN" />
<output filename="platform_locale_settings_zh-TW.pak" type="data_package" lang="zh-TW" />
<output filename="platform_locale_settings_fake-bidi.pak" type="data_package" lang="fake-bidi" />
</outputs>
<translations>
<file path="platform_locale_settings/locale_settings_win_am.xtb" lang="am" />
......
chrome/chrome.gyp
View file @ c8fd3d44
......@@ -1616,7 +1616,7 @@
},
]}, # 'targets'
], # OS=="win"
['os_posix == 1 and OS != "mac"', {
['OS != "mac"', {
'targets': [{
'target_name': 'packed_resources',
'type': 'none',
......@@ -1681,15 +1681,10 @@
},
'inputs': [
'tools/build/repack_locales.py',
# NOTE: Ideally the common command args would be shared amongst
# inputs/outputs/action, but the args include shell variables
# which need to be passed intact, and command expansion wants
# to expand the shell variables. Adding the explicit quoting
# here was the only way it seemed to work.
'>!@(<(repack_locales_cmd) -i <(branding_flag) -g \'<(grit_out_dir)\' -s \'<(SHARED_INTERMEDIATE_DIR)\' -x \'<(INTERMEDIATE_DIR)\' <(locales))',
'<!@pymod_do_main(repack_locales -i <(branding_flag) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(INTERMEDIATE_DIR) <(locales))'
],
'outputs': [
'>!@(<(repack_locales_cmd) -o -g \'<(grit_out_dir)\' -s \'<(SHARED_INTERMEDIATE_DIR)\' -x \'<(INTERMEDIATE_DIR)\' <(locales))',
'<!@pymod_do_main(repack_locales -o -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(INTERMEDIATE_DIR) <(locales))'
],
'action': [
'<@(repack_locales_cmd)',
......@@ -1706,7 +1701,7 @@
{
'destination': '<(PRODUCT_DIR)/locales',
'files': [
'>!@(<(repack_locales_cmd) -o -g \'<(grit_out_dir)\' -s \'<(SHARED_INTERMEDIATE_DIR)\' -x \'<(INTERMEDIATE_DIR)\' <(locales))',
'<!@pymod_do_main(repack_locales -o -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(INTERMEDIATE_DIR) <(locales))'
],
},
{
......@@ -1717,6 +1712,6 @@
},
],
}], # targets
}], # os_posix == 1 and OS != "mac"
}], # OS != "mac"
], # 'conditions'
}
chrome/tools/build/repack_locales.py
View file @ c8fd3d44
......@@ -14,7 +14,7 @@ import getopt
import os
import sys
sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '..', '..', '..',
sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', '..',
'tools', 'data_pack'))
import repack
......@@ -47,7 +47,7 @@ def calc_output(locale):
locale = 'en'
return '%s/repack/%s.lproj/locale.pak' % (INT_DIR, locale.replace('-', '_'))
else:
return '%s/repack/%s.pak' % (INT_DIR, locale)
return os.path.join(INT_DIR, 'repack', locale + '.pak')
def calc_inputs(locale):
......@@ -55,35 +55,38 @@ def calc_inputs(locale):
inputs = []
#e.g. '<(grit_out_dir)/generated_resources_da.pak'
inputs.append('%s/generated_resources_%s.pak' % (GRIT_DIR, locale))
inputs.append(os.path.join(GRIT_DIR, 'generated_resources_%s.pak' % locale))
#e.g. '<(grit_out_dir)/locale_settings_da.pak'
inputs.append('%s/locale_settings_%s.pak' % (GRIT_DIR, locale))
inputs.append(os.path.join(GRIT_DIR, 'locale_settings_%s.pak' % locale))
#e.g. '<(grit_out_dir)/platform_locale_settings_da.pak'
inputs.append('%s/platform_locale_settings_%s.pak' % (GRIT_DIR, locale))
inputs.append(os.path.join(GRIT_DIR,
'platform_locale_settings_%s.pak' % locale))
#e.g. '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_da.pak'
inputs.append('%s/webkit/webkit_strings_%s.pak' % (SHARE_INT_DIR, locale))
inputs.append(os.path.join(SHARE_INT_DIR, 'webkit',
'webkit_strings_%s.pak' % locale))
#e.g. '<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings_da.pak',
inputs.append('%s/ui/ui_strings/ui_strings_%s.pak' % (
SHARE_INT_DIR, locale))
inputs.append(os.path.join(SHARE_INT_DIR, 'ui', 'ui_strings',
'ui_strings_%s.pak' % locale))
#e.g. '<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings_da.pak',
inputs.append('%s/ui/app_locale_settings/app_locale_settings_%s.pak' % (
SHARE_INT_DIR, locale))
inputs.append(os.path.join(SHARE_INT_DIR, 'ui', 'app_locale_settings',
'app_locale_settings_%s.pak' % locale))
#e.g. '<(grit_out_dir)/google_chrome_strings_da.pak'
# or
# '<(grit_out_dir)/chromium_strings_da.pak'
inputs.append('%s/%s_strings_%s.pak' % (GRIT_DIR, BRANDING, locale))
inputs.append(os.path.join(
GRIT_DIR, '%s_strings_%s.pak' % (BRANDING, locale)))
return inputs
def list_outputs(locales):
"""Print the names of files that will be generated for the given locales.
"""Returns the names of files that will be generated for the given locales.
This is to provide gyp the list of output files, so build targets can
properly track what needs to be built.
......@@ -93,11 +96,11 @@ def list_outputs(locales):
outputs.append(calc_output(locale))
# Quote each element so filename spaces don't mess up gyp's attempt to parse
# it into a list.
print " ".join(['"%s"' % x for x in outputs])
return " ".join(['"%s"' % x for x in outputs])
def list_inputs(locales):
"""Print the names of files that will be processed for the given locales.
"""Returns the names of files that will be processed for the given locales.
This is to provide gyp the list of input files, so build targets can properly
track their prerequisites.
......@@ -107,7 +110,7 @@ def list_inputs(locales):
inputs += calc_inputs(locale)
# Quote each element so filename spaces don't mess up gyp's attempt to parse
# it into a list.
print " ".join(['"%s"' % x for x in inputs])
return " ".join(['"%s"' % x for x in inputs])
def repack_locales(locales):
......@@ -119,15 +122,12 @@ def repack_locales(locales):
repack.RePack(output, inputs)
def main(argv=None):
def DoMain(argv):
global BRANDING
global GRIT_DIR
global SHARE_INT_DIR
global INT_DIR
if argv is None:
argv = sys.argv
short_options = 'iog:s:x:b:h'
long_options = 'help'
......@@ -144,58 +144,53 @@ Usage: %s [-h] [-i | -o] -g <DIR> -x <DIR> -s <DIR> -b <branding> <locale> [...
-x DIR Intermediate build files output directory.
-s DIR Shared intermediate build files output directory.
-b branding Branding type of this build.
locale [...] One or more locales to repack.""" % (argv[0])
locale [...] One or more locales to repack.""" % (
os.path.basename(__file__))
try:
try:
opts, locales = getopt.getopt(argv[1:], short_options, long_options)
except getopt.GetoptError, msg:
raise Usage(str(msg))
if not locales:
usage_msg = 'Please specificy at least one locale to process.\n'
for o, a in opts:
if o in ('-i'):
print_inputs = True
elif o in ('-o'):
print_outputs = True
elif o in ('-g'):
GRIT_DIR = a
elif o in ('-s'):
SHARE_INT_DIR = a
elif o in ('-x'):
INT_DIR = a
elif o in ('-b'):
BRANDING = a
elif o in ('-h', '--help'):
print helpstr
return 0
if not (GRIT_DIR and INT_DIR and SHARE_INT_DIR):
usage_msg += 'Please specify all of "-g" and "-x" and "-s".\n'
if print_inputs and print_outputs:
usage_msg += 'Please specify only one of "-i" or "-o".\n'
# Need to know the branding, unless we're just listing the outputs.
if not print_outputs and not BRANDING:
usage_msg += 'Please specify "-b" to determine the input files.\n'
if usage_msg:
raise Usage(usage_msg)
except Usage, err:
sys.stderr.write(err.msg + '\n')
sys.stderr.write(helpstr + '\n')
return 2
opts, locales = getopt.getopt(argv, short_options, long_options)
except getopt.GetoptError, msg:
raise Usage(str(msg))
if not locales:
usage_msg = 'Please specificy at least one locale to process.\n'
for o, a in opts:
if o in ('-i'):
print_inputs = True
elif o in ('-o'):
print_outputs = True
elif o in ('-g'):
GRIT_DIR = a
elif o in ('-s'):
SHARE_INT_DIR = a
elif o in ('-x'):
INT_DIR = a
elif o in ('-b'):
BRANDING = a
elif o in ('-h', '--help'):
raise Usage(helpstr)
if not (GRIT_DIR and INT_DIR and SHARE_INT_DIR):
usage_msg += 'Please specify all of "-g" and "-x" and "-s".\n'
if print_inputs and print_outputs:
usage_msg += 'Please specify only one of "-i" or "-o".\n'
# Need to know the branding, unless we're just listing the outputs.
if not print_outputs and not BRANDING:
usage_msg += 'Please specify "-b" to determine the input files.\n'
if usage_msg:
raise Usage(usage_msg)
if print_inputs:
list_inputs(locales)
return 0
return list_inputs(locales)
if print_outputs:
list_outputs(locales)
return 0
return list_outputs(locales)
repack_locales(locales)
return repack_locales(locales)
if __name__ == '__main__':
sys.exit(main(sys.argv))
results = DoMain(sys.argv[1:])
if results:
print results
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment