Debian Buster target, CI script update

.ci/debian_build.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Creating folders
 cd ${PROJECT_DIR} && \
@@ -7,10 +7,6 @@ mkdir -p build && \
 mkdir -p assets && \
 chmod -x res/gta5sync_*.qm res/*.desktop res/*gta5view*.png && \
 cd build && \
-mkdir -p qt4 && \
-cd qt4 && \
-echo "Grand Theft Auto V Snapmatic and Savegame viewer/editor" > ./description-pak && \
-cd .. && \
 mkdir -p qt5 && \
 cd qt5 && \
 echo "Grand Theft Auto V Snapmatic and Savegame viewer/editor" > ./description-pak && \
@@ -27,7 +23,8 @@ mkdir -p /usr/share/gta5view && \
 cd qt5 && \
 cmake \
    "-DCMAKE_INSTALL_PREFIX=/usr" \
-   ${CMAKE_BUILD_TYPE} \
+   "${CMAKE_BUILD_TYPE}" \
+   "-DFORCE_QT_VERSION=5" \
    "-DGTA5VIEW_BUILDCODE=${PACKAGE_CODE}" \
    "-DGTA5VIEW_APPVER=${APPLICATION_VERSION}" \
    "-DGTA5VIEW_COMMIT=${APPLICATION_COMMIT}" \
@@ -36,9 +33,4 @@ cmake \
    "-DQCONF_BUILD=ON" \
    ../../ && \
 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,libqt5svg5,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} ${QMAKE_BUILD_TYPE} "DEFINES+=GTA5SYNC_BUILDCODE=\\\\\\\"${PACKAGE_CODE}\\\\\\\"" "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,libqt4-svg,qtcore4-l10n --conflicts=gta5view,gta5view-qt5 --replaces=gta5view,gta5view-qt5 --pakdir=${PROJECT_DIR}/assets
+checkinstall -D --default --nodoc --install=no --pkgname=gta5view --pkgversion=${PACKAGE_VERSION} --pkgrelease=${PACKAGE_BUILD} --pkggroup=utility --maintainer="Syping \<dpkg@syping.de\>" --requires=libqt5core5a,libqt5gui5,libqt5network5,libqt5svg5,libqt5widgets5,qttranslations5-l10n --conflicts=gta5view-qt4,gta5view-qt5 --replaces=gta5view-qt4,gta5view-qt5 --pakdir=${PROJECT_DIR}/assets

.ci/osx_build.sh

@@ -8,7 +8,15 @@ mkdir -p build && \
 mkdir -p assets && \
 cd build && \
 
-/usr/local/opt/qt/bin/qmake ${QMAKE_FLAGS_QT5} ${QMAKE_BUILD_TYPE} "DEFINES+=GTA5SYNC_BUILDCODE=\\\\\\\"${PACKAGE_CODE}\\\\\\\"" "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"${APPLICATION_VERSION}\\\\\\\"" "DEFINES+=GTA5SYNC_COMMIT=\\\\\\\"${APPLICATION_COMMIT}\\\\\\\"" DEFINES+=GTA5SYNC_TELEMETRY "DEFINES+=GTA5SYNC_TELEMETRY_WEBURL=\\\\\\\"https://dev.syping.de/gta5view-userstats/\\\\\\\"" ../gta5view.pro && \
+/usr/local/opt/qt/bin/qmake \
+   ${QMAKE_FLAGS_QT5} \
+   "${QMAKE_BUILD_TYPE}" \
+   "DEFINES+=GTA5SYNC_BUILDCODE=\\\\\\\"${PACKAGE_CODE}\\\\\\\"" \
+   "DEFINES+=GTA5SYNC_APPVER=\\\\\\\"${APPLICATION_VERSION}\\\\\\\"" \
+   "DEFINES+=GTA5SYNC_COMMIT=\\\\\\\"${APPLICATION_COMMIT}\\\\\\\"" \
+   "DEFINES+=GTA5SYNC_TELEMETRY" \
+   "DEFINES+=GTA5SYNC_TELEMETRY_WEBURL=\\\\\\\"https://dev.syping.de/gta5view-userstats/\\\\\\\"" \
+   ../gta5view.pro && \
 make -j 4 && \
 /usr/local/opt/qt/bin/macdeployqt gta5view.app -dmg && \
 cp -Rf gta5view.dmg ../assets/gta5view-osx_${APPLICATION_VERSION}.dmg

.ci/windows_build.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Prepare environment variable
 export GTA5VIEW_EXECUTABLE=gta5view-${EXECUTABLE_VERSION}${EXECUTABLE_ARCH}.exe && \
@@ -13,7 +13,7 @@ mkdir -p assets && \
 # Starting build
 cd build && \
 mingw64-qt-cmake \
-   ${CMAKE_BUILD_TYPE} \
+   "${CMAKE_BUILD_TYPE}" \
    "-DGTA5VIEW_BUILDCODE=${PACKAGE_CODE}" \
    "-DGTA5VIEW_APPVER=${APPLICATION_VERSION}" \
    "-DGTA5VIEW_COMMIT=${APPLICATION_COMMIT}" \

.ci/wininstall_build.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Creating folders
 cd ${PROJECT_DIR} && \
@@ -9,7 +9,7 @@ mkdir -p assets && \
 # Starting build
 cd build && \
 mingw64-qt-cmake \
-   ${CMAKE_BUILD_TYPE} \
+   "${CMAKE_BUILD_TYPE}" \
    "-DGTA5VIEW_BUILDCODE=${PACKAGE_CODE}" \
    "-DGTA5VIEW_APPVER=${APPLICATION_VERSION}" \
    "-DGTA5VIEW_COMMIT=${APPLICATION_COMMIT}" \

.travis.yml

@@ -15,7 +15,7 @@ matrix:
   - env:
     - BUILD_SCRIPT=debian_docker.sh
     - RELEASE_LABEL="Debian 64-Bit Package"
-    - DEBIAN_VERSION=stretch
+    - DEBIAN_VERSION=buster
     - DOCKER_USER=amd64
     - APT_INSTALL=clang
   - env: