diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2014-11-27 14:26:57 +0100 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2014-11-28 13:08:22 +0100 |
| commit | 03a52863226aeb774721db610ba831808b30836a (patch) | |
| tree | 85b7302def91b65537fc7a7d556960f727bf66e5 /src/core/resources | |
| parent | 8c6f087296ec48790c3efd9564c1056802b4c9c0 (diff) | |
Fix deployment problems with developer builds
This fix deploys the following files into qtbase without make install:
- qtwebengine_resources.pak
- translations/qtwebengine_locales/*.pak
- icudtl.dat
- plugins/qtwebengine/libffmpegsumo.so
Change-Id: Id2c02f03fb01571942d3135b215ebb8ad7a3221b
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/core/resources')
| -rw-r--r-- | src/core/resources/repack_locales.gypi | 2 | ||||
| -rw-r--r-- | src/core/resources/resources.gyp | 23 |
2 files changed, 23 insertions, 2 deletions
diff --git a/src/core/resources/repack_locales.gypi b/src/core/resources/repack_locales.gypi index ca3507912..d24da1b5d 100644 --- a/src/core/resources/repack_locales.gypi +++ b/src/core/resources/repack_locales.gypi @@ -13,7 +13,7 @@ '<!@pymod_do_main(repack_locales -i -p <(OS) -s <(SHARED_INTERMEDIATE_DIR) -x <(repack_output_dir) <(repack_extra_flags) <(locales))' ], 'outputs': [ - '<!@pymod_do_main(repack_locales -o -p <(OS) -s <(SHARED_INTERMEDIATE_DIR) -x <(repack_output_dir) <(locales))' + '<@(locale_files)' ], 'action': [ '<@(repack_locales_script)', diff --git a/src/core/resources/resources.gyp b/src/core/resources/resources.gyp index f07facca6..835a87cdf 100644 --- a/src/core/resources/resources.gyp +++ b/src/core/resources/resources.gyp @@ -9,6 +9,9 @@ 'sk', 'sl', 'sr', 'sv', 'sw', 'ta', 'te', 'th', 'tr', 'uk', 'vi', 'zh-CN', 'zh-TW', ], + 'locale_files': ['<!@pymod_do_main(repack_locales -o -p <(OS) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))'], + 'qt_install_data%': '', + 'qt_install_translations%': '', }, 'dependencies': [ '<(chromium_src_dir)/webkit/webkit_resources.gyp:webkit_strings', @@ -29,7 +32,25 @@ 'action_name': 'repack_locales', 'includes': [ 'repack_locales.gypi' ], }, - ] + ], + 'conditions': [ + ['qt_install_data != ""', { + 'copies': [ + { + 'destination': '<(qt_install_data)', + 'files': [ '<(SHARED_INTERMEDIATE_DIR)/repack/qtwebengine_resources.pak' ], + }, + ], + }], + ['qt_install_translations != ""', { + 'copies': [ + { + 'destination': '<(qt_install_translations)/qtwebengine_locales', + 'files': [ '<@(locale_files)' ], + }, + ], + }], + ], } ] } |