Commit Graph

68 Commits

Author SHA1 Message Date
Lucie Gérard
a7956df3ca Use SPDX license identifiers
Replace the current license disclaimer in files by
a SPDX-License-Identifier.

Task-number: QTBUG-67283
Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-08-26 12:27:18 +00:00
Cristian Adam
22b8f3bdcd scripts: Deploy clang-format tool
The beautifier plugin can use the clang-format tool, which is statically
build, and it's around 2-6 MB in size.

Fixes: QTCREATORBUG-25600
Change-Id: I900f0dbfc2ba2773d3ad986c149adb41a4103e94
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-06-27 15:40:18 +00:00
Cristian Adam
61f04d260c scripts: remove deployment of libclang-cpp
All the clang binaries that we ship (clangd, clang-tidy,
clazy-standalone) are compiled statically and libclang-cpp
is not needed anymore.

Change-Id: I486fc0d1a55a18916c0abf56ec6a966321ef2b46
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-06-22 08:29:14 +00:00
Cristian Adam
cdedc71182 scripts: Do not deploly clang and clang-cl executables
They were used in debugging of the libclang code model, and having
only the compiler is not very useful.

Users can install complete LLVM toolchains from llvm.org

Change-Id: If19a0b75c8505ba7589b377292bd96f855e91c00
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-06-17 14:05:03 +00:00
Cristian Adam
28497d928b Scripts: Do not deploy libclang anymore
Since libclang is no longer needed, we don't need to deploy the
library anymore.

Change-Id: Ia7bdb7e089ec95b8252efbfa1c607d03082a99e6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-05-25 09:45:10 +00:00
Eike Ziller
f5b77d87da Move build scripts to Python3
On newer macOS versions there even is no unversioned python
executable anymore, so we need to make it explicit

Change-Id: Ic2260a06b859e949a42f7dc34f1ff4dd582ce635
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-04-20 14:23:43 +00:00
Tim Jenssen
8d222e22d5 deploy tls plugins to fix ssl downloads
it fixes https example downloads in QtDesignStudio

Change-Id: Ib162e630ae3a66691bec6d8f32cee241614e01e6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-08-09 14:56:30 +00:00
Viacheslav Tertychnyi
2a456e5439 Deploy: Use objdump for MinGW build
Change-Id: Icb22aaecf3ca010b49d04af2ead7fb627a40c1db
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-04-20 20:16:53 +00:00
Eike Ziller
909f74dc56 Fix deployment of clang tools on Windows
Amends ca016bfb2e

Change-Id: I529f7f37b86f086167774e3c8d03761d4cc654a9
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-12-16 12:31:42 +00:00
Eike Ziller
ca016bfb2e deploy.py: Support Python 2.7, do not require all clang executables
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>
2020-12-09 13:35:38 +00:00
Eike Ziller
ee6b329f10 Fix Qt deployment on Windows
Broke with 07128078b9

Change-Id: Icfc1ef7766017abf983115b20428931214a2a7c5
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-11-24 12:02:13 +00:00
Eike Ziller
07128078b9 Integrate deployqtHelp_mac.sh into deployqt.py
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>
2020-11-24 09:36:56 +00:00
Eike Ziller
e101e83f84 Do not try to deploy QtQuick1 imports
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>
2020-11-06 06:57:10 +00:00
Eike Ziller
715aa04d33 Fix clazy-standalone deployment on Linux
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>
2020-08-10 13:03:27 +00:00
Eike Ziller
ded5c64d53 Fix deployment of clazy-standalone
On Linux and macOS, clazy-standalone links against some dynamic
libraries which we need to ship.

Fixes: QTCREATORBUG-24344
Change-Id: I4946d2ae22fc9363445e6a3eecb8d9e40be5ef0e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-17 06:23:03 +00:00
Eike Ziller
bc4c2f8a15 Use the packaging script for the github action
Unifies a bit of what is done. For example this adds documentation and creates a disk image for
macOS. It will also make adding perfparser/elfutils and 32bit wininterrupt and qtcreatorcdbext
easier.

Adds Qt translations.
Adds some useful options to build.py and make it work with python3
Disables detection of debug vs release build in deployqt.py on Windows
if dumpbin is not there (for MinGW).

Change-Id: I3cc33144cad653823321209c219d220eb75093ec
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-06-25 16:37:28 +00:00
Eike Ziller
0f362115c1 CMake build: Deploy elfutils
Fixes: QTCREATORBUG-24131
Change-Id: Ibfe829492e86ce1563882cf3be6469f9e553812d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-05 17:34:51 +00:00
Eike Ziller
e2e50f80fa Deploy: Use argparse instead of gnuopt
It's the more modern variant that we use everywhere else.
Add -i/--ignore-errors as a dummy option since it wasn't used for much,
and all callers used it anyhow - always ignore the one error that it
applied to.

