diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2018-10-17 08:36:07 +0300 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2018-10-17 07:14:57 +0000 |
| commit | 4e2ceccfd1ace9dba8f2e8e20d59436c5259bb0c (patch) | |
| tree | 29d041662444e70d37b21930fb2ba3da88de1710 | |
| parent | ce94c7c3a92a9461bcda3bc2ed745f4522b229dc (diff) | |
Fix make install in IFW buildsv5.9.7-packaging
make install will compile all modules which are not compiled. Call make
install only to modules what we have built.
Change-Id: Ibb4775564476c7fd2615e2383068aa68fe93fbc1
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
| -rw-r--r-- | packaging-tools/bld_ifw_tools.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/packaging-tools/bld_ifw_tools.py b/packaging-tools/bld_ifw_tools.py index 6341b4555..9c562f8df 100644 --- a/packaging-tools/bld_ifw_tools.py +++ b/packaging-tools/bld_ifw_tools.py @@ -174,10 +174,10 @@ class IfwOptions: self.qt_binaries_dynamic = qt_binaries_dynamic if self.qt_binaries_dynamic: self.qt_binaries_dynamic_saveas = os.path.join(ROOT_DIR, os.path.basename(self.qt_binaries_dynamic)) - self.qt_build_modules = " module-qtbase module-qtdeclarative module-qttools module-qttranslations" - self.qt_build_modules_docs = " module-qttools" + self.qt_build_modules = ["qtbase", "qtdeclarative", "qttools", "qttranslations"] + self.qt_build_modules_docs = ["qtbase", "qttools"] if bldinstallercommon.is_win_platform(): - self.qt_build_modules += " module-qtwinextras" + self.qt_build_modules.append("qtwinextras") self.make_cmd = 'nmake' self.make_doc_cmd = 'nmake' self.make_install_cmd = 'nmake install' @@ -374,12 +374,16 @@ def build_qt(options, qt_build_dir, qt_configure_options, qt_modules): print('--------------------------------------------------------------------') print('Building Qt') cmd_args = options.make_cmd - cmd_args += qt_modules + for module in qt_modules: + cmd_args += " module-"+module bldinstallercommon.do_execute_sub_process(cmd_args.split(' '), options.qt_source_dir, True, False, get_build_env(options.openssl_dir)) print('--------------------------------------------------------------------') print('Installing Qt') cmd_args = options.make_install_cmd - bldinstallercommon.do_execute_sub_process(cmd_args.split(' '), options.qt_source_dir) + for module in qt_modules: + moduleDir = os.path.join(options.qt_source_dir, module) + bldinstallercommon.do_execute_sub_process(cmd_args.split(' '), moduleDir) + ############################### # function |