Commit Graph

38 Commits

Author SHA1 Message Date
Tobias Hunger
a1020cc299 SDKtool: De-noise addkitoperation
Change-Id: I362b5dcda37631e746311f2ed13264ba97ba232c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-20 08:20:39 +00:00
Tobias Hunger
1b4321279f Update License according to agreement with Free Qt Foundation
* Update files in src/share* and src/tools

Change-Id: I78aa5d4a1d76212964e467de7676c1fcb2b777d6
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-19 15:48:57 +00:00
Tobias Hunger
cc817d508f SDKtool: Make sure to use '/' as path separator
All internal paths in Qt Creator are using '/' as path separator.
Make sure to normalize paths set via the SDKtool to that convention.

Change-Id: If7ef250d49686a0f60d08516b718eb7c84a059ef
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-01-19 15:15:57 +00:00
Orgad Shaneh
ec2b006d29 Sdktool: Avoid setting invalid debugger entry in kit
Change-Id: Ia8f8e7a5bdc8ab4e9d50fd5f7bca379ec3e3e4f0
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-07-22 11:29:07 +00:00
Tobias Hunger
b2e3f0262b Sdktool: Add switch to set environment for kits.
Use --env TEST=somevalue or --env TEST (to unset TEST) once per
environment variable you want to set/unset.

Task-number: QTCREATORBUG-14342
Change-Id: Ia968aeb55a9702d12bc0beb9a38bdd8309a18559
Reviewed-by: Rainer Keller <rainer.keller@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-05-04 13:50:34 +00:00
Tobias Hunger
5aba7fb095 Sdktool: Fix default kit handling
The default kit is addressed by its id, not its number for a long
time now. Update sdktool accordingly.

Change-Id: Iad0d0c6eda2aa824fa8add99871db7efebb30e75
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Rainer Keller <rainer.keller@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-05-04 13:49:19 +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
Eike Ziller
8295b503be License update
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-09 11:41:44 +02:00
Orgad Shaneh
ac33df0d7a SDKTool: Change DeviceType from QByteArray to QString
Change-Id: I224b6723891df4a8073fae327def13c0b41e8541
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-08-04 10:38:48 +02:00
Orgad Shaneh
382b1d43eb SdkTool: Use Qt Creator doctypes
Simplify filename conversion while at it

Change-Id: I0a7473aa42626a04214887f1cc82abe536233a78
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-08 12:44:16 +02:00
Orgad Shaneh
1e8047877f SdkTool: Fix capitalization
Change-Id: I1085dc89216ad37019227c967ddddbe999486cb1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-03 10:43:13 +02:00
Tobias Hunger
966f2aebc4 SDKtool: Only write values into kit that were set on the commandline
Do not put empty values for settings into the kits: These will prevent
data from being editable in Qt Creator.

Task-number: QTCREATORBUG-12017
Change-Id: I10f67ed0038ba7e1a79cbf7b5658247a2d18b8eb
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-04-09 17:14:14 +02:00
Tobias Hunger
8332e66529 SDKtool: Correctly handle mac ABIs
Task-number: QTCREATORBUG-11983

Change-Id: Id70bd18b1b5494db19adb9928277356c4d4a4688
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-04-07 11:34:00 +02:00
Tobias Hunger
4dbfd2883d SDKtool: Fix test case and compiler warning
Do check for toolchains not defined in the toolchains.xml file again,
but also allow for toolchain IDs to be ABIs.

This partially reverts a commit from Kai made earlier.

Change-Id: Idad004f0bff655bc136bc43de5837d61a045e311
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-04-04 15:26:23 +02:00
Kai Koehne
cc6dd54379 sdktool: Fix addKit complaining about unknown toolchains
Fixes a regression in 07f7dd9c14
that caused the Qt SDK installer to complain e.g. with

  Toolchain x86-linux-generic-elf-86bit does not exist.

Qt Creator has code to automatically detect toolchains, so
it's not necessary for every toolchain to be explicitly registered.

Task-number: QTBUG-37875
Change-Id: I1e8909da2ff919a8cccdf86bb3a2f7a5cc79a257
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-31 14:32:58 +02:00
Rainer Keller
07f7dd9c14 SDKtool: Check for existing objects when creating kits
Check for existing Qt versions, toolchains and devices if
those ids are given.

Change-Id: I0447d55e01cc40e43669ba7999126b0260974c0b
Reviewed-by: Rainer Keller <rainer.keller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-04 17:29:31 +01:00
Tobias Hunger
6db3893b16 SDKtool: Add --device option to addKit operation
Change-Id: I5403ae8b7a238f24aadd26c1db3a1b8b4c83fdb2
Reviewed-by: Rainer Keller <rainer.keller@digia.com>
2014-03-04 17:29:22 +01:00
Tobias Hunger
fd2c2df87c SDKtool: Rename findValues method to findValue
It only searches for one value.

