Commit Graph

217 Commits

Author SHA1 Message Date
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
Friedemann Kleint
d12c3e77b8 qdoc2tasks.pl: Adapt to changed message format in Qt 5.11
Account for the additional '(qdoc)'.

Change-Id: Ibef4dfba66bcc2eb1d47535b9e6501ed3a47e968
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-26 16:20:53 +00:00
Eike Ziller
b88bfe7db3 Filter debug info out when creating macOS disk image
Move the script to Python for that, for code sharing

Change-Id: I1a0b1ed7fe3ed4413045d478c82621d75800520e
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2018-01-23 12:21:49 +00:00
Eike Ziller
e8f0c99f12 Fix copying of symlinks when creating package
Another fixup of fd54a377fe

Change-Id: Ica9635f37a98eba7277517c70ae59409ca71f176
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-01-17 15:23:59 +00:00
Eike Ziller
fd54a377fe Add make target for creating packages with debug info
Add a script that creates either a release binary package,
or a package with debug info, from a Qt Creator build with
CONFIG+=force_debug_info CONFIG+=separate_debug_info

Run "make bindist_installer" for the release package
and "make bindist_debug" for the package with only debug info.

First step for QTCREATORBUG-13002

Change-Id: I9d45db7f41f4af956221f6feb7c4e8ca7154892e
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-01-15 14:18:01 +00:00
Eike Ziller
36256d6e0c Remove outdated installer creation script and resources
It is no longer used (it is using same scripts as Qt now),
and contains outdated resources.

Change-Id: I0576d694ef16ced49303dfc4d6075b742dbcc3b1
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-12-07 13:45:06 +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
Friedemann Kleint
9ee728caf3 Add clazyweb2tasks.pl for converting Clazy logs into .tasks files
Change-Id: I68a96b1124a8fa6d5e47253c29a94ae41a238fed
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-19 15:40:35 +00:00
Orgad Shaneh
5e8e619dd0 Merge remote-tracking branch 'origin/4.4' into 4.5
Change-Id: I9b7cb3d845628abf69a73a279f5a79202c0976c2
2017-10-04 16:11:17 +03:00
Eike Ziller
653e1e18c1 Dev package: Include .hpp files
Like optional.hpp

Change-Id: I1cc804834f34982dedfae0597179e523ff3bf522
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-09-26 08:15:04 +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
Eike Ziller
aed6a66be3 Merge remote-tracking branch 'origin/4.3' into 4.4
Change-Id: I4876ce528e2422f63280535fe4f9dd6610a75dec
2017-07-28 13:19:50 +02:00
Eike Ziller
48d3fd1af5 Dev package: Collect from all directories except tests/ and share/
Except for the qmlpuppet directories under share/.
Some plugins have other directories to look into than plugins/.

Change-Id: I89cc61d02c39ecee2cfb6db72986003651ca4b9c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-28 11:18:17 +00:00
Nikolai Kosjar
15793d3318 Clang: Make clangCompleteAt.sh work with standard headers
"clang -cc1" is the frontend only and as such it does not have any
include paths set. Use -Xclang <arg> instead.

[1] https://clang.llvm.org/docs/FAQ.html#id2

Change-Id: I372601cae5c672562b63fa07ed9e638e984fdd58
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-07-24 13:24:45 +00:00
Tobias Hunger
b8f1b43b4c Scripts: Add ninjawrapper.py
Add a small python program to wrap ninja and split its output nicely
into stdout and stderr.

Change-Id: Ib2fae405c170ea15910de20d5f45aaab75aa89cb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-06-15 08:43:21 +00:00
Eike Ziller
88897f3a87 Merge remote-tracking branch 'origin/4.3'
Conflicts:
	src/plugins/genericprojectmanager/genericproject.cpp
	src/plugins/genericprojectmanager/genericproject.h
	src/plugins/genericprojectmanager/genericprojectnodes.cpp
	src/plugins/genericprojectmanager/genericprojectnodes.h

Change-Id: Ie0c870f68c8d200a75489b75860987655b2f6175
2017-04-19 09:56:14 +02:00
Jake Petroules
b377130509 Specify absolute path to macdeployqt
This script receives the QT_INSTALL_BINS directory as an input argument,
so make use of it so that the caller does not need to have that path in
the PATH in order to find macdeployqt.

Change-Id: I5e5197104119a19ecda83c3bbc256f3fe492c0a6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-04-19 01:44:38 +00:00
Friedemann Kleint
43fc2ebeb0 Add perltest2tasks.pl
Add helper script to convert messages of the Perl module Test::More
into Qt Creator task files.

Change-Id: Ie04871f25e0cba880adaf89b557c475c3aa65244
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-04-05 13:24:53 +00:00
Eike Ziller
77135a342f macOS: Fix deployment of clang helpers
They worked but still had wrong, additional rpaths
to the Qt they were built with.
Remove handling of ClangCodeModel which doesn't link to clang
anymore.

Change-Id: I5c1fa59b3659dc8205b782fa8aac8b700b17a98a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-30 10:48:05 +00:00
Eike Ziller
3af815089c deployqtHelper_mac: Add helper variable for resource path
Shortens strings

Change-Id: Idba3130e07ec99ecd370a75a2bd257223ce1f966
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-30 10:48:00 +00:00
Eike Ziller
efe2bf73af macOS: Fix deployment of qbs_processlauncher and qbs-create-project
Change-Id: If38d11b452dc37dc3a5694c57d43a7a4e1635904
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-30 10:47:54 +00:00
Eike Ziller
0467aa5c90 Merge remote-tracking branch 'origin/4.2' into 4.3
Change-Id: I2f32404f36ed885e78a7616da2f686943a8c8471
2017-03-10 15:38:01 +01:00
Eike Ziller
9c736b68f5 Include doc/ in dev package
Change-Id: I64798d47d9f28826295d555432e3a1f63bbdde20
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-09 15:00:16 +00:00
Eike Ziller
1704c484a8 Merge remote-tracking branch 'origin/4.2'
Change-Id: I9006dd493707ae626ae3502541599c8789e1aab0
2017-02-27 15:17:37 +01:00
Christian Stenger
ce69c5da15 Scripts: Make dependencyinfo script working again
Due to the change of using json based plugin information instead
of xml based (pluginspec) this script became disfunctional long
time ago.. Adapt the script to use the json information generated
while building QC.
This script is still intended to find unused or unlisted
dependecies of plugins.

Prerequisites: Linux platform
Usage (just as before): inside the build directory of QC just run
the script directly or pass it to the Python interpreter.
(still limited to Python 2.x with x>=7)

Change-Id: I92b48327944df1239e9fac7fbd8ed1bee4fefa61
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-23 10:43:29 +00:00
Friedemann Kleint
4deee5431a gcc2tasks.pl: Also detect errors
Previously, the script would only detect warnings. Adapt
the pattern to capture errors as well.

Change-Id: I15ad97a9a1305aab91c046518f3c46b2e0c55127
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-20 16:21:43 +00:00
Eike Ziller
9979563a5f Dev package: Add headers and .pri files from qmlpuppet
Needed by Qt Quick Designer plugins.

Change-Id: Id759e110c31bb4d5f45811be5d910b973022e2cd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-02-01 08:00:49 +00:00
Eike Ziller
4db0b7aa2e Dev package: Add all .pri files
E.g. Qt Quick designer provides custom .pri files which are used
by designer plugins.

Change-Id: I73daa3ef4911120b12f7e320aefe3e67cf507fba
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-01-31 08:49:52 +00:00
Eike Ziller
271bc5e818 createDevPackage: Support extra plugins
Change-Id: Ie05b59dc3c17dceeee6bb74d9ae02dd7d29e4d2e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-19 15:17:17 +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
Friedemann Kleint
1ff72a5654 Add script to convert MSVC static analyzer results to task files
Add msanalyzer2tasks.pl, which does simple filtering on
the XML files.

Task-number: QTBUG-57086
Change-Id: I0ce0b1787aa54eac7cf6b3b9cdd258d5c9d62c60
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2016-12-09 13:39:32 +00:00
Friedemann Kleint
99ead48a7d purify2tasks.pl: Escape backslashes in messages
Purify sometimes has file names in its messages.

Change-Id: If0fd8306f124a9f59938092ae2bfa4efaca64f5d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-11-10 12:10:13 +00:00
Eike Ziller
2d6f33a92b Merge remote-tracking branch 'origin/4.1' into 4.2
Change-Id: Ic536dc74b969dce910ec6b91e5a308e97348b8bf
2016-11-01 08:44:04 +01:00
Eike Ziller
4f06d084fc Source packages: Fix that tar.xz was not xz but gz
Change-Id: I5379cdfe963f53cca04317ea51f544c40743db7b
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2016-10-28 08:50:00 +00:00
Eike Ziller
504a525b35 Merge remote-tracking branch 'origin/4.1' into 4.2
Conflicts:
	scripts/deployqtHelper_mac.sh
	src/plugins/ios/iostoolhandler.cpp

Change-Id: I06219e1c137e8f58f295da423363360457fa0b11
2016-10-24 08:31:00 +02:00
Vikas Pachdha
c1a46127cf Remove deployment of iossim tool
iossim tool no longer exists and it is replaced by Xcode's simctl tool

Change-Id: I4f4dbdc8b8e91663109c289b75a21dd92d966018
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-20 09:03:07 +00:00
Eike Ziller
f70d1359c0 Merge remote-tracking branch 'origin/4.1' into 4.2
Change-Id: Ib5b66f97374a4e330aa6fa9e604378da29290d65
2016-10-14 15:20:11 +02:00
Eike Ziller
614d14274d Extend source creation script for other plugins/components
And implement that in Python

Change-Id: I08d555927efffb0f8a4bafb54064ac2e5e06d730
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2016-10-13 10:21:11 +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
967b51d416 deployqtHelper: Assign names to command line arguments
Change-Id: I3870ce09c399743f30fa81ae3df51f65d47697b4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-08 08:51:24 +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
5fcf0a9ec6 Also create .tar.xz source packages
Change-Id: I21959a06ca8f10b2622b5008c0d4af2c9a4da703
Reviewed-by: Helio Chissini de Castro <helio@kde.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-07-06 15:23:15 +00:00
Eike Ziller
9b1e2cb48e Add script to create a "dev" package, and allow building against it
Collects all the needed data from a source and build directory,
which then can be used instead of a source directory in combination
with an installed Qt Creator, to build plugins.

On Windows and OS X the plugin can still only built in the same
mode (release or debug) as the used Qt Creator install.

Change-Id: I21119cc0681f1a5f657c969f5d1e7a23d69aedfe
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-05-20 09:59:35 +00:00
Eike Ziller
ae3b4f1a06 Linux deployment: Only add RPATH to Qt if necessary
Don't try to add an RPATH to Qt if the library/executable
does not link to Qt. Chances are, that the reserved space
for the RPATH is too short in that case.

Change-Id: Ie8d50ede43d19236611fe56667995e58606062db
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-05-13 12:58:41 +00:00
Friedemann Kleint
5e274c6f54 Set execute permission on all scripts.
Change-Id: I406665390406dca324c2c98dda37540b22a065df
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-04-07 15:04:26 +00:00
Eike Ziller
e60cffd2e4 packageIfw: Fix warnings
Change-Id: I3c8df19e1fb50e5d41413751f502cb5f7331bfc4
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-14 13:18:43 +00:00
Eike Ziller
db61acce80 Installer: Support different display version than component version
The component version must be numeric, but we want to display e.g.
Qt Creator 4.0.0-beta1 in the installer title.
The change adds a -d parameter to the script and adds corresponding
replacement variables.
Display version falls back to component version.

Change-Id: Ia8bcd05444e280f8a44ab321b043f4031725600d
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-14 13:18:22 +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
Friedemann Kleint
5c81e26a72 msvc2tasks.pl: Add support for clang-cl.exe and match errors, too.
Move regexp filtering into subroutine for clarity.

Task-number: QTCREATORBUG-15641
Task-number: QTBUG-50804
Change-Id: I2b78e82f41b83c64053b350b241f3c14246eb417
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-03 16:02:43 +00:00