aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/6.0'Eike Ziller2021-12-011-1/+2
|\ | | | | | | Change-Id: I71b19dd8ecd96a7a2a58622f68283b8635264e48
| * Work around error when building telemetry pluginEike Ziller2021-11-301-1/+2
| | | | | | | | | | | | Change-Id: Ia4a4314180b561c2a45446b1ae550c3164612b10 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* | Add option to build QtCreator with sanitizerJoerg Kreuzberger2021-11-052-0/+13
|/ | | | | | | Fixes: QTCREATORBUG-26318 Change-Id: I44589b5bb39958eda2329b444e4857e8f61823bf Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Fix RPATH of Qbs binaries when built with Qt 6Eike Ziller2021-10-291-3/+3
| | | | | | | | | | | | | | The build system for Qt Creator ensures that we have the right relative RPATH to Qt for the packages. We still check if we need to fix the RPATHs when deploying Qt, and the Qbs build relies on that. That part was broken for Qt 6 since it looked for libQt5* to decide if the relative RPATH to Qt must be added. Remove the Qt version number from the check. Change-Id: Ib9d0408943d61364bfe9c8813a55bf60145b7972 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* Merge remote-tracking branch 'origin/5.0'Eike Ziller2021-09-151-0/+1
|\ | | | | | | Change-Id: I0ef7cd302ba7cba64fec401f3426dd682b8dc036
| * macOS: Remove absolute RPATH from clazy-standaloneEike Ziller2021-09-151-0/+1
| | | | | | | | | | | | | | | | | | | | Remove the absolute RPATH to somewhere on the build machine, which creates issues when loading Qt Creator on macOS 10.14, and of course is bogus in any case. Fixes: QTCREATORBUG-26196 Change-Id: Ic92deb9b2c6fe32f377fc31004779a2a43794054 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Merge remote-tracking branch 'origin/5.0'Eike Ziller2021-09-131-3/+0
|\| | | | | | | | | | | | | | | | | Conflicts: src/plugins/clangtools/clangtoolssettings.cpp src/plugins/clangtools/executableinfo.cpp src/plugins/clangtools/executableinfo.h Change-Id: Id8caf63e3e594792467d3447870086bd2d8f73b9
| * build.py: Remove --app-target optionEike Ziller2021-09-131-3/+0
| | | | | | | | | | | | | | It was no longer used since d04355dfb0aa444f5f6352d1b7126a0278807b78 Change-Id: I048d8566babec1e926cbf32916c4d88d474d8ef8 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Move shortening of revision string to build scriptAlp Öz2021-09-091-1/+1
| | | | | | | | | | | | | | This is to allow setting a longer IDE_REVISION_STR which is not necessarily a SHA256 value. Change-Id: Iad61e87fcd92e1b96a2066a3c6a6ae51d452b9b7 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Do not build Qbs by defaultEike Ziller2021-09-071-7/+10
|/ | | | | | | | | | | | | | Compiling Qbs takes time and is not strictly necessary for the Qbs integration in Qt Creator. We still want to build it for the release, but let's not build it by default anymore. [ChangeLog][Building from Sources] Qbs is not built anymore by default. Pass -DBUILD_QBS=ON on the CMake command line to enable it. Change-Id: Ic5793e26c7f6a7ac92931777e5d77cef2c8bf888 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* macOS: Fix creation of disk image with universal buildsEike Ziller2021-09-071-1/+1
| | | | | | | | Our universal Qt Creator build can be larger than 1 GB. Increase maximum size of disk image. Change-Id: I055e891f7da8e3c9db99a7b4b2d703cca594c22a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Do not try to deploy qbs-qmltypes, it's goneEike Ziller2021-09-021-1/+0
| | | | | Change-Id: I5cfe8c2e7e4e3aff6aad66d1979304522529cbf4 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* macOS: workaround for missing libqsvg.dylibTim Jenssen2021-08-231-0/+12
| | | | | Change-Id: Ibc0e758eab53f92978458f0c9a1be505c9421439 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* build.py: Only zip the .app on macOSEike Ziller2021-08-181-1/+9
| | | | | | | | Not the full contents of the folder containing the app. Works around QTBUG-95845 Change-Id: Id515142b99891e89d0f4db5dae009c481939811f Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* deploy tls plugins to fix ssl downloadsTim Jenssen2021-08-092-0/+12
| | | | | | | it fixes https example downloads in QtDesignStudio Change-Id: Ib162e630ae3a66691bec6d8f32cee241614e01e6 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* macOS: workaround for missing libqsqlite.dylibTim Jenssen2021-07-151-0/+12
| | | | | Change-Id: I667d144035a36aed55f2bdc3e6e021832c058236 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* macOS: Remove clangrefactoring/pchmanager from deploymentEike Ziller2021-06-251-3/+1
| | | | | | | They are gone for real now Change-Id: I653ed1ce1591d839a5ba01d00ef18c590d44100a Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* build.py: Add option for 7z multi-threading behaviorEike Ziller2021-04-211-5/+8
| | | | | | Fixes: QTCREATORBUG-25590 Change-Id: I4234928cfd4e2d76afe5acf76cd53eb1d67fa5a0 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Deploy: Use objdump for MinGW buildViacheslav Tertychnyi2021-04-201-4/+6
| | | | | Change-Id: Icb22aaecf3ca010b49d04af2ead7fb627a40c1db Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* macOS: Adapt build_plugin.py for possibly branded application bundleEike Ziller2021-04-121-9/+14
| | | | | Change-Id: I0d9860db78c2f617f5e8631064b271c0207f01de Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* CMake build: Fix remaining issues with Devel packageEike Ziller2021-04-061-0/+8
| | | | | | | | | | | | | | | | | | | | | On Linux (and Windows) we should not create toplevel files (README.md etc) or directories (doc/, scripts/ etc). On macOS, move the whole Devel package contents into the app bundle, because that is installed toplevel in the Qt installers, and we shouldn't even create include/, lib/ or any other directory at the toplevel at all. Since the prefix path must now point to the Resources folder inside the app bundle, adapt build_plugin.py to also accept --qtc-path pointing to the app bundle (Qt Creator.app) itself, and also to the app bundles parent directory. Adapt the Qt Creator plugin project template similarly. Task-number: QTCREATORBUG-25414 Fixes: QTCREATORBUG-25415 Change-Id: Ic756237fb920b54b1ec95d076649ad947b39a7e8 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* GitHub Actions: Build without PCHCristian Adam2021-03-261-0/+6
| | | | | | | ccache is not working very well when pch is enabled. Change-Id: I2922d2261bf4040ccd2837b2cc5c505ec2881207 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* build.py: Do not enforce building without PCHEike Ziller2021-03-251-3/+0
| | | | | | | | We have a guard for the CMake version in QtCreatorAPIInternal since a while. Change-Id: Ie76010b39e33d57c77b993db375a7821687145ea Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* build.py: Make it possible to skip building Qt CreatorEike Ziller2021-02-241-22/+31
| | | | | | | | And only build the windows tools qtcreatorcdbext and wininterrupt. For minimal 32bit Windows build. Change-Id: I126c0963a8917c95300c0b2e9f00da274a62887d Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* build.py: Build wininterrupt and qtcreatorcdbext separatelyEike Ziller2021-02-231-39/+53
| | | | | | | | | | | | The build of wininterrupt and qtcreatorcdbext was using the fully configured & built Qt Creator as a base. Now that we have separate CMake projects for these tools, build them really separately. This will be needed for building them on Windows 32bit for the Qt 6 build, since that doesn't provide Qt builds on that platform anymore. Change-Id: I50a662c6366814cbb6f4ce62adca2c1c3e9d546f Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* cmake build: Make separate debug info optionalEike Ziller2020-12-222-0/+4
| | | | | | | | | In the CMake build in general, but still use it for RelWithDebInfo builds with the build*.py scripts. Fixes: QTCREATORBUG-25151 Change-Id: I8414f953278ebb395f73414c12af0ed7bd4fcdbe Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Fix deployment of clang tools on Windowsv4.14.0Eike Ziller2020-12-161-1/+1
| | | | | | | Amends ca016bfb2e7a78253b1ad5dfc457583e8491be1a Change-Id: I529f7f37b86f086167774e3c8d03761d4cc654a9 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* qbs: fix installing doc dependenices on macOS and WindowsIvan Komissarov2020-12-141-0/+1
| | | | | | | | python still aliases to python 2.7 on macOS, so we need a smarter way to find python3. Change-Id: I229d8c1e124fb599119991b44c0f6d88d39b1684 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* deploy.py: Support Python 2.7, do not require all clang executablesEike Ziller2020-12-091-17/+12
| | | | | | | | | FileNotFoundException is new in Python 3. We might not have a LLVM build with e.g. clazy-standalone and clang-tidy, make deployment of Clang executables optional. Change-Id: Id25b2f65a8d060bac9cb7a66fb2cd7022e2724e0 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* deploy.py: Fix when running with Python 3.6Eike Ziller2020-11-241-0/+2
| | | | | | | | | | Which happens to be the default version on macOS 10.14. Python 3.6 does not return a sensible default encoding if you don't fiddle with your environment (like explicitly setting LANG). Fall back to UTF-8. Change-Id: I12534e4745e9c29b40a02c4946d8079d395cc650 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* cmake build: Re-add a "Dependencies" component that runs deploy scriptEike Ziller2020-11-241-12/+3
| | | | | | | And use that from the build script. Change-Id: I97d5b593cf703bb8e51556240f37c80aad654732 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Fix Qt deployment on WindowsEike Ziller2020-11-241-1/+1
| | | | | | | Broke with 07128078b9a61e709ecf20c4345b0a655a58fcd8 Change-Id: Icfc1ef7766017abf983115b20428931214a2a7c5 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Integrate deployqtHelp_mac.sh into deployqt.pyEike Ziller2020-11-243-45/+56
| | | | | | | | | | | For now this is a dummy integration by just calling the former from the latter, which has the advantage that - only one script needs to be used for all platforms - passing just qmake instead of individual install paths is enough also on macOS Change-Id: Ie05077ada950addd287b87d88045605d3bddb48f Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* cmake build: Create DebugInfo component with separate debug infoEike Ziller2020-11-172-5/+28
| | | | | | | | | | | When building with RelWithDebInfo. The CMake code is adapted from corresponding (internal) functions from Qt 6. Also let the scripts create an additional *-debug.7z with the debug info. Task-number: QTCREATORBUG-24916 Change-Id: Ibc3c8c0013718b9c5e868136e5ce01e1e99f84c4 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Build in release mode on GitHubEike Ziller2020-11-122-6/+6
| | | | | | | | | | | | Add option to build scripts to override build type, so it can be freely chosen. Build in release mode on GitHub - RelWithDebInfo was too big. Amends b1640074e3630fff8d510c0f96efdfcfeedb93a1 Change-Id: Ibba6e60d4e9b2eee24e789bfd28bddffb1e782f6 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Merge remote-tracking branch 'origin/4.13' into 4.14Eike Ziller2020-11-121-1/+2
|\ | | | | | | | | | | | | Conflicts: src/shared/qbs Change-Id: If75741825f5788165f9bf2f0248e976811273b6a
| * shiboken2tasks.py: Fix for WindowsFriedemann Kleint2020-10-281-1/+2
| | | | | | | | | | | | | | | | File names were not captured since ':' was excluded which can appear in a file name on Windows. Change-Id: I4bbf08c63faa12d3b76d73e927aef1457c09e02f Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | scripts: make release with debug info defaultTim Jenssen2020-11-112-2/+2
| | | | | | | | | | Change-Id: If08eeb64bfda42780f6ba9223c3394ce8daf6a6b Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | macOS: Fix deployment of QML2 importsEike Ziller2020-11-101-2/+1
| | | | | | | | | | | | | | Amends e101e83f843a5bc631d8f60656f1ae1f5164a5d9 Change-Id: I43ee85d9e0c144ec9a25d811d17604c91e709cd8 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Build scripts: Fix path format for cmake callsEike Ziller2020-11-103-3/+11
| | | | | | | | | | | | | | | | | | | | | | Make sure to pass posix style paths to CMAKE_PREFIX_PATH, CMAKE_MODULE_PATH and CMAKE_INSTALL_PREFIX. Otherwise this can lead to funny "Unknown control sequence \U" kind of errors. Follow-up of fceaff1a6fba4a99d07a45ec07142898d7a0fca3 Change-Id: I1c8445f9c298a17115bca6b42f099a99e33d6de2 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | cmake expects forward slashes here - even on windowsTim Jenssen2020-11-091-1/+1
| | | | | | | | | | Change-Id: Ia31727b703745e01d6def91237a0bc46ea37261a Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Do not try to deploy QtQuick1 importsEike Ziller2020-11-063-31/+5
| | | | | | | | | | | | | | | | | | We don't ship them with Qt Creator since a longer time now, and in Qt6 they are completely gone. Change-Id: I7c6b1da1782cb641e17b2d1c7ff764dd81e15ee6 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | build.py: add --add-module-pathEike Ziller2020-10-281-0/+6
| | | | | | | | | | | | | | | | Which prepends a path to CMAKE_MODULE_PATH which is required for branding. Task-number: QTCREATORBUG-22488 Change-Id: I6b0015778d8ceec7183740e5b70eaafd220a3bdf Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Consolidate some options for build.py and build_plugin.pyEike Ziller2020-10-282-4/+11
| | | | | | | | | | Change-Id: Ic745231ed68296f8052e3b0897893ee8fce53b16 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Scripts: Fix deploying assetimporters on macOSChristian Stenger2020-10-281-3/+1
| | | | | | | | | | Change-Id: If990ab8f5dcf482c671d8f39655f5372f8896fd3 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | GitHub Actions: Update to use Clang 11.0.0Cristian Adam2020-10-261-7/+9
|/ | | | | Change-Id: I015a71a4f53ff3be8609a00bdef47c93161af882 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* add some qmlpuppet cpp files to dev packageTim Jenssen2020-08-201-0/+2
| | | | | | | | | Since external plugins are interacting with the puppet we need them in the dev package. Change-Id: I871629ad80583a09b842bb60cd5b6fab5b512fae Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Merge remote-tracking branch 'origin/qds-1.59' into 4.13Tim Jenssen2020-08-131-0/+1
|\ | | | | | | Change-Id: Ic720f3adab305c5ef8cd10e713ccabf510eff0c0
| * add litehtml to dev packageTim Jenssen2020-07-101-0/+1
| | | | | | | | | | Change-Id: If33500eda8d095d1d9d63afe4ad8331109a22871 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Fix clazy-standalone deployment on LinuxEike Ziller2020-08-101-2/+3
| | | | | | | | | | | | | | | | | | For some reason the RHEL build of LLVM has ClazyPlugin in 'lib64' instead of just 'lib'. Fixes: QTCREATORBUG-24344 Change-Id: Ibfca2aabd4c25ad4d80ea0e56de5ca8692b3c7ae Reviewed-by: Cristian Adam <cristian.adam@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 11:31:29 +0000