Change-Id: Iecb5b434b6c21fc555410565a8e63a80844228cc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-05 17:34:40 +00:00
Tim Jenssen
d53d874224 add assetimporters as a new QtQuickDesigner depdency
This is used to import QtQuick3d content as resources in the designer.

Not sure if we need the qtmodule QtQuick3d in QtCreator if QtCreator also
want to offer that functionality

Change-Id: I7b50b820916dbe0bc0a0fc6dedc29fcb08d54f3b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-10-24 15:28:44 +00:00
Nikolai Kosjar
2a8a39f12b Deploy clazy-standalone for the ClangTools plugin
Change-Id: If554d3ade48da8d3877770d7e42af7185b30ceb6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-10-08 07:52:17 +00:00
Nikolai Kosjar
835477b52f Deploy clang-tidy binary for the ClangTools plugin
Change-Id: I4491c985cdcb93ca94be491d1acb9d960f96a190
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-27 06:42:38 +00:00
Ivan Donchevskii
c1a0d89732 Deploy: Ship prebuilt clangd binary together with clang
Change-Id: I67f4f8ba66cc5ced0871dd6471860210c1dd558e
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-08-10 09:03:00 +00:00
Ivan Donchevskii
c937534906 ProjectExplorer: Autodetect clang-cl shipped with Qt Creator
In addition to Clang detect it's MSVC compatible twin in
case we run on Windows.

Change-Id: Id997a1a425ca6ce23513b40141f8697521e3cdae
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-08-09 10:52:49 +00:00
Eike Ziller
e8b13fe3c9 Fix wayland plugin deployment
The functionality is spread over several plugins, not just the platform
plugin.

Task-number: QTCREATORBUG-20354
Change-Id: I3b120d1792be31c98707e2e60124911f3d138188
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
2018-05-02 13:18:55 +00:00
Tim Jenssen
b1c659ff85 add qmltooling plugin dir to deployqt.py
Change-Id: Ie9436c6a29d153400bd8aa4547b8b9abf310f6a6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-31 16:03:31 +00:00
Tim Jenssen
700447d9a0 fix deploy Qt for renamed QtCreator
Change-Id: I7abd20ae8ad91ac5a7bf0d5daa856c0615ae3b10
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-29 14:20:24 +00:00
Eike Ziller
dd60923713 Packages: Deploy styles plugins (new in Qt 5.10)
Task-number: QTCREATORBUG-19150
Change-Id: I6673437a6f1bc322f7b40c10f98982a54aca1306
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-25 14:00:29 +00:00
Ivan Donchevskii
68a49c79da Clang: Unify compiler options builders
Make build command the same for all builders.
Minimize differences.

Change-Id: I1cfe5071b3afb4944ed178fff1e57d3aee45d8a9
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-09-22 15:00:48 +00:00
Orgad Shaneh
6d33f9d72a Support Python3 in deploy scripts
Change-Id: I3a25306ed6babdbae09dcb0f8bc2c5c337d36415
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-19 08:09:46 +00:00
Eike Ziller
f4f447c078 Ship qtdiag in binary packages
Task-number: QTCREATORBUG-16135
Change-Id: I29aabb697feaf6546c807263b037d70abc0cc5eb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-15 09:24:36 +00:00
Eike Ziller
c412e0bb2a Fix that clang static analyzer did not find built-in headers
Clang expects these to lie in "../lib/clang" relative to the clang
executable.

Change-Id: I216860876591dca1fd728e4b1e79b4b07c965620
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-08-18 10:20:59 +00:00
Eike Ziller
ac664fec50 Windows/deployqt: Only ship necessary version of EGL/GLES libs
Task-number: QTCREATORBUG-8296
Change-Id: Idf27427715f3234c077466b623d32829577f13c7
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-07 14:33:54 +00:00
Christian Stenger
340572c980 Scripts: Fix deployqt
When comparing re.MatchObjects instead of real bools the objects
normally aren't identical.
This lead to filtering out all libraries and not copying anything
to the respective directory.

Change-Id: Ib17cc04d281620b142ac570475d8fdc4912eaa86
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-11 09:22:25 +00:00
Eike Ziller
2b074f5278 Packaging: Fix deployment for Qt5.6
Qt 5.6 builds with relative RPATH by default on Linux.
Since this additionally leads to very short RPATHs,
we cannot change the relative structure within the
Qt installation (e.g. plugins in bin/, libs somewhere
in lib/qtcreator/).
Instead we now deploy qt into a self-contained lib/Qt/
folder, keeping the original structure, on Linux.

Change-Id: I36136590379c3e7b02ba7de3345369e2384dcc95
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-03 14:16:15 +00:00
Eike Ziller
fe7fc8f816 Deployqt script: Stylistic changes
Pylint recommendations
- filter -> list comprehension
- whitespace fixes
- unused import
- unused variable
- variable overriding builtin
- missing exception types

