mirror of
git://code.qt.io/qt/qt5.git
synced 2026-04-25 14:17:50 +08:00
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts: coin/platform_configs/default.txt Change-Id: Ie21baa51738ce0761fb45fba3819b1894cc808b6
This commit is contained in:
3
coin/provisioning/common/linux/remove-update_notifier.sh
Executable file
3
coin/provisioning/common/linux/remove-update_notifier.sh
Executable file
@@ -0,0 +1,3 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
sudo apt -q -y remove update-notifier update-manager
|
||||
@@ -1,8 +1,8 @@
|
||||
#!/bin/env bash
|
||||
#!/usr/bin/env bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2017 The Qt Company Ltd.
|
||||
## Copyright (C) 2018 The Qt Company Ltd.
|
||||
## Contact: http://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
@@ -33,41 +33,28 @@
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
set +e
|
||||
|
||||
# shellcheck disable=SC1090
|
||||
|
||||
# We need to source to be able to use cmake in the shell
|
||||
if uname -a |grep -q "Ubuntu"; then
|
||||
source ~/.profile
|
||||
else
|
||||
source ~/.bashrc
|
||||
fi
|
||||
# This script installs Squish Coco
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../unix/DownloadURL.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
|
||||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
TEMPDIR=$(mktemp --directory) || echo "Failed to create temporary directory"
|
||||
# shellcheck disable=SC2064
|
||||
trap "sudo rm -fr $TEMPDIR" EXIT
|
||||
cd "$TEMPDIR"
|
||||
|
||||
sudo pip install --upgrade pip
|
||||
sudo pip install six
|
||||
version="4.2.2"
|
||||
sha1="a44f0f039f3712c715eea63c4021d08bf17a44c6"
|
||||
package="SquishCocoSetup_${version}_Linux_x86_64.run"
|
||||
url="http://ci-files01-hki.intra.qt.io/input/coco//$package"
|
||||
|
||||
git clone https://github.com/open62541/open62541.git open62541
|
||||
cd open62541
|
||||
git checkout 215651ab8db94e5eacdd10ec26a5a9fb96b9301f
|
||||
mkdir build
|
||||
cd build
|
||||
TARGETPATH=/opt/open62541
|
||||
cmake -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_METHODCALLS=ON -DCMAKE_INSTALL_PREFIX:PATH="$TARGETPATH" ..
|
||||
make
|
||||
echo "Enable license for Coco"
|
||||
|
||||
sudo make install
|
||||
sudo /sbin/ldconfig
|
||||
DownloadURL "$url" "$url" "$sha1" "/tmp/$package"
|
||||
sudo chmod 755 "/tmp/$package"
|
||||
echo 1 | sudo "/tmp/$package" "--nox11"
|
||||
|
||||
SetEnvVar "CI_OPEN62541_GCC_X64_PREFIX" "$TARGETPATH"
|
||||
/opt/SquishCoco/bin/cocolic --license-server=Qt-SRV-33.intra.qt.io:49344
|
||||
|
||||
echo "export PATH=/opt/SquishCoco/bin/:$PATH" >> ~/.bashrc
|
||||
|
||||
Reference in New Issue
Block a user