Skip to content

Commit

Permalink
Revert "sdk: update mxe if needed"
Browse files Browse the repository at this point in the history
This reverts commit 3552a0a.
  • Loading branch information
rodlie committed Nov 3, 2019
1 parent 30562e5 commit adbabc4
Showing 1 changed file with 1 addition and 15 deletions.
16 changes: 1 addition & 15 deletions res/travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit adbabc4

Please sign in to comment.