diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-11-02 10:43:00 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-11-07 10:23:21 +0000 |
| commit | dd61622fc65763da4845ff1da8b55611761c2b17 (patch) | |
| tree | 998b1d397c456613f6a46dd828a336dcf646ffbb /packaging-tools/build_wrapper.py | |
| parent | b8c07a1dfe19da7615c026178b3fa75386d17a45 (diff) | |
Build sdktool separately with Qt Creator build
The Qt Creator build for now still contains the sdktool itself as well
Change-Id: Ic6ac4de9fc9a37c6ae4aae1c10fa8a921a2f2d79
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Diffstat (limited to 'packaging-tools/build_wrapper.py')
| -rw-r--r-- | packaging-tools/build_wrapper.py | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/packaging-tools/build_wrapper.py b/packaging-tools/build_wrapper.py index 5dbdaa81a..b313660a4 100644 --- a/packaging-tools/build_wrapper.py +++ b/packaging-tools/build_wrapper.py @@ -55,6 +55,7 @@ import bld_icu_tools import pkg_constants from pkg_constants import ICU_BUILD_OUTPUT_DIR from threadedwork import ThreadedWork +import bld_sdktool # ---------------------------------------------------------------------- @@ -670,6 +671,7 @@ def handle_qt_creator_build(optionDict, qtCreatorPlugins): icu_libs = optionDict.get('ICU_LIBS') # optional openssl_libs = optionDict.get('OPENSSL_LIBS') # optional qt_postfix = os.environ['QT_POSTFIX'] + sdktool_qtbase_src = optionDict['SDKTOOL_QTBASESRC_BASE'] + optionDict['SDKTOOL_QTBASESRC_EXT'] qtcreator_temp = os.path.join(work_dir, 'qt-creator_temp') download_temp = os.path.join(work_dir, 'downloads') # from 4.4 on we use external elfutil builds and also build on Windows @@ -849,6 +851,16 @@ def handle_qt_creator_build(optionDict, qtCreatorPlugins): bldinstallercommon.do_execute_sub_process([os.path.join(work_dir, 'qt-creator', 'scripts', 'createSourcePackages.py'), qtcreator_version, 'enterprise'], work_dir) + # Build sdktool + sdktool_build_path = os.path.join(work_dir, 'sdktool_build') + sdktool_target_path = os.path.join(sdktool_build_path, 'target') + bld_sdktool.build_sdktool(sdktool_qtbase_src, os.path.join(sdktool_build_path, 'qt'), + os.path.join(work_dir, 'qt-creator', 'src', 'tools', 'sdktool'), + os.path.join(sdktool_build_path, 'src', 'tools', 'sdktool'), + sdktool_target_path, + 'nmake' if bldinstallercommon.is_win_platform() else 'make') + bld_sdktool.zip_sdktool(sdktool_target_path, os.path.join(work_dir, 'sdktool.7z')) + # Upload # Qt Creator directory if qtcreator_edition_name: @@ -895,7 +907,7 @@ def handle_qt_creator_build(optionDict, qtCreatorPlugins): snapshot_upload_list.append((target_env_dir + '/qtcreatorcdbext.7z', 'installer_source/' + target_env_dir + '/qtcreatorcdbext.7z')) file_upload_list.append(('qt-creator_build/wininterrupt.7z', target_env_dir + '/wininterrupt.7z')) snapshot_upload_list.append((target_env_dir + '/wininterrupt.7z', 'installer_source/' + target_env_dir + '/wininterrupt.7z')) - + file_upload_list.append(('sdktool.7z', target_env_dir + '/sdktool.7z')) # upload files upload_files(base_path, file_upload_list, optionDict) remote_path = base_path + '/latest' |