diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2017-03-15 12:23:21 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-03-16 14:27:50 +0000 |
commit | 40b299399c5fc3d14156f720e33e22d7a50f1f20 (patch) | |
tree | 82190a016ccc8b2a1bf3bbba0b9e8bdefc0cb8ae /scripts | |
parent | 1f8a5315f09ce8dfcab368af71c45e66caedf492 (diff) | |
download | meta-boot2qt-40b299399c5fc3d14156f720e33e22d7a50f1f20.tar.gz |
Add appman versions of Kit and Qt to creator
The application manager plugin needs own versions of Qt and Kit to work
correctly. Those can be enabled with --appman argument.
Change-Id: I089366367dad310f15b10d727931b0be46a97d93
Reviewed-by: Wolfgang Bremer <wolfgang.bremer@pelagicore.com>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/configure-qtcreator.sh | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/scripts/configure-qtcreator.sh b/scripts/configure-qtcreator.sh index 35b08b4..c1a3e8e 100755 --- a/scripts/configure-qtcreator.sh +++ b/scripts/configure-qtcreator.sh | |||
@@ -35,7 +35,7 @@ CONFIG="" | |||
35 | 35 | ||
36 | printUsage () | 36 | printUsage () |
37 | { | 37 | { |
38 | echo "Usage: $0 --config <environment-setup-file> [--remove] [--qtcreator <path>] [--name <basename>]" | 38 | echo "Usage: $0 --config <environment-setup-file> [--remove] [--qtcreator <path>] [--name <basename>] [--appman]" |
39 | } | 39 | } |
40 | 40 | ||
41 | while test -n "$1"; do | 41 | while test -n "$1"; do |
@@ -43,6 +43,9 @@ while test -n "$1"; do | |||
43 | "--remove") | 43 | "--remove") |
44 | REMOVEONLY=1 | 44 | REMOVEONLY=1 |
45 | ;; | 45 | ;; |
46 | "--appman") | ||
47 | APPMAN=1 | ||
48 | ;; | ||
46 | "--qtcreator") | 49 | "--qtcreator") |
47 | shift | 50 | shift |
48 | QTCREATOR=$1 | 51 | QTCREATOR=$1 |
@@ -96,7 +99,9 @@ NAME=${NAME:-"Custom Qt ${RELEASE} ${MACHINE}"} | |||
96 | BASEID="byos.${RELEASE}.${MACHINE}" | 99 | BASEID="byos.${RELEASE}.${MACHINE}" |
97 | 100 | ||
98 | ${SDKTOOL} rmKit --id ${BASEID}.kit 2>/dev/null || true | 101 | ${SDKTOOL} rmKit --id ${BASEID}.kit 2>/dev/null || true |
102 | ${SDKTOOL} rmKit --id ${BASEID}.am.kit 2>/dev/null || true | ||
99 | ${SDKTOOL} rmQt --id ${BASEID}.qt || true | 103 | ${SDKTOOL} rmQt --id ${BASEID}.qt || true |
104 | ${SDKTOOL} rmQt --id ${BASEID}.am.qt || true | ||
100 | ${SDKTOOL} rmTC --id ProjectExplorer.ToolChain.Gcc:${BASEID}.gcc || true | 105 | ${SDKTOOL} rmTC --id ProjectExplorer.ToolChain.Gcc:${BASEID}.gcc || true |
101 | ${SDKTOOL} rmTC --id ProjectExplorer.ToolChain.Gcc:${BASEID}.g++ || true | 106 | ${SDKTOOL} rmTC --id ProjectExplorer.ToolChain.Gcc:${BASEID}.g++ || true |
102 | ${SDKTOOL} rmDebugger --id ${BASEID}.gdb 2>/dev/null || true | 107 | ${SDKTOOL} rmDebugger --id ${BASEID}.gdb 2>/dev/null || true |
@@ -145,4 +150,24 @@ ${SDKTOOL} addKit \ | |||
145 | --icon ":/boot2qt/images/B2Qt_QtC_icon.png" \ | 150 | --icon ":/boot2qt/images/B2Qt_QtC_icon.png" \ |
146 | --mkspec "${MKSPEC}" | 151 | --mkspec "${MKSPEC}" |
147 | 152 | ||
153 | if [ -n "${APPMAN}" ]; then | ||
154 | ${SDKTOOL} addQt \ | ||
155 | --id "${BASEID}.am.qt" \ | ||
156 | --name "${NAME} [Application Manager]" \ | ||
157 | --type "AM.Qt" \ | ||
158 | --qmake "$(type -p qmake)" | ||
159 | |||
160 | ${SDKTOOL} addKit \ | ||
161 | --id "${BASEID}.am.kit" \ | ||
162 | --name "${NAME} [Application Manager]" \ | ||
163 | --qt "${BASEID}.am.qt" \ | ||
164 | --debuggerid "${BASEID}.gdb" \ | ||
165 | --sysroot "${SDKTARGETSYSROOT}" \ | ||
166 | --devicetype "AM.Device.Type" \ | ||
167 | --Ctoolchain "ProjectExplorer.ToolChain.Gcc:${BASEID}.gcc" \ | ||
168 | --Cxxtoolchain "ProjectExplorer.ToolChain.Gcc:${BASEID}.g++" \ | ||
169 | --icon ":/boot2qt/images/B2Qt_QtC_icon.png" \ | ||
170 | --mkspec "${MKSPEC}" | ||
171 | fi | ||
172 | |||
148 | echo "Configured Qt Creator with new kit: ${NAME}" | 173 | echo "Configured Qt Creator with new kit: ${NAME}" |