From 95a9cc90d1ce646c541bdb2c08caf9de4ecf0881 Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <s.schmidt@samsung.com>
Date: Wed, 30 Jan 2019 14:51:30 -0500
Subject: [PATCH] ci: travis: switch mingw cross build to also use Fedora 29 as
 base

Summary:
The new image also contains the ewpi install in a different location.
Updating the references here.

Reviewers: bu5hm4n, zmike

Reviewed By: zmike

Subscribers: cedric, #reviewers, #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D7833
---
 .ci/ci-configure.sh | 6 +++---
 .travis.yml         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index 1bd8d91068..3f35c9e969 100755
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -77,7 +77,7 @@ else
 
   RELEASE_READY_LINUX_COPTS=" --with-profile=release"
 
-  MINGW_COPTS=" --prefix=/root/EFL/ewpi_64 --host=x86_64-w64-mingw32 --with-eolian-gen=/usr/local/bin/eolian_gen \
+  MINGW_COPTS=" --prefix=/ewpi-64-install --host=x86_64-w64-mingw32 --with-eolian-gen=/usr/local/bin/eolian_gen \
   --with-edje-cc=/usr/local/bin/edje_cc --with-eet-eet=/usr/local/bin/eet \
   --with-bin-elm-prefs-cc=/usr/local/bin/elm_prefs_cc \
   --disable-static --with-tests=regular --with-crypto=openssl \
@@ -116,7 +116,7 @@ else
     if [ "$1" = "mingw" ]; then
       docker exec $(cat $HOME/cid) sh -c 'rm -f /src/config.cache'
       docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CFLAGS="-pipe" --env CXXFLAGS="-pipe" \
-        --env CPPFLAGS="-I/root/EFL/ewpi_64/include -DECORE_WIN32_WIP_POZEFLKSD" --env LDFLAGS="-L/root/EFL/ewpi_64/lib/" --env PKG_CONFIG_PATH="/root/EFL/ewpi_64/lib/pkgconfig/" \
+        --env CPPFLAGS="-I/ewpi-64-install/include -DECORE_WIN32_WIP_POZEFLKSD" --env LDFLAGS="-L/ewpi-64-install/lib/" --env PKG_CONFIG_PATH="/ewpi-64-install/lib/pkgconfig/" \
         $(cat $HOME/cid) sh -c "autoreconf -iv"
     else
       docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
@@ -127,7 +127,7 @@ else
     travis_fold configure "configure $OPTS"
     if [ "$1" = "mingw" ]; then
       docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CFLAGS="-pipe" --env CXXFLAGS="-pipe" \
-        --env CPPFLAGS="-I/root/EFL/ewpi_64/include -DECORE_WIN32_WIP_POZEFLKSD" --env LDFLAGS="-L/root/EFL/ewpi_64/lib/" --env PKG_CONFIG_PATH="/root/EFL/ewpi_64/lib/pkgconfig/" \
+        --env CPPFLAGS="-I/ewpi-64-install/include -DECORE_WIN32_WIP_POZEFLKSD" --env LDFLAGS="-L/ewpi-64-install/lib/" --env PKG_CONFIG_PATH="/ewpi-64-install/lib/pkgconfig/" \
         $(cat $HOME/cid) sh -c ".ci/configure.sh $OPTS"
     else
       docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
diff --git a/.travis.yml b/.travis.yml
index 833428a0b4..7b84077161 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ jobs:
     - os: osx
       env: BUILDSYSTEM=ninja
     - os: linux
-      env: DISTRO=Fedora28-mingw CI_BUILD_TYPE=mingw
+      env: DISTRO=Fedora29-mingw CI_BUILD_TYPE=mingw
     - os: linux
       env: DISTRO=Fedora29 CI_BUILD_TYPE=options-enabled
     - os: linux