From 20106d5ce1d2635d1efa3e7150cd0699e0b71a61 Mon Sep 17 00:00:00 2001 From: Andreas Stallinger Date: Fri, 6 Apr 2018 16:08:00 +0200 Subject: [PATCH] build: Updated to Qt 5.10.1 and Clang/llvm 6.0 * updated docker scripts and yml file --- .gitlab-ci.yml | 4 ++-- README.md | 8 ++++---- deployment/dockerfiles/README.md | 2 +- deployment/dockerfiles/linux/centos6_32/Dockerfile | 12 ++++++------ deployment/dockerfiles/linux/centos6_64/Dockerfile | 12 ++++++------ 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 02266afd..890348da 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ variables: MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository" - IMAGE_64: coatisoftware/centos6_64_qt_llvm:qt591-llvm500 - IMAGE_32: coatisoftware/centos6_32_qt_llvm:qt591-llvm500 + IMAGE_64: coatisoftware/centos6_64_qt_llvm:qt5101-llvm600 + IMAGE_32: coatisoftware/centos6_32_qt_llvm:qt5101-llvm600 ## Templates ## diff --git a/README.md b/README.md index c941b98e..e846e01e 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ #### External Software * JDK 1.8 -* QT 5.9.1 +* QT 5.10.1 * CxxTest 4.3 * Clang & LLVM 6.0 (doesnt quite work for windows, use unix setup below and skip all the ninja stuff)(installation guide http://clang.llvm.org/docs/LibASTMatchersTutorial.html) * Boost 1.64 @@ -24,11 +24,11 @@ * BOTAN_DIR - .../Botan-2.1.0 For MacOS and Linux -* QT_DIR - .../Qt/Qt5.9.1/5.9.1/ +* QT_DIR - .../Qt/Qt5.10.1/5.10.1/ For Windows: -* QT_WIN32_DIR - .../Qt/Qt5.9.1/5.9.1/msvc2015 -* QT_WIN64_DIR - .../Qt/Qt5.9.1/5.9.1/msvc2015_64 +* QT_WIN32_DIR - .../Qt/Qt5.10.1/5.10.1/msvc2015 +* QT_WIN64_DIR - .../Qt/Qt5.10.1/5.10.1/msvc2015_64 * VLD_DIR - .../Visual Leak Detector * JAVA_HOME - .../Java/jdk1.x.x_xxx * path diff --git a/deployment/dockerfiles/README.md b/deployment/dockerfiles/README.md index 4b0ab651..e4a25971 100644 --- a/deployment/dockerfiles/README.md +++ b/deployment/dockerfiles/README.md @@ -31,7 +31,7 @@ $ docker push coatisoftware/centos6_64_qt_llvm: $ cd ../centos6_32 $ docker build -t coatisoftware/centos6_32_qt_llvm: . -$ docker push coatisoftware/centos6_64_qt_llvm: +$ docker push coatisoftware/centos6_32_qt_llvm: # update of linux images in .gitlab-ci.yml diff --git a/deployment/dockerfiles/linux/centos6_32/Dockerfile b/deployment/dockerfiles/linux/centos6_32/Dockerfile index f5cb12da..7c212d47 100755 --- a/deployment/dockerfiles/linux/centos6_32/Dockerfile +++ b/deployment/dockerfiles/linux/centos6_32/Dockerfile @@ -40,16 +40,16 @@ ENV M2_HOME=/opt/maven ENV PATH=${M2_HOME}/bin:${PATH} # Install Qt -ARG QVERSION_SHORT=5.9 -ARG QTVERSION=5.9.1 +ARG QVERSION_SHORT=5.10 +ARG QTVERSION=5.10.1 RUN mkdir -p /qt && cd /qt && \ wget http://download.qt.io/archive/qt/${QVERSION_SHORT}/${QTVERSION}/\ -single/qt-everywhere-opensource-src-${QTVERSION}.tar.xz && \ -tar xvf qt-everywhere-opensource-src-${QTVERSION}.tar.xz && \ +single/qt-everywhere-src-${QTVERSION}.tar.xz && \ +tar xvf qt-everywhere-src-${QTVERSION}.tar.xz && \ ln -sf /opt/rh/devtoolset-4/root/usr/bin/g++ /usr/bin/g++ && \ ln -sf /opt/rh/devtoolset-4/root/usr/bin/c++ /usr/bin/c++ && \ -cd /qt/qt-everywhere-opensource-src-${QTVERSION} && \ +cd /qt/qt-everywhere-src-${QTVERSION} && \ ./configure -v -prefix /opt/qt${QTVERSION} -skip qtgamepad -platform linux-g++ -qt-pcre \ -qt-xcb -qt-xkbcommon -xkb-config-root /usr/share/X11/xkb \ -no-pch -confirm-license -opensource && \ @@ -61,7 +61,7 @@ CC=gcc \ DEVTOOLSET=/opt/rh/devtoolset-4/root/usr/ ## Install llvm -ARG LLVM_VERSION=5.0.0 +ARG LLVM_VERSION=6.0.0 RUN alias python=/usr/bin/python2.7 && mkdir -p /llvm && cd /llvm && \ wget http://llvm.org/releases/${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.xz && \ tar xf llvm-${LLVM_VERSION}.src.tar.xz && \ diff --git a/deployment/dockerfiles/linux/centos6_64/Dockerfile b/deployment/dockerfiles/linux/centos6_64/Dockerfile index 827ba60c..3ccc115e 100755 --- a/deployment/dockerfiles/linux/centos6_64/Dockerfile +++ b/deployment/dockerfiles/linux/centos6_64/Dockerfile @@ -5,8 +5,8 @@ MAINTAINER "Andreas Stallinger" WORKDIR /opt ## set env -ARG QVERSION_SHORT=5.9 -ARG QTVERSION=5.9.1 +ARG QVERSION_SHORT=5.10 +ARG QTVERSION=5.10.1 ENV QT_DIR=/opt/qt${QTVERSION} \ CXX_TEST_DIR=/opt/cxxtest \ @@ -18,11 +18,11 @@ LD_LIBRARY_PATH=$QT_DIR/lib/ # Install Qt RUN mkdir -p /qt && cd /qt && \ wget http://download.qt.io/archive/qt/${QVERSION_SHORT}/${QTVERSION}/\ -single/qt-everywhere-opensource-src-${QTVERSION}.tar.xz && \ -tar xvf qt-everywhere-opensource-src-${QTVERSION}.tar.xz && \ +single/qt-everywhere-src-${QTVERSION}.tar.xz && \ +tar xvf qt-everywhere-src-${QTVERSION}.tar.xz && \ ln -sf /opt/rh/devtoolset-4/root/usr/bin/g++ /usr/bin/g++ && \ ln -sf /opt/rh/devtoolset-4/root/usr/bin/c++ /usr/bin/c++ && \ -cd /qt/qt-everywhere-opensource-src-${QTVERSION} && \ +cd /qt/qt-everywhere-src-${QTVERSION} && \ ./configure -v \ -prefix /opt/qt${QTVERSION} \ -skip qtgamepad \ @@ -54,7 +54,7 @@ make -j8 && \ make -j8 install && rm -Rf /qt ## Install llvm -ARG LLVM_VERSION=5.0.0 +ARG LLVM_VERSION=6.0.0 RUN mkdir -p /llvm && cd /llvm && \ wget http://llvm.org/releases/${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.xz && \ tar xvf llvm-${LLVM_VERSION}.src.tar.xz && \