From adbabc43384e14d135bb38ae7c219a9278238e12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole-Andr=C3=A9=20Rodlie?= Date: Sun, 3 Nov 2019 20:34:06 +0100 Subject: [PATCH] Revert "sdk: update mxe if needed" This reverts commit 3552a0ae755a08b377d22080a80b4461e2b01fff. --- res/travis.sh | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/res/travis.sh b/res/travis.sh index 4725ba9e..902c2eda 100755 --- a/res/travis.sh +++ b/res/travis.sh @@ -42,8 +42,6 @@ CWD=`pwd` MXE=/opt/mxe SDK=/opt/${OS} DEPLOY=/opt/deploy -MXE_GIT=https://github.com/rodlie/mxe -MXE_BRANCH=cyan-1.2.2 COMMIT="${TRAVIS_COMMIT}" if [ "${TRAVIS_TAG}" != "" ]; then @@ -64,23 +62,15 @@ if [ "${SETUP}" = 1 ]; then sudo apt-get install openssl patch perl pkg-config python ruby sed unzip wget xz-utils wine sudo apt-get install libgdk-pixbuf2.0-dev libltdl-dev libssl-dev libtool libxml-parser-perl make sudo apt-get install flex g++ g++-multilib libc6-dev-i386 wine p7zip-full libfreetype6-dev libfontconfig1-dev - - echo "Setup MXE ..." - cd /opt - git clone ${MXE_GIT} - cd ${MXE} - git checkout ${MXE_BRANCH} - echo "Extracting win64 sdk ..." + mkdir -p ${MXE} wget https://sourceforge.net/projects/prepress/files/sdk/cyan-sdk-mingw64_xenial64-gcc7-qt59-static-20191103.tar.xz/download && mv download download.tar.xz tar xf download.tar.xz -C ${MXE}/ rm -f download.tar.xz - echo "Extracting xenial64 sdk ..." wget https://sourceforge.net/projects/prepress/files/sdk/cyan-1.2-sdk-xenial64.tar.xz/download && mv download download.tar.xz sudo tar xf download.tar.xz -C / rm -f download.tar.xz - echo "Extracting linux64 sdk ..." wget https://sourceforge.net/projects/prepress/files/sdk/cyan-1.2-sdk-linux64.tar.xz/download && mv download download.tar.xz tar xf download.tar.xz -C /opt @@ -118,10 +108,6 @@ if [ "${OS}" = "Linux" ]; then qmake ../tests.pro make - echo "===> Update MXE ..." - cd ${MXE} - make MXE_USE_CCACHE= - echo "===> Building win64 ..." mkdir -p ${CWD}/win64 cd ${CWD}/win64