diff options
| author | Iikka Eklund <iikka.eklund@theqtcompany.com> | 2015-05-21 10:12:57 +0300 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@theqtcompany.com> | 2015-05-26 09:41:17 +0000 |
| commit | 8ddaaf1a8148994f0dcc15ae16646b3e8eb857fe (patch) | |
| tree | 17d257bcdbdb3ff9f362bdc1690f58133bf9f887 /packaging-tools/mkqt5bld.py | |
| parent | 570802d1ac94e5d4e106ed29b9ec6a58b87c9b8b (diff) | |
Ensure 'fixqt4headers.pl' ends up in release binary packages
If 'fixqt4headers.pl' is missing from /bin after running 'make install'
copy it from the used src package.
Change-Id: I4b32eaa3610d87289ad89187bd25aec8d161a21c
Task-number: QTBUG-45662
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
Diffstat (limited to 'packaging-tools/mkqt5bld.py')
| -rw-r--r-- | packaging-tools/mkqt5bld.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/packaging-tools/mkqt5bld.py b/packaging-tools/mkqt5bld.py index 59ba4fd04..69220a1fb 100644 --- a/packaging-tools/mkqt5bld.py +++ b/packaging-tools/mkqt5bld.py @@ -792,6 +792,15 @@ def patch_build(): # patch icu_install paths from files if bldinstallercommon.is_linux_platform(): bld_icu_tools.patch_icu_paths(MAKE_INSTALL_ROOT_DIR) + # make sure the 'fixqt4headers.pl' ends up in final package if it does not exist there already + fixqt4headers_filename = 'fixqt4headers.pl' + fixqt4headers_file = bldinstallercommon.locate_file(MAKE_INSTALL_ROOT_DIR, fixqt4headers_filename) + if not fixqt4headers_file: + # copy it from the used src package + fixqt4headers_file = bldinstallercommon.locate_file(QT_SOURCE_DIR, fixqt4headers_filename) + target_dir = bldinstallercommon.locate_directory(os.path.join(MAKE_INSTALL_ROOT_DIR, ESSENTIALS_INSTALL_DIR_NAME), 'bin') + if fixqt4headers_file and target_dir: + shutil.copy(fixqt4headers_file, target_dir) ############################### |