aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoni Jantti <joni.jantti@qt.io>2018-01-03 11:38:39 +0200
committerLiang Qi <liang.qi@qt.io>2018-01-08 15:54:23 +0000
commitdc6c54cb2d526141de75733bdba6d87fa3594ab6 (patch)
tree4adb00e98ac6d5212e9b9c4f778ded8933bbc82a
parenta8178a188873851025ede4c5f5dd7c40cf7d95fe (diff)
Provisioning: Ubuntu 16.04 - QNX700
QNX 7.0 is required by RTA on Ubuntu. Task-number: QTQAINFRA-1671 Change-Id: I82821e096cfa2d35a2176eba6e753a0d71049b72 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
-rw-r--r--coin/provisioning/common/qnx_700.sh8
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh38
2 files changed, 45 insertions, 1 deletions
diff --git a/coin/provisioning/common/qnx_700.sh b/coin/provisioning/common/qnx_700.sh
index 1f1c0f3f..74ce2948 100644
--- a/coin/provisioning/common/qnx_700.sh
+++ b/coin/provisioning/common/qnx_700.sh
@@ -56,6 +56,12 @@ if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then
fi
rm -rf $targetFile
+
# Set env variables
-echo "export QNX_700=$targetFolder$folderName" >> ~/.bashrc
+if uname -a |grep -q "Ubuntu"; then
+ echo "export QNX_700=$targetFolder$folderName" >> ~/.profile
+else
+ echo "export QNX_700=$targetFolder$folderName" >> ~/.bashrc
+fi
+
echo "QNX SDP = 7.0.0" >> ~/versions.txt
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh
new file mode 100755
index 00000000..6f0f3797
--- /dev/null
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh
@@ -0,0 +1,38 @@
+#!/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the test suite of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+set -ex
+
+source "${BASH_SOURCE%/*}/../common/qnx_700.sh"