Also simplify copy-ignore-helper

Change-Id: Ibf7c573af35d60937f23a85d7a52e20031f38c4b
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-11-02 11:06:19 +00:00
Eike Ziller
d18b8507c1 Add script for packaging a directory.
Mostly 7zips the directory, all files must already be in place.
On Linux the script also fixes the Qt related RPATHs.

Changes the RPATH fixing to only change the Qt RPATH,
instead of overwriting the complete RPATH to something custom.

Change-Id: I1e07b7c0fcb4292197a4e743782a1392f6558747
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-10-23 09:15:01 +00:00
Eike Ziller
7fa6d51942 Fix deployment of qml2puppet
The move to LIBEXEC_PATH broke running the puppet from the packages on
Linux and OS X, because there it cannot find the platform plugin
anymore.
We need to add a qt.conf for it, and because Qt Creator.app/Contents/
Resources already contains the qt.conf for Qt Creator itself, the puppet
must also move to its own subdirectory on OS X.

Change-Id: I8e8cc48c49a01e10c7d7d3cc4c73020195cd5ca9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-10-19 15:07:36 +00:00
Eike Ziller
7c2761f1f0 Windows: Also deploy clang.exe
We need both clang.exe and clang-cl.exe for mingw and msvc

Change-Id: I2f8883f2ac42636699d4326d4d5f044b34b7d9ba
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-10-14 15:47:21 +00:00
Eike Ziller
b1401173de Linux: Deploy clang binaries to new libexec directory
moved from bin/ to libexec/ in master

Change-Id: If6fd0b3241fbb62b09b163b6063a831c1bf592a4
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-08-04 11:04:18 +00:00
Eike Ziller
d6da70916d Merge remote-tracking branch 'origin/3.5' 2015-07-10 14:08:29 +02:00
Eike Ziller
366f0dacdc Deploy only the clang binary and its link target
Instead of all clang* which is too much on Windows (because they are
copies instead of links), and we don't want clang-check on Linux and OS X
either anyhow

Change-Id: Ia08cf09efa5a23ec6b83bc5df18d09558810f72d
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-07-10 09:03:10 +00:00
Eike Ziller
d02e80b87b Deploy clang binary for use by static analyzer
Change-Id: Ia0ad96e18b754e2ac20a6dddd461d4d24c1a0db4
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-07-09 16:43:45 +00:00
Eike Ziller
f6cc098e52 Deployqt: Make Qt Quick 1 imports optional
Since we do not need Qt Quick 1 to compile Qt Creator anymore,
and it is a separate component in Qt now

Change-Id: I1bd35ceca7d4bd3261221a8607a35a658bc857e5
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-07-09 14:39:30 +00:00
Christian Kandeler
6d5a5aff94 Use a proper libexec path for Unix builds.
Change-Id: I036c806af47f07e60408a90d3a4e181a6773f866
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-07-09 09:08:01 +00:00
Eike Ziller
43e93009a3 Linux: Fix deployment of libclang
We need the versioned name of the library now,
so copy all libclang.so* while keeping symlinks as symlinks.

Change-Id: Ia2cc5e82be0848a3c9b0cb3055e150e6b1a151c9
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-06-23 12:23:21 +00:00
Eike Ziller
4e2905f880 Cpaster frontend: Fix deployment
On OS X we may not set QMAKE_RPATH because otherwise the default rpath
to the Qt libs is removed.

Install the tool on Windows and Linux.
Add the plugins path to the rpath on Linux.
Also make the rpath when building relative instead of absolute on Linux.

Change-Id: Ieb6a79d9f9f922d117736ae7b4ae65c784ade5c9
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-06-23 07:36:58 +00:00
Eike Ziller
f77f04e9ca Fix OpenGL on Linux with Qt 5.5
The XCB platform plugin now needs a plugin for the OpenGL backend

Change-Id: I5e7b296a0b645aec2a8d3ba80c53cb946e35e7f1
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
2015-06-05 13:02:59 +00:00
Eike Ziller
3c85058694 Update License
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2015-01-16 12:37:56 +01:00
Kai Koehne
a6e65e25ed Deploy Qt platformthemes plugins with Qt Creator
Makes sure Qt Creator integrates nicely e.g. with gtk.

Task-number: QTCREATORBUG-11406
Change-Id: I4da11b42e9d407ee8456c6d43479839667ee13c1
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-20 12:32:48 +01:00
Eike Ziller
b435099f55 Win/Lin deployqt: fix check for LLVM_INSTALL_DIR
os.environ["LLVM_INSTALL_DIR"] throws an exception if the key is not in
the dictionary.

Change-Id: I0e9dc9dbaf5612db3c530a436161211b6f0351af
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-12 08:25:39 +01:00