From d9bf3742ad11eda2345053e651f01d884791e187 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 13 Mar 2019 15:48:43 +0100 Subject: Add double-conversion to the list of installed packages This external dependency is now required by QtCore on Linux. Change-Id: I910a3e17ec4d6c10ad4e1a9dfc31d1340fe110de Reviewed-by: Alexandru Croitor --- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64') diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index f0585186..509c6747 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -166,6 +166,8 @@ installPackages+=(git-lfs) installPackages+=(chrpath) installPackages+=(gawk) installPackages+=(texinfo) +# Needed for QtCore +installPackages+=(libdouble-conversion-dev) echo "Running update for apt" waitLoop -- cgit v1.2.3 From 7343e226d42c8425577a26d161ac9d9738571548 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 15 Mar 2019 10:54:00 +0100 Subject: Provisioning: build cmake from source Change-Id: I6b4006250a7e019d7c38eaf3c29ae75a3a65300c Reviewed-by: Alexandru Croitor Reviewed-by: Simon Hausmann --- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-cmake.sh | 5 ----- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-cmake.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh (limited to 'coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64') diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-cmake.sh deleted file mode 100755 index db8a3ff5..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-cmake.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -BASEDIR=$(dirname "$0") -"$BASEDIR/../common/linux/cmake_linux.sh" - diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh new file mode 100755 index 00000000..0d799bff --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/install_cmake.sh" + -- cgit v1.2.3 From 38b6cbfd4261433548674aa4d109fff8a007c636 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 15 Mar 2019 22:29:35 +0100 Subject: Provisioning: Add pcre2 to the list of installed packages This external dependency is now required by QtCore on Linux. Change-Id: I47ba758e86e110c33f9e2bc7607ff9352892470a Reviewed-by: Simon Hausmann --- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64') diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index 509c6747..15b8397b 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -168,6 +168,7 @@ installPackages+=(gawk) installPackages+=(texinfo) # Needed for QtCore installPackages+=(libdouble-conversion-dev) +installPackages+=(libpcre2-dev) echo "Running update for apt" waitLoop -- cgit v1.2.3 From d44a7a5f145ebdd49e09da358850d102f089c0df Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 5 Jun 2019 14:39:44 +0200 Subject: Install cmake from binaries instead of from source MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The from-source installation originates from a point in time where there was no cmake release with binaries that were sufficient. That is not the case with 3.15-rc1. Change-Id: I385016969f21c194b25334e3af8af7283fc5873f Reviewed-by: Jędrzej Nowacki --- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64') diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh index 0d799bff..cafbd3a5 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh @@ -1,5 +1,5 @@ #!/bin/bash BASEDIR=$(dirname "$0") -"$BASEDIR/../common/unix/install_cmake.sh" +"$BASEDIR/../common/linux/install_cmake.sh" -- cgit v1.2.3 From 716cb8185a769265cf1fd3f88926bfce4cb5361b Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 6 Jun 2019 08:57:36 +0200 Subject: Fix path to cmake installation script Amends commit d44a7a5f145ebdd49e09da358850d102f089c0df Change-Id: I52926a8e8c488beaeb70c9bf0222c7caa0ccfe9c Reviewed-by: Simon Hausmann --- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64') diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh index cafbd3a5..db8a3ff5 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh @@ -1,5 +1,5 @@ #!/bin/bash BASEDIR=$(dirname "$0") -"$BASEDIR/../common/linux/install_cmake.sh" +"$BASEDIR/../common/linux/cmake_linux.sh" -- cgit v1.2.3 From 1478b607d6b32d63297927bdd5d47fccc29038cb Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 2 Oct 2019 10:00:48 +0200 Subject: Provisioning: install libsdl2 on ubuntu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3c547c1e44ebc734fd9908db2828440bc13f55f5 Reviewed-by: Qt CMake Build Bot Reviewed-by: Mårten Nordheim Reviewed-by: Alexandru Croitor --- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to 'coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64') diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index bfb58a2c..ee121e92 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -169,6 +169,9 @@ installPackages+=(texinfo) # Needed for QtCore installPackages+=(libdouble-conversion-dev) installPackages+=(libpcre2-dev) +# Needed for qtgampepad +installPackages+=(libsdl2-2.0) +installPackages+=(libsdl2-dev) echo "Running update for apt" waitLoop -- cgit v1.2.3