Commit Graph

196 Commits

Author SHA1 Message Date
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
Tobias Hunger
51f5b1e01b License change: Update makedmg.sh script
Change-Id: I9068e57370a21d4567673ab8e3e4efb78a8561cb
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-01-20 10:53:16 +00:00
Tobias Hunger
b1f757af23 Update License according to aggrement with Free Qt Foundation
* Make sure all scripts come with a license
* Update the license in the scripts
* Add scripts to help with license changes

Change-Id: I38a25aa1287ee8a75e0f0307d1b30320d781ad1f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-19 15:44:55 +00:00
Tobias Hunger
07dd7d5fe2 Update License according to aggrement with Free Qt Foundation
* Update license files in various places
* Update the license template
* Update README.md and appdata.xml

Change-Id: I0ae9365b15364728165e79ba8ad86dfdd6cb9ddd
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-01-15 14:04:27 +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
57ae75061d Allow packaging additional 7zips in the installer
Change-Id: I435602671ef5cde46580d4ca383930951765ebde
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-10-09 11:33:21 +00:00
Eike Ziller
3b1a966cc8 Merge remote-tracking branch 'origin/3.5'
Change-Id: Iebaabfc2f724cd493b7cab025406531cea5cd2dc
2015-09-01 12:57:51 +02:00
Orgad Shaneh
b3f9207ea9 Installer: Fix syntax for Python 3
Change-Id: I09a08f032b2cb774c0cf7d7290b9ab7e886137a2
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-08-25 08:22:21 +00:00
Eike Ziller
37f6b4397d Merge remote-tracking branch 'origin/3.5'
Change-Id: I1ce0fa92e5c469d591d3030d1a4f168dcee232ba
2015-08-06 11:38:13 +02:00
Nikolai Kosjar
885e6dbac2 Clang: Add convenience script to check clang completions
This one is useful for inspecting the completions we get from clang
(e.g. for checking if the bug is in clang or in our code, or to compare
the completions of different clang versions).

Change-Id: If9dfe1b58a2b087ef6b92485e10ff272badf75c8
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-08-05 10:14:38 +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
68acdd7d0d Follow-up fixes for the libexec path change
The fallback puppet must be found in libexecPath now.
Deployment on OS X must also be adapted to the new location.
Broke with 6d5a5aff94

Change-Id: I8dc3d62188a2f19a7e203f939bd88065fb0504f8
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-07-15 09:49:15 +00:00
Eike Ziller
447f42d0e2 OS X: There is no qml(1)puppet anymore, so don't try to deploy it
Change-Id: Ic3f3150e3295529082ca621ec27792b2d08caed1
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 10:02:01 +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
0f5775ef5d OS X: Deploy clang binary for use by static analyzer
Change-Id: I0047cb33e7267b84310307eb3bb0f6c0d6b31bc5
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-07-09 16:57:19 +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