From 1c124d4ce3a570bd660d3e042dad29fa99f08000 Mon Sep 17 00:00:00 2001
From: Syping <schiedelrafael@keppe.org>
Date: Wed, 17 Jan 2018 19:06:39 +0100
Subject: [PATCH] travis build rc

---
 .travis.yml                                      |  9 ++++++---
 .travis/debian64_travis.sh                       | 11 -----------
 .travis/debian_build.sh                          |  8 ++++----
 .travis/{debian32_travis.sh => debian_travis.sh} |  6 +++++-
 4 files changed, 15 insertions(+), 19 deletions(-)
 delete mode 100755 .travis/debian64_travis.sh
 rename .travis/{debian32_travis.sh => debian_travis.sh} (84%)

diff --git a/.travis.yml b/.travis.yml
index a33c7dc..831bca1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 dist: trusty
 sudo: required
 
-language: cpp
+language: generic
 
 service:
   - docker
@@ -9,12 +9,15 @@ service:
 matrix:
   include:
   - env:
-    - BUILD_SCRIPT=debian32_travis.sh
+    - BUILD_SCRIPT=debian_travis.sh
+    - DOCKER_USER=i386
     - QMAKE_FLAGS_QT4=QMAKE_CXXFLAGS+=-Wno-missing-field-initializers
+    - DEBIAN_VERSION=jessie
     - APT_INSTALL=clang
   - env:
-    - BUILD_SCRIPT=debian64_travis.sh
+    - BUILD_SCRIPT=debian_travis.sh
     - QMAKE_FLAGS_QT4=QMAKE_CXXFLAGS+=-Wno-missing-field-initializers
+    - DEBIAN_VERSION=jessie
     - APT_INSTALL=clang
   - env:
     - BUILD_SCRIPT=windows_travis.sh
diff --git a/.travis/debian64_travis.sh b/.travis/debian64_travis.sh
deleted file mode 100755
index d9b80fb..0000000
--- a/.travis/debian64_travis.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-DOCKER_IMAGE=debian:jessie
-PROJECT_DIR_DOCKER=/gta5view
-
-cd ${PROJECT_DIR} && \
-docker pull ${DOCKER_IMAGE} && \
-docker run --rm \
-	-v "${PROJECT_DIR}:${PROJECT_DIR_DOCKER}" \
-	${DOCKER_IMAGE} \
-	/bin/bash -c "export PROJECT_DIR=${PROJECT_DIR_DOCKER} && export QT_SELECT=${QT_SELECT} && export APPLICATION_VERSION=${APPLICATION_VERSION} && export APT_INSTALL=${APT_INSTALL} && export QMAKE_FLAGS_QT4=${QMAKE_FLAGS_QT4} && export QMAKE_FLAGS_QT5=${QMAKE_FLAGS_QT5} && export PACKAGE_VERSION=${PACKAGE_VERSION} && export PACKAGE_BUILD=${PACKAGE_BUILD} && export EXECUTABLE_VERSION=${EXECUTABLE_VERSION} && export EXECUTABLE_ARCH=${EXECUTABLE_ARCH} && cd ${PROJECT_DIR_DOCKER} && .travis/debian_install.sh && .travis/debian_build.sh"
diff --git a/.travis/debian_build.sh b/.travis/debian_build.sh
index 2fcb0fe..d4e126f 100755
--- a/.travis/debian_build.sh
+++ b/.travis/debian_build.sh
@@ -9,11 +9,11 @@ chmod -x res/gta5sync_*.qm res/gta5view.desktop res/gta5view.png && \
 cd build && \
 mkdir qt4 && \
 cd qt4 && \
-echo "Grand Theft Auto V Snapmatic and Savegame viewer" > ./description-pak && \
+echo "Grand Theft Auto V Snapmatic and Savegame viewer/manager" > ./description-pak && \
 cd .. && \
 mkdir qt5 && \
 cd qt5 && \
-echo "Grand Theft Auto V Snapmatic and Savegame viewer" > ./description-pak && \
+echo "Grand Theft Auto V Snapmatic and Savegame viewer/manager" > ./description-pak && \
 cd .. && \
 
 # Prepare checkinstall step
@@ -21,11 +21,11 @@ mkdir -p /usr/share/gta5view && \
 
 # Starting build
 cd qt5 && \
-qmake -qt=5 -spec linux-clang GTA5SYNC_PREFIX=/usr QMAKE_CXXFLAGS+=-std=gnu++11 ${QMAKE_FLAGS_QT5} DEFINES+=GTA5SYNC_BUILDTYPE_DEV "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"${APPLICATION_VERSION}\\\\\\\"" DEFINES+=GTA5SYNC_QCONF DEFINES+=GTA5SYNC_TELEMETRY "DEFINES+=GTA5SYNC_TELEMETRY_WEBURL=\\\\\\\"https://dev.syping.de/gta5view-userstats/\\\\\\\"" ../../gta5view.pro && \
+qmake -qt=5 -spec linux-clang GTA5SYNC_PREFIX=/usr QMAKE_CXXFLAGS+=-std=gnu++11 ${QMAKE_FLAGS_QT5} DEFINES+=GTA5SYNC_BUILDTYPE_RC "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"${APPLICATION_VERSION}\\\\\\\"" DEFINES+=GTA5SYNC_QCONF DEFINES+=GTA5SYNC_TELEMETRY "DEFINES+=GTA5SYNC_TELEMETRY_WEBURL=\\\\\\\"https://dev.syping.de/gta5view-userstats/\\\\\\\"" ../../gta5view.pro && \
 make -j 4 && \
 checkinstall -D --default --nodoc --install=no --pkgname=gta5view-qt5 --pkgversion=${PACKAGE_VERSION} --pkgrelease=${PACKAGE_BUILD} --pkggroup=utility --maintainer="Syping \<dpkg@syping.de\>" --requires=libqt5core5a,libqt5gui5,libqt5network5,libqt5widgets5,qttranslations5-l10n --conflicts=gta5view,gta5view-qt4 --replaces=gta5view,gta5view-qt4 --pakdir=${PROJECT_DIR}/assets && \
 cd .. && \
 cd qt4 && \
-qmake -qt=4 GTA5SYNC_PREFIX=/usr QMAKE_CXXFLAGS+=-std=gnu++11 ${QMAKE_FLAGS_QT4} DEFINES+=GTA5SYNC_BUILDTYPE_DEV "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"${APPLICATION_VERSION}\\\\\\\"" DEFINES+=GTA5SYNC_QCONF ../../gta5view.pro && \
+qmake -qt=4 GTA5SYNC_PREFIX=/usr QMAKE_CXXFLAGS+=-std=gnu++11 ${QMAKE_FLAGS_QT4} DEFINES+=GTA5SYNC_BUILDTYPE_RC "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"${APPLICATION_VERSION}\\\\\\\"" DEFINES+=GTA5SYNC_QCONF ../../gta5view.pro && \
 make -j 4 && \
 checkinstall -D --default --nodoc --install=no --pkgname=gta5view-qt4 --pkgversion=${PACKAGE_VERSION} --pkgrelease=${PACKAGE_BUILD} --pkggroup=utility --maintainer="Syping \<dpkg@syping.de\>" --requires=libqtcore4,libqtgui4,libqt4-network,qtcore4-l10n --conflicts=gta5view,gta5view-qt5 --replaces=gta5view,gta5view-qt5 --pakdir=${PROJECT_DIR}/assets
diff --git a/.travis/debian32_travis.sh b/.travis/debian_travis.sh
similarity index 84%
rename from .travis/debian32_travis.sh
rename to .travis/debian_travis.sh
index a4e6c75..8fa5ed8 100755
--- a/.travis/debian32_travis.sh
+++ b/.travis/debian_travis.sh
@@ -1,6 +1,10 @@
 #!/bin/bash
 
-DOCKER_IMAGE=i386/debian:jessie
+if [[ ${DOCKER_USER} ]]; then
+	DOCKER_IMAGE=${DOCKER_USER}/debian:${DEBIAN_VERSION}
+else
+	DOCKER_IMAGE=debian:${DEBIAN_VERSION}
+fi
 PROJECT_DIR_DOCKER=/gta5view
 
 cd ${PROJECT_DIR} && \