Change-Id: If780de3a919c41a03c9c0a978688fd1ea0411eb9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-20 14:37:30 +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
Tobias Hunger
27143283bf SDKtool: Do not require --debugger "" when using --debuggerid
Change-Id: I9d1c7e5c16d492163d1f6459903096f3b9fb0758
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-30 12:06:37 +01:00
Tobias Hunger
85997b0bc1 SDKtool: Consistently use const char X[] for constants in .cpp files
Change-Id: Iee70ddb526a1751120be40bfd8d2ae01b27b80b8
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-29 18:11:13 +01:00
Tobias Hunger
63f7e76f6d SDKtool: Add support for debugger.xml
Add support to add/remove debugger entries to debuggers.xml

This is in addition to the existing mode of writing the debugger
path/debugger engine into the kit. This works reasonably well, but
the new mode offers better control as how the debugger is called, etc.

addKit also got a --debuggerid switch to set the debugger id instead
of using the old configuration format.

Change-Id: Id4be0366d2c126252419cf1ba87cd0e117204e54
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-29 18:11:01 +01:00
Kai Koehne
108899ef8f Don't return negative numbers in sdktool
Negative return values are interpreted as 'process crashed' on
Windows: QTBUG-28735 . This in turn means the installer framework
always shows an error dialog.

By using positive numbers even for error conditions the installer
can decide to ignore certain errors instead.

Change-Id: Ib5cdd461372ac13fe417feb6ff43a7424c159f68
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 11:33:32 +02:00
Eike Ziller
ef5d3796d5 Merge remote-tracking branch 'origin/2.7' into 2.8 2013-05-23 07:25:34 +02:00
Daniel Teske
4bb73adad6 sdktool: Add operations: Fix adding to a empty map, check the right map
Change-Id: Iddcf85d3a19bed28baa9bd4c5f964c370f8c9c42
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-17 12:33:58 +02:00
Friedemann Kleint
056e8aa4c2 Fix some Krazy warnings about non-const ref iterator.
Change-Id: I1c78f5f5a7174002cd25bea109d5fe795530cdb5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-03-11 17:31:07 +01:00
Tobias Hunger
8ad58249b0 SDKtool: Add SDK flag (always set to true) when creating kits
Change-Id: I966a127d42e9819bb722d23c631b6db3af6e08d7
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-25 15:28:59 +01:00
Tobias Hunger
fcb1693e83 SDKtool: Fix removal of toolchains
Change-Id: If66745582adcae1dbdb101cecc426280c1be182f
Reviewed-by: Rainer Keller <rainer.keller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-22 15:49:02 +01:00
Tobias Hunger
56582e8c06 SDKtool: Fix return values and improve error reporting
Change-Id: I1a44a39d5cd96be48608fdb4fab252a51046971e
Reviewed-by: David Faure <david.faure@kdab.com>
2013-02-07 12:16:45 +01:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
2013-01-31 16:25:33 +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
Orgad Shaneh
cd28b2e638 SDKTool: Build with QT_NO_CAST_FROM_ASCII
Change-Id: I7e61f530dc58f5e528d4a36439c57b5d017f24a3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-01-14 10:11:54 +01:00
Tobias Hunger
1a003ed29b SDKtool: Make sure the Qt id starts with "SDK." when setting up kits
We do the same when adding a new Qt version.

Change-Id: I910421ee4d913c76688b9ef6e4787edcd7c6f09f
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2012-11-22 14:09:19 +01:00
Tobias Hunger
ae2a600af8 sdktool: Fix type of device type and the unit tests
Change-Id: I64b817c0bd6c454d4f9cb423720c8baed8490fea
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-10 10:35:41 +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
Friedemann Kleint
23c3f61d1a Add Autodetection for system cdb/gdb for kits added by sdktool.
Introduced special 'auto' value for debugger binary.

Change-Id: I5be4fa148ce9ded06826a7dda647c5ba402dc70a
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2012-09-28 11:15:35 +02:00
Friedemann Kleint
6dad4586c6 sdktool: Fix MSVC warnings about comparison (!<int> == number).
Change-Id: I74be70ed1693160acab5c4be5da09d004bf0801c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-09-28 09:59:28 +02:00
Tobias Hunger
4f36ad63ce Add sdktool
Add a tool to ease configuration of Qt versions, tool chains
and kits with Qt Creator for the SDK and similar systems.

Change-Id: I9727dd25ea359a935ea494b035a59411eb3529b8
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2012-09-21 17:07:10 +02:00