Commit Graph

49 Commits

Author SHA1 Message Date
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
Eike Ziller
256bb48300 Lin/Win: Deploy libclang and resources if needed
Change-Id: I4393a3e955e3810eea79221233c82c80a9de119e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-11 13:50:14 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-08 08:29:47 +01:00
Kai Koehne
6c928b3305 Deploy also platforminputcontext plugins
This is required at least with Qt 5.1 / Linux.

Task-number: QTCREATORBUG-8471
Change-Id: I7342193ef40fcc1a3e523d787c7521d6e810cd61
Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-05-16 16:36:31 +02:00
Eike Ziller
14eee567f1 Fix deployqt for qt4
Don't try to deploy qt quick 2 imports if they aren't there.

Change-Id: I1146ad8a81973af9e80c82caad515fea45b1530e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-05-03 16:31:56 +02:00
Eike Ziller
0093548981 Deploy qtquick2 imports for qml2puppet.
Task-number: QTCREATORBUG-9235

Change-Id: I9fae92bd9c1a07066d7d312008a7e10613b414f7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-05-03 15:20:44 +02:00
Eike Ziller
9a556a61d0 Deploy codec plugins on Lin/Win.
Task-number: QTCREATORBUG-8830

Change-Id: I3d2d917fc58dc3f62277ac4072b7dc2894fb7cd4
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-02-27 09:52:41 +01:00
Robert Loehning
298531e370 Incremented year in copyright info
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-29 16:27:03 +01:00
Eike Ziller
5a51b8ffc4 Windows: Fix deploy script.
Change-Id: I4180bdc173235497f40da2df1ecd5b20048745e5
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-12-11 10:13:57 +01:00
Eike Ziller
96b70ac611 Fix deployment of Qt libs (debug vs release) on windows.
Change-Id: If359d56bf325d24a4e127c385a3925a5e8ee6701
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2012-12-10 13:53:20 +01:00
Eike Ziller
d0e055a1f2 Fix copying translations from Qt.
Qt5 splits the translations into modules as well. The deployqt
script was only copying specific translation patters from Qt,
now we just copy all .qm files from Qt to Qt Creator.

Change-Id: I02302e3f8f6b4673979559ce6cd2a32271b554a3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-12-06 12:28:50 +01:00
Eike Ziller
0d5593e8ce Deploy Qt 5 printsupport plugins on Lin/Win
Task-number: QTCREATORBUG-8297
Change-Id: Ie19534c669a1160a0acce8a037016b1f3007cb6b
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2012-11-30 10:45:28 +01:00
Kai Koehne
fa63059cbd Deployqt: Add qt.conf
Override any QtLibraryInfo settings.

Change-Id: Ib931d132975769a2ab90f832b672bc6740138841
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-11-28 15:42:15 +01:00
tjenssen
a9da84dc63 adjust deployqt to deploy also a qt5
Change-Id: I4f0864a78d8fc861a716bd8e8734ab0fd4181cc1
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-22 11:41:00 +02:00
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00
Daniel Molkentin
23e0d86f04 deployqt: copy Qt libs from bin/, not lib/ on Windows.
Change-Id: I967dbfa89dd192ef47ee14dd15ed702c66f263c5
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2012-03-14 17:41:32 +01:00
Daniel Molkentin
272d590090 deployqt: Proposed for for Windows deployment, some cleanups.
Change-Id: I16583d70371e69bf6729a4b028a7dbf49b3b02df
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2012-03-13 14:02:54 +01:00
Daniel Molkentin
6340f5cf37 Fix rpath call (not calling chrpath through shell anymore).
Change-Id: Ia966c154e0827ce7dc0c4d0a3a45d234f82d0e90
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-01-13 10:09:22 +01:00
Daniel Molkentin
92cc5146d3 Convert unixdeployqt.sh to python script compatible with windows.
Change-Id: I6dc30b6f9ca2268257ea236a574ee9dea152daa3
Reviewed-by: Bill King <bill.king@nokia.com>
2012-01-12 10:27:03 +01:00