aboutsummaryrefslogtreecommitdiffstats
path: root/packaging-tools/mkqt5bld.py
Commit message (Collapse)AuthorAgeFilesLines
* Remove unused scriptsIikka Eklund2020-04-081-1023/+0
| | | | | | | | | These scripts have been unused and deprecated for years. Qt5 is built by CI system nowadays thus these are not used anymore at all. Change-Id: Idff2643d6872c46293206835b8824bf34f7791f5 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Update 5.6 configuration file to match correct qt5.6 submodule setupv5.6.0-alpha1-packagingJani Heikkinen2015-09-071-11/+10
| | | | | Change-Id: Ic23d4f93fcfa1f8386036ed05d9b16077381a6e4 Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
* Fix flex path issue during packagingJani Heikkinen2015-08-261-4/+3
| | | | | Change-Id: Ieec483a1325096e2de7a397fbd7570a8276ca618 Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
* Use gnuwin32 tools from qt5.gitIikka Eklund2015-08-241-0/+8
| | | | | | | | | | Use the gnuwin32 tools from the qt5 src packages used in the release builds. Locate it from the extracted src package and append it into the PATH. Change-Id: I023aa4601e4f379869b7eff535e16e89b9030e92 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* improve do_execute_sub_process useTim Jenssen2015-08-211-15/+15
| | | | | | | | - use better defaults - remove hidden boolean arguments Change-Id: I4272f3bb2063f0a70afabda42f0f335eb0f6ef48 Reviewed-by: Antti Kokko <antti.kokko@theqtcompany.com>
* Merge branch 'master' into refactorMatti Paaso2015-08-121-47/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: packaging-tools/build_wrapper.py packaging-tools/configurations/all-os/qtwebview-src-doc-examples-conf-11 packaging-tools/configurations/linux/config.xml.template.linux.qt5 packaging-tools/configurations/linux/x64/x86_64-tools-qtcreator-qt54x-conf packaging-tools/configurations/linux/x86/x86-tools-qtcreator-qt54x-conf packaging-tools/configurations/mac/x64/x86_64-tools-qtcreator-qt54x-conf packaging-tools/configurations/offline_installer_jobs/5.4/linux_x64_android packaging-tools/configurations/offline_installer_jobs/5.4/linux_x86 packaging-tools/configurations/offline_installer_jobs/5.4/linux_x86_android packaging-tools/configurations/offline_installer_jobs/5.4/mac_x64 packaging-tools/configurations/offline_installer_jobs/5.4/mac_x64_android packaging-tools/configurations/offline_installer_jobs/5.4/mac_x64_android_ios packaging-tools/configurations/offline_installer_jobs/5.4/mac_x64_ios packaging-tools/configurations/offline_installer_jobs/5.4/win_x64_msvc2013 packaging-tools/configurations/offline_installer_jobs/5.4/win_x64_msvc2013_opengl packaging-tools/configurations/offline_installer_jobs/5.4/win_x64_winrt packaging-tools/configurations/offline_installer_jobs/5.4/win_x86_mingw491 packaging-tools/configurations/offline_installer_jobs/5.4/win_x86_mingw491_android packaging-tools/configurations/offline_installer_jobs/5.4/win_x86_mingw491_qnx6 packaging-tools/configurations/offline_installer_jobs/5.4/win_x86_msvc2010_opengl packaging-tools/configurations/offline_installer_jobs/5.4/win_x86_msvc2012_opengl packaging-tools/configurations/offline_installer_jobs/5.4/win_x86_msvc2013 packaging-tools/configurations/offline_installer_jobs/5.4/win_x86_msvc2013_opengl packaging-tools/configurations/pkg_templates/pkg_tools/qt.tools.maintenance/meta/package.xml packaging-tools/configurations/windows/config.xml.template.windows.qt5 packaging-tools/configurations/windows/x86/x86-tools-qtcreator-qt54x-conf packaging-tools/releases/release-54 Change-Id: Ib79d7e5778e6a5e672be37fbd84676da02af7e21
| * Remove building of qmlpuppetKai Koehne2015-04-081-47/+0
| | | | | | | | | | | | | | Qt Creator now builds the qml puppet on the fly. Change-Id: If809c6e41c71a605301c4d4d01e230179771bfde Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
* | Revert "Archive .pdb files separately"Iikka Eklund2015-07-071-22/+0
| | | | | | | | | | | | | | | | | | | | We need the debug .pdb files. This reverts commit e94be3f3ffa9f9f6ba34323cd6010f8c4bb25d5b. Change-Id: I359533719952473a897a4abe5571c09a1a8cf5fb Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Fix binary build error from mkqt5bld.pyJani Heikkinen2015-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | print_wrap doesn't take 2 parameters so combined given ones. Introduced with change 04189a85a00b9c9e9cf469978ba2d7a211ad12c9 Change-Id: I0905c0f0c9ef072fb0410284898c0eb3d5f25581 Reviewed-by: Jani Vähäkangas <jani.vahakangas@theqtcompany.com> Reviewed-by: Antti Kokko <antti.kokko@theqtcompany.com> Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
* | Print os.renameHeikki Halmet2015-06-171-0/+2
| | | | | | | | | | | | | | Let's print os.rename before executing rename Change-Id: Ie94d7e0394033195b84626465d1767524a03cb06 Reviewed-by: Antti Kokko <antti.kokko@theqtcompany.com>
* | Try to circumvent timing related issue in Windows binary buildAntti Kokko2015-06-091-0/+2
| | | | | | | | | | | | | | Random 'access denied' errors in binary build Change-Id: Ie994e729bcc5328e03173961c0887dc005b8d79f Reviewed-by: Heikki Halmet <heikki.halmet@theqtcompany.com>
* | Archive .pdb files separatelyIikka Eklund2015-05-261-0/+22
| | | | | | | | | | | | | | | | If .pdb files exists in release packages archive them into separate qt5_pdb.7z archive for further usage. Change-Id: Ia0d584e2f1feb434c7c6bf7bd623068b8eb95c8b Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | Ensure 'fixqt4headers.pl' ends up in release binary packagesIikka Eklund2015-05-261-0/+9
| | | | | | | | | | | | | | | | | | | | 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>
* | Qt5.5: Bring qtwebkit back into essentials packageIikka Eklund2015-04-241-13/+0
| | | | | | | | | | | | | | | | For Qt5.5 we can not split the qtwebkit out from the essentials as that causes Assistant to not work properly. Change-Id: Ia3d1159b028bf9a575c2f368406c79ec90bed78e Reviewed-by: Antti Kokko <antti.kokko@theqtcompany.com>
* | Custom qtwebkit build steps for Qt5.5 packagesIikka Eklund2015-04-231-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtWebkit is set as separate installable component in the installers. By default the Assistant would have dependency into it which we do not want as the qtwebkit installation is optional now. As we are configuring Qt5.5 with '-skip qtwebkit' we need custom build steps to have the qtwebkit libraries built. - If Qt5.5 build (checked from version number) - If configure options contain '-skip qtwebkit' If the above conditions are met then attempt to build it separately. Change-Id: I86c05cc285d8c5add928ab310cdc29099b35325f Reviewed-by: Matti Paaso <matti.paaso@theqtcompany.com>
* | Ensure building of deprecated Qt5 componentsIikka Eklund2015-04-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For Qt5.5 we put some of the qt modules as separately installable components. Those components will be deprecated in future. E.g. for qtwebkit this causes issues. The Assistant will get dependency to qtwebkit and if the user chooses not to install qtwebkit separately the Assistant will not launch. We must configure needed Qt packages with '-skip qtwebkit' so that e.g. the Assistant is not dependent of the qtwebkit. The consequence is that the top level make will not build qtwebkit anymore. So we need to explicitly go under those submodules which are marked to be archived separately and invoke 'make' from there. Change-Id: I7d996c2600727754445c1c5df03678646c09a7ed Reviewed-by: Matti Paaso <matti.paaso@theqtcompany.com>
* | Removing Qt 5.50 alpha hack for qtlocationMatti Paaso2015-04-171-2/+0
| | | | | | | | | | | | | | Now qtlocation is integrated as part of Qt 5.5. Change-Id: Id112b444a509938dcaae9d99273baf1ddb15e0f8 Reviewed-by: Antti Kokko <antti.kokko@theqtcompany.com>
* | Adding 10s delay after extracting 7z.Matti Paaso2015-04-161-0/+3
| | | | | | | | | | | | | | | | | | | | In windows 8.1 environment, it seems that 7z sometimes doesn't release folder immediately. And next command (rename src folder) will fail into 'Access is denied' OsError. Change-Id: I29d9fbcf69e251030117f8b047067d9fff189ce7 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: Antti Kokko <antti.kokko@theqtcompany.com>
* | Merge branch 'master' into refactorAntti Kokko2015-04-081-42/+38
|\| | | | | | | Change-Id: I534f9ecee0327b4d0dc7f3b5a94cff6054456f67
| * Replace EXTRA_ENV with QT_BUILD_OPTIONSSergio Ahumada2015-03-261-3/+2
| | | | | | | | | | | | | | this commit amends 0b1a2a6c9ad16c841cbbd3485521046f9f653532 Change-Id: Idec7fc66197dd3731b4a6270e49373405d89055d Reviewed-by: Matti Paaso <matti.paaso@theqtcompany.com>
| * mkqt5bld: Fix continued indentationSergio Ahumada2015-03-181-37/+37
| | | | | | | | | | Change-Id: I2e726c33a8182becc9fce7f0b56db3cf59ab45dd Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
| * Clean up unused variables and importsSergio Ahumada2015-03-101-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove unused imports * remove unused variables * replace unused variables with 'dummy', this is the suggested and most common way to deal with variables that need to be defined but are never used and it also makes pylint not to complain, eg: for root, dir, files in os.walk(directory): for basename in files: if fnmatch.fnmatch(basename, '*.pro'): filename = os.path.join(root, basename) since 'dirs' is never used, we replace it with 'dummy' for root, dummy, files in os.walk(directory): for basename in files: if fnmatch.fnmatch(basename, '*.pro'): filename = os.path.join(root, basename) Change-Id: I850c2c2a8ae60035d0cc5bf6c3429ff8640f9f11 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* | Refactor Qt release build handlingIikka Eklund2015-04-081-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | Cleanups and removed duplicate code. Refactor Qt release build parts. Try to use as much generic logic for all the Qt builds and put platform specific parts only in separate blocks. Fix custom_build parameter using. Change-Id: Ieeee87c30eebc92e89ac0d366c670dcceb715362 Reviewed-by: Antti Kokko <antti.kokko@theqtcompany.com>
* | Allow flexibility which Qt modules should be archived separatelyIikka Eklund2015-03-261-3/+7
| | | | | | | | | | | | | | | | | | | | | | Prse the list of Qt modules which needs to be archived separately from release description file. For 5.4 the qtwebengine is the only module. For 5.5 there are more modules that need to be archived separately. Change-Id: I403d337a287c994058aff1224dddc980a220371b Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | Temporary hack for building qtlocation.Matti Paaso2015-03-031-0/+2
| | | | | | | | | | | | | | To get qtlocation build until qt5 integration ready. Change-Id: Ifee522a34bb6ffa12fa56d66c4b6efa1ca26368b Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
* | Merge branch 'master' into refactorMatti Paaso2015-02-241-1/+1
|\| | | | | | | | | | | | | Conflicts: packaging-tools/releases/release-55 Change-Id: Ie6e0d6a9ed755a129a36dd3ec9e7f1fd28472e28
| * Update icu and d3d links to download.qt.ioSergio Ahumada2015-02-041-1/+1
| | | | | | | | | | | | Change-Id: Ibac99b5e25ca2d40cebb4b42ba62459538962183 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
* | Correcting Android buildMatti Paaso2015-01-051-2/+2
|/ | | | | | | | | | There is no need to give android api version anymore, it is now left empty in environment but in windows "empty" environment variable can not be given. There is still an option to give android api version, if needed in future. Change-Id: I67725ad96022ae3c6c8aedb9fe08c6cae9285b0c Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
* Use system environment in Qt5 buildsIikka Eklund2014-11-061-7/+10
| | | | | | | | We use additional environment variables in Qt5 builds. Remember to use those in each build step. Change-Id: Iecdf74e78998cc1e53ba4682c67dfaa633170dea Reviewed-by: Antti Kokko <antti.kokko@digia.com>
* Fix ICU build in Qt5 release buildsIikka Eklund2014-11-051-2/+2
| | | | | Change-Id: I7b39aa82c9b4c1ca583e6ac205858132f1c2fd1e Reviewed-by: Antti Kokko <antti.kokko@digia.com>
* Update ICU builds in packaging scriptsIikka Eklund2014-11-041-34/+2
| | | | | | | | Some updates how the ICU builds are handled in release builds. Improve patching of build time ICU paths in Qt5 binary packages. Change-Id: I74695ef92e95892b2dd88c1dacbc691aa3e324c9 Reviewed-by: Antti Kokko <antti.kokko@digia.com>
* Fix bug in qt5 build scriptIikka Eklund2014-10-221-1/+1
| | | | | | | Caused error on Windows. Change-Id: If213a05ada53bbd4d804ec2ac40be9fd47137d17 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* QtWebEngine needs to be separate archive in release packagesIikka Eklund2014-10-211-61/+44
| | | | | | | | | | | | | | | Due to licensing terms the QtWebEngine needs to be a separate installable component in the installer. For this the binary build script must support creating a separate archive from arbitrary qt5 module. The installer (install-tree) adaptation needs to be changed in follow-up commit. Some related code clean-up and refactoring done as well. Change-Id: I0c8ddad0cd3407ed2e6e2a889ae2f0d794b8ecd4 Reviewed-by: Antti Kokko <antti.kokko@digia.com>
* Fix for Linux QtWebkit build (ICU)Iikka Eklund2014-10-071-15/+7
| | | | | | | | | | | | We need to add icu to LIBRARY_PATH and to CPLUS_INCLUDE_PATH for the Webkit to pick the icu from custom location. In addition refactor the code a bit where icu is being handled. Change-Id: I922f669c87ea20b11403ccd5dd0be7e7dd1eb6c9 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com> Reviewed-by: Matti Paaso <matti.paaso@digia.com>
* QNX: Patch qcc-base-qnx.conf on Linux as wellSergio Ahumada2014-08-261-2/+1
| | | | | | | | | | Since we are not using -rpath on Linux now, we need to patch qcc-base-qnx.conf on Linux as well. Change-Id: I6b0d08c39d39d9b06b30b309f0ce3cadd8aeb64f Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com> Reviewed-by: Samuli Piippo <samuli.piippo@digia.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
* Android: Improve patch_android_prl_files() a bitSergio Ahumada2014-06-041-11/+5
| | | | | | | | Let use a regular expression to match the full path to libgcc.a instead of using the full path on Linux, Windows and Mac. Change-Id: I8616af138fd537f2af1efb1eb5451ff10b5e8d0a Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* mkqt5bld: Replace rpath only for Linux Desktop buildsSergio Ahumada2014-05-271-4/+2
| | | | | | | | | | | | When cross-compiling for QNX x86 or armv7 on a Linux x64 host the .so files don't get patched even if you use a 32-bit chrpath on the 64-bit host. This change removes the need to even try to patch cross-compiled builds such as Android and QNX on a Linux host. Change-Id: I538c1c79ef91c62ece2ec660b5c29602032f14eb Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* mkqt5bld: Use shlex.split(s) instead of s.split(' ') for configure argumentsSergio Ahumada2014-05-261-2/+5
| | | | | | | | | | | | | | | | | | | | | | This solves a problem when you pass arguments to configure like configure.bat -openssl-linked OPENSSL_LIB="-lssl -lcrypto" since s.split(' ') will create ['configure.bat', '-openssl-linked', 'OPENSSL_LIB="-lssl', '-lcrypto"'] which then will fail as '-lcrypto' is not recognized as a valid argument for configure.exe Doing shlex.split(s) will create ['configure.bat', '-openssl-linked', 'OPENSSL_LIB=-lssl -lcrypto'] instead, which is actually the right thing to do. Change-Id: I187f71814e8401ac881c2643c1f09d3b7596bfdd Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* QNX: Patch qcc-base-qnx.conf on WindowsSergio Ahumada2014-05-211-0/+3
| | | | | | | | | | | | | | | | | | | There is a need to add -Wl,-rpath-link,$$[QT_INSTALL_LIBS] on Windows to allow plugins to find their Qt dependencies. Another workaround is to add CONFIG+=explicitlib create_prl in the plugin's .pro file, but this means that all projects having this problem will have to be modified, hence it's easier to just patch our installers. Change-Id: Ibd24db2418ef804d6cb12e84a1ac512ab54f47ec Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
* QNX: Make patch_qnx_files() more genericSergio Ahumada2014-05-141-2/+2
| | | | | | | | | you can now pass the string to be replaced as a parameter. by default it replaces the given regex with ''. Change-Id: Iaa16b716d9f0792a2eed7e883a110d4c3442d777 Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
* QNX: Patch hard coded paths in .pc and .la filesSergio Ahumada2014-05-121-0/+2
| | | | | | | | Remove hard coded paths from the build machine in .pc and .la files Change-Id: I40c1de73c2ba45ca30a986026ddec2862cf4c558 Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
* QNX: Factorize patch_qnx6_prl_files() into patch_qnx6_files()Sergio Ahumada2014-05-121-9/+10
| | | | | | | | so we can reuse the code to patch .pc and .la files later on. Change-Id: I0fb539a7c6b55c7968fda227477e529a633fad6b Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
* QNX: Improve patch_qnx6_prl_files() functionSergio Ahumada2014-05-121-19/+13
| | | | | | | | | | | | Use bldinstallercommon.locate_directory() to find the 'lib' directory instead of kind of guessing it using INSTALL_PREFIX. Also remove some useless validations about checking whether 'lib' exists and whether the .prl files exist. Change-Id: I5f19098601b61380fc14e74e062660d2d870c7c5 Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* mkqt5bld: Add support for parallel builds with mingwSergio Ahumada2014-05-081-0/+2
| | | | | | | | Allow mingw32-make to use -jN when building on Windows. Change-Id: Ib499c995a99ab5faa5a895368159dcf448925bec Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* QNX: Use only one .7z file for Essentials and AddonsSergio Ahumada2014-05-081-34/+44
| | | | | | | | | | | | | | | There is no need to split the binaries into qt5_essentials.7z and qt5_addons.7z This change makes the configuration of QNX installers easier from a build perspective and from a packaging perspective. This also allows us to (re)use the qt5_essentials.7z file from builds made in other environments. Change-Id: I876392cfac9237d785545867a22f730e532ffaac Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* Revert "QNX: Add qt.conf file"Sergio Ahumada2014-05-071-19/+0
| | | | | | | | | It breaks patching binaries, .pc, .la, .pri, etc files using the IFW since the patching relies on the non-patched output of 'qmake -query' which is not the case when qt.conf is present. This reverts commit bf880661876d03373f430ebfcb2aba5eb83c3514 Change-Id: Id873333e0d1f520144fb85155b198c09e4b1fabf Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
* QNX: Add qt.conf filev5.3.0-rc1-packagingSergio Ahumada2014-05-071-0/+19
| | | | | | | | | This will enable us to use the qt5_essentials.7z build package outside of the installers as well, just like a standalone build. Change-Id: Ibb908591fc6110a812a0e3b871024f626aa322de Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* Do not strip out Qt5Bootstrap from binary packagesSimon Hausmann2014-05-051-2/+1
| | | | | | | That library may actually be needed. Change-Id: Id2aa5161985a0a91370ff20993a0b8f2c718a38d Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* QNX: Patch hard coded paths in .prl filesSergio Ahumada2014-04-281-0/+40
| | | | | | | | Remove hard coded paths from the build machine in .prl files Change-Id: I072f7c3b0a2a7ab0c587f6561269131ec3d6de7f Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
* mkqt5bld: Fix make install on Windows for QNXSergio Ahumada2014-04-281-5/+31
| | | | | | | | | | Most of the 'black magic' for Android on Windows applies to QNX on Windows. also mark QNX as a non-desktop build. Change-Id: Ia1582088c3ebc4bfa3fb158dd760c38c70592bb7 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 18:07:13 +0000