From d0e157bf1c270710bf18589146c58537d767b5da Mon Sep 17 00:00:00 2001 From: Syping Date: Sun, 3 Jun 2018 16:10:20 +0200 Subject: [PATCH] update Windows Qt to 5.9.5 --- .travis.yml | 6 ++---- .travis/debian_build.sh | 4 ++-- .travis/travis.sh | 2 +- .travis/windows_build.sh | 16 ++-------------- .travis/windows_travis.sh | 19 ++++++++++++++++--- .travis/wininstall_travis.sh | 2 +- 6 files changed, 24 insertions(+), 25 deletions(-) diff --git a/.travis.yml b/.travis.yml index b9f1b90..fa7bd35 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,16 +10,14 @@ matrix: include: - env: - BUILD_SCRIPT=debian_travis.sh - - QMAKE_FLAGS_QT4=QMAKE_CXXFLAGS+=-Wno-missing-field-initializers - RELEASE_LABEL="Debian 32-Bit Package" - - DEBIAN_VERSION=jessie + - DEBIAN_VERSION=stretch - DOCKER_USER=i386 - APT_INSTALL=clang - env: - BUILD_SCRIPT=debian_travis.sh - - QMAKE_FLAGS_QT4=QMAKE_CXXFLAGS+=-Wno-missing-field-initializers - RELEASE_LABEL="Debian 64-Bit Package" - - DEBIAN_VERSION=jessie + - DEBIAN_VERSION=stretch - DOCKER_USER=amd64 - APT_INSTALL=clang - env: diff --git a/.travis/debian_build.sh b/.travis/debian_build.sh index 52e6608..4d7598b 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 -p qt4 && \ cd qt4 && \ -echo "Grand Theft Auto V Snapmatic and Savegame viewer/manager" > ./description-pak && \ +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/manager" > ./description-pak && \ +echo "Grand Theft Auto V Snapmatic and Savegame viewer/editor" > ./description-pak && \ cd .. && \ # Prepare checkinstall step diff --git a/.travis/travis.sh b/.travis/travis.sh index e652f17..e88bc95 100755 --- a/.travis/travis.sh +++ b/.travis/travis.sh @@ -3,7 +3,7 @@ # Install lua if [ "${TRAVIS_OS_NAME}" == "linux" ]; then sudo apt-get update -qq && \ - sudo apt-get install -qq lua5.2 + sudo apt-get install -qq curl lua5.2 elif [ "${TRAVIS_OS_NAME}" == "osx" ]; then brew install lua fi diff --git a/.travis/windows_build.sh b/.travis/windows_build.sh index 55afee5..e64cac3 100755 --- a/.travis/windows_build.sh +++ b/.travis/windows_build.sh @@ -1,8 +1,6 @@ #!/bin/bash -apt-get update -qq && \ -apt-get install -qq curl && \ - +# Prepare environment variable export GTA5VIEW_EXECUTABLE=gta5view-${EXECUTABLE_VERSION}${EXECUTABLE_ARCH}.exe && \ # Creating folders @@ -18,14 +16,4 @@ qmake-static ${QMAKE_FLAGS} DEFINES+=GTA5SYNC_BUILDTYPE_DEV "DEFINES+=GTA5SYNC_B make -j 4 && \ cp -Rf release/*.exe ${PROJECT_DIR}/assets/${GTA5VIEW_EXECUTABLE} && \ cd ${PROJECT_DIR}/assets && \ -upx --best ${GTA5VIEW_EXECUTABLE} && \ - -if [ "${PACKAGE_CODE}" == "Dropbox" ]; then - ${PROJECT_DIR}/.travis/dropbox_uploader.sh mkdir gta5view-builds/${PACKAGE_VERSION} - ${PROJECT_DIR}/.travis/dropbox_uploader.sh upload ${GTA5VIEW_EXECUTABLE} gta5view-builds/${PACKAGE_VERSION}/${GTA5VIEW_EXECUTABLE} && \ - rm -rf ${GTA5VIEW_EXECUTABLE} -elif [ "${PACKAGE_CODE}" == "gta5-mods" ]; then - ${PROJECT_DIR}/.travis/dropbox_uploader.sh mkdir gta5-mods/${PACKAGE_VERSION} - ${PROJECT_DIR}/.travis/dropbox_uploader.sh upload ${GTA5VIEW_EXECUTABLE} gta5-mods/${PACKAGE_VERSION}/${GTA5VIEW_EXECUTABLE} && \ - rm -rf ${GTA5VIEW_EXECUTABLE} -fi +upx --best ${GTA5VIEW_EXECUTABLE} diff --git a/.travis/windows_travis.sh b/.travis/windows_travis.sh index 98ef778..8025ffa 100755 --- a/.travis/windows_travis.sh +++ b/.travis/windows_travis.sh @@ -1,6 +1,6 @@ #!/bin/bash -QT_VERSION=5.6.3 +QT_VERSION=5.9.5 DOCKER_IMAGE=syping/qt5-static-mingw:${QT_VERSION} PROJECT_DIR_DOCKER=/gta5view @@ -8,6 +8,19 @@ cd ${PROJECT_DIR} && \ docker pull ${DOCKER_IMAGE} && \ docker run --rm \ -v "${PROJECT_DIR}:${PROJECT_DIR_DOCKER}" \ - -v "${HOME}/.dropbox_uploader:/root/.dropbox_uploader" \ ${DOCKER_IMAGE} \ - /bin/bash -c "export PROJECT_DIR=${PROJECT_DIR_DOCKER} && export QT_SELECT=${QT_SELECT} && export APPLICATION_VERSION=${APPLICATION_VERSION} && 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 PACKAGE_CODE=${PACKAGE_CODE} && export EXECUTABLE_VERSION=${EXECUTABLE_VERSION} && export EXECUTABLE_ARCH=${EXECUTABLE_ARCH} && cd ${PROJECT_DIR_DOCKER} && .travis/windows_build.sh" + /bin/bash -c "export PROJECT_DIR=${PROJECT_DIR_DOCKER} && export QT_SELECT=${QT_SELECT} && export APPLICATION_VERSION=${APPLICATION_VERSION} && 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 PACKAGE_CODE=${PACKAGE_CODE} && export EXECUTABLE_VERSION=${EXECUTABLE_VERSION} && export EXECUTABLE_ARCH=${EXECUTABLE_ARCH} && cd ${PROJECT_DIR_DOCKER} && .travis/windows_build.sh" && \ + +# Prepare environment variable +export GTA5VIEW_EXECUTABLE=gta5view-${EXECUTABLE_VERSION}${EXECUTABLE_ARCH}.exe && \ + +# Upload Assets to Dropbox +if [ "${PACKAGE_CODE}" == "Dropbox" ]; then + ${PROJECT_DIR}/.travis/dropbox_uploader.sh mkdir gta5view-builds/${PACKAGE_VERSION} + ${PROJECT_DIR}/.travis/dropbox_uploader.sh upload cd ${PROJECT_DIR}/assets/${GTA5VIEW_EXECUTABLE} gta5view-builds/${PACKAGE_VERSION}/${GTA5VIEW_EXECUTABLE} && \ + rm -rf ${GTA5VIEW_EXECUTABLE} +elif [ "${PACKAGE_CODE}" == "gta5-mods" ]; then + ${PROJECT_DIR}/.travis/dropbox_uploader.sh mkdir gta5-mods/${PACKAGE_VERSION} + ${PROJECT_DIR}/.travis/dropbox_uploader.sh upload cd ${PROJECT_DIR}/assets/${GTA5VIEW_EXECUTABLE} gta5-mods/${PACKAGE_VERSION}/${GTA5VIEW_EXECUTABLE} && \ + rm -rf ${GTA5VIEW_EXECUTABLE} +fi diff --git a/.travis/wininstall_travis.sh b/.travis/wininstall_travis.sh index ed44a44..31a6853 100755 --- a/.travis/wininstall_travis.sh +++ b/.travis/wininstall_travis.sh @@ -1,6 +1,6 @@ #!/bin/bash -QT_VERSION=5.6.3 +QT_VERSION=5.9.5 DOCKER_IMAGE=syping/qt5-shared-mingw:${QT_VERSION} PROJECT_DIR_DOCKER=/gta5view