ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: Updated to Qt 5.10.1 and Clang/llvm 6.0

Browse Source 
* updated docker scripts and yml file
This commit is contained in:
Andreas Stallinger
2018-04-06 16:08:00 +02:00
parent 0c3f830c31
commit 20106d5ce1
5 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+2 -2
View File
@@ -1,7 +1,7 @@
variables: variables:
MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository" MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository"
IMAGE_64: coatisoftware/centos6_64_qt_llvm:qt591-llvm500 IMAGE_64: coatisoftware/centos6_64_qt_llvm:qt5101-llvm600
IMAGE_32: coatisoftware/centos6_32_qt_llvm:qt591-llvm500 IMAGE_32: coatisoftware/centos6_32_qt_llvm:qt5101-llvm600
## Templates ## ## Templates ##
README.md
+4 -4
View File
@@ -5,7 +5,7 @@
#### External Software #### External Software
* JDK 1.8 * JDK 1.8
* QT 5.9.1 * QT 5.10.1
* CxxTest 4.3 * 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) * 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 * Boost 1.64
@@ -24,11 +24,11 @@
* BOTAN_DIR - .../Botan-2.1.0 * BOTAN_DIR - .../Botan-2.1.0
For MacOS and Linux For MacOS and Linux
* QT_DIR - .../Qt/Qt5.9.1/5.9.1/<IDE> * QT_DIR - .../Qt/Qt5.10.1/5.10.1/<IDE>
For Windows: For Windows:
* QT_WIN32_DIR - .../Qt/Qt5.9.1/5.9.1/msvc2015 * QT_WIN32_DIR - .../Qt/Qt5.10.1/5.10.1/msvc2015
* QT_WIN64_DIR - .../Qt/Qt5.9.1/5.9.1/msvc2015_64 * QT_WIN64_DIR - .../Qt/Qt5.10.1/5.10.1/msvc2015_64
* VLD_DIR - .../Visual Leak Detector * VLD_DIR - .../Visual Leak Detector
* JAVA_HOME - .../Java/jdk1.x.x_xxx * JAVA_HOME - .../Java/jdk1.x.x_xxx
* path * path
deployment/dockerfiles/README.md
+1 -1
View File
@@ -31,7 +31,7 @@ $ docker push coatisoftware/centos6_64_qt_llvm:<tag>
$ cd ../centos6_32 $ cd ../centos6_32
$ docker build -t coatisoftware/centos6_32_qt_llvm:<tag> . $ docker build -t coatisoftware/centos6_32_qt_llvm:<tag> .
$ docker push coatisoftware/centos6_64_qt_llvm:<tag> $ docker push coatisoftware/centos6_32_qt_llvm:<tag>
# update <tag> of linux images in .gitlab-ci.yml # update <tag> of linux images in .gitlab-ci.yml
deployment/dockerfiles/linux/centos6_32/Dockerfile
+6 -6
View File
@@ -40,16 +40,16 @@ ENV M2_HOME=/opt/maven
ENV PATH=${M2_HOME}/bin:${PATH} ENV PATH=${M2_HOME}/bin:${PATH}
# Install Qt # Install Qt
ARG QVERSION_SHORT=5.9 ARG QVERSION_SHORT=5.10
ARG QTVERSION=5.9.1 ARG QTVERSION=5.10.1
RUN mkdir -p /qt && cd /qt && \ RUN mkdir -p /qt && cd /qt && \
wget http://download.qt.io/archive/qt/${QVERSION_SHORT}/${QTVERSION}/\ wget http://download.qt.io/archive/qt/${QVERSION_SHORT}/${QTVERSION}/\
single/qt-everywhere-opensource-src-${QTVERSION}.tar.xz && \ single/qt-everywhere-src-${QTVERSION}.tar.xz && \
tar xvf qt-everywhere-opensource-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/g++ /usr/bin/g++ && \
ln -sf /opt/rh/devtoolset-4/root/usr/bin/c++ /usr/bin/c++ && \ 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 \ ./configure -v -prefix /opt/qt${QTVERSION} -skip qtgamepad -platform linux-g++ -qt-pcre \
-qt-xcb -qt-xkbcommon -xkb-config-root /usr/share/X11/xkb \ -qt-xcb -qt-xkbcommon -xkb-config-root /usr/share/X11/xkb \
-no-pch -confirm-license -opensource && \ -no-pch -confirm-license -opensource && \
@@ -61,7 +61,7 @@ CC=gcc \
DEVTOOLSET=/opt/rh/devtoolset-4/root/usr/ DEVTOOLSET=/opt/rh/devtoolset-4/root/usr/
## Install llvm ## 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 && \ 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 && \ wget http://llvm.org/releases/${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.xz && \
tar xf llvm-${LLVM_VERSION}.src.tar.xz && \ tar xf llvm-${LLVM_VERSION}.src.tar.xz && \
deployment/dockerfiles/linux/centos6_64/Dockerfile
+6 -6
View File
@@ -5,8 +5,8 @@ MAINTAINER "Andreas Stallinger" <astallinger@coati.io>
WORKDIR /opt WORKDIR /opt
## set env ## set env
ARG QVERSION_SHORT=5.9 ARG QVERSION_SHORT=5.10
ARG QTVERSION=5.9.1 ARG QTVERSION=5.10.1
ENV QT_DIR=/opt/qt${QTVERSION} \ ENV QT_DIR=/opt/qt${QTVERSION} \
CXX_TEST_DIR=/opt/cxxtest \ CXX_TEST_DIR=/opt/cxxtest \
@@ -18,11 +18,11 @@ LD_LIBRARY_PATH=$QT_DIR/lib/
# Install Qt # Install Qt
RUN mkdir -p /qt && cd /qt && \ RUN mkdir -p /qt && cd /qt && \
wget http://download.qt.io/archive/qt/${QVERSION_SHORT}/${QTVERSION}/\ wget http://download.qt.io/archive/qt/${QVERSION_SHORT}/${QTVERSION}/\
single/qt-everywhere-opensource-src-${QTVERSION}.tar.xz && \ single/qt-everywhere-src-${QTVERSION}.tar.xz && \
tar xvf qt-everywhere-opensource-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/g++ /usr/bin/g++ && \
ln -sf /opt/rh/devtoolset-4/root/usr/bin/c++ /usr/bin/c++ && \ 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 \ ./configure -v \
-prefix /opt/qt${QTVERSION} \ -prefix /opt/qt${QTVERSION} \
-skip qtgamepad \ -skip qtgamepad \
@@ -54,7 +54,7 @@ make -j8 && \
make -j8 install && rm -Rf /qt make -j8 install && rm -Rf /qt
## Install llvm ## Install llvm
ARG LLVM_VERSION=5.0.0 ARG LLVM_VERSION=6.0.0
RUN mkdir -p /llvm && cd /llvm && \ RUN mkdir -p /llvm && cd /llvm && \
wget http://llvm.org/releases/${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.xz && \ wget http://llvm.org/releases/${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.xz && \
tar xvf llvm-${LLVM_VERSION}.src.tar.xz && \ tar xvf llvm-${LLVM_VERSION}.src.tar.xz && \