summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-x.ci/ci-configure.sh37
-rwxr-xr-x.ci/ci-make-check.sh4
-rwxr-xr-x.ci/ci-make-checkbuild.sh3
-rw-r--r--.travis.yml4
4 files changed, 6 insertions, 42 deletions
diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index e69cddc3c6..00f9e4b750 100755
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -29,13 +29,6 @@ MISC_DISABLED_LINUX_COPTS=" --disable-neon --disable-libeeze --disable-systemd -
29 29
30RELEASE_READY_LINUX_COPTS=" --with-profile=release" 30RELEASE_READY_LINUX_COPTS=" --with-profile=release"
31 31
32MINGW_COPTS=" --prefix=/root/EFL/ewpi_64 --host=x86_64-w64-mingw32 --with-eolian-gen=/usr/bin/eolian_gen \
33--with-edje-cc=/usr/bin/edje_cc --with-eet-eet=/usr/bin/eet --with-bin-elm-prefs-cc=/usr/bin/elm_prefs_cc \
34--disable-static --with-tests=regular --with-crypto=openssl --disable-gstreamer1 \
35--disable-libmount --disable-valgrind --disable-avahi --disable-spectre --disable-libraw \
36--disable-librsvg --disable-pulseaudio --disable-cxx-bindings \
37--disable-physics --disable-image-loader-tiff"
38
39patch -p1 < .ci/efl.m4.diff 32patch -p1 < .ci/efl.m4.diff
40sed -i.orig 's/AC_INIT\(.*\)efl_version-[a-zA-Z0-9]\+/AC_INIT\1efl_version/g' configure.ac 33sed -i.orig 's/AC_INIT\(.*\)efl_version-[a-zA-Z0-9]\+/AC_INIT\1efl_version/g' configure.ac
41 34
@@ -58,34 +51,16 @@ if [ "$DISTRO" != "" ] ; then
58 if [ "$1" = "release-ready" ]; then 51 if [ "$1" = "release-ready" ]; then
59 OPTS="$OPTS $RELEASE_READY_LINUX_COPTS" 52 OPTS="$OPTS $RELEASE_READY_LINUX_COPTS"
60 fi 53 fi
61
62 if [ "$1" = "mingw" ]; then
63 OPTS="$OPTS $MINGW_COPTS"
64 docker exec $(cat $HOME/cid) sh -c 'rm -f /src/config.cache'
65 fi
66 docker exec $(cat $HOME/cid) sh -c 'rm -f ~/.ccache/ccache.conf' 54 docker exec $(cat $HOME/cid) sh -c 'rm -f ~/.ccache/ccache.conf'
67 travis_fold autoreconf autoreconf 55 travis_fold autoreconf autoreconf
68 if [ "$1" = "mingw" ]; then 56 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
69 docker exec $(cat $HOME/cid) sh -c 'rm -f /src/config.cache' 57 --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
70 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CFLAGS="-pipe" --env CXXFLAGS="-pipe" \ 58 --env LD="ld.gold" $(cat $HOME/cid) sh -c "LIBTOOLIZE_OPTIONS='--no-warn' autoreconf -iv"
71 --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/" \
72 $(cat $HOME/cid) sh -c "autoreconf -iv"
73 else
74 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
75 --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
76 --env LD="ld.gold" $(cat $HOME/cid) sh -c "LIBTOOLIZE_OPTIONS='--no-warn' autoreconf -iv"
77 fi
78 travis_endfold autoreconf 59 travis_endfold autoreconf
79 travis_fold configure "configure $OPTS" 60 travis_fold configure "configure $OPTS"
80 if [ "$1" = "mingw" ]; then 61 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
81 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CFLAGS="-pipe" --env CXXFLAGS="-pipe" \ 62 --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
82 --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/" \ 63 --env LD="ld.gold" $(cat $HOME/cid) sh -c ".ci/configure.sh $OPTS"
83 $(cat $HOME/cid) sh -c ".ci/configure.sh $OPTS"
84 else
85 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
86 --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
87 --env LD="ld.gold" $(cat $HOME/cid) sh -c ".ci/configure.sh $OPTS"
88 fi
89 travis_endfold configure 64 travis_endfold configure
90else 65else
91 OSX_COPTS="--disable-cxx-bindings --with-tests=regular --disable-dependency-tracking -C" 66 OSX_COPTS="--disable-cxx-bindings --with-tests=regular --disable-dependency-tracking -C"
diff --git a/.ci/ci-make-check.sh b/.ci/ci-make-check.sh
index 6cbb5433ad..edb1752810 100755
--- a/.ci/ci-make-check.sh
+++ b/.ci/ci-make-check.sh
@@ -5,10 +5,6 @@ if [ "$1" = "release-ready" ] ; then
5 exit 0 5 exit 0
6fi 6fi
7 7
8if [ "$1" = "mingw" ] ; then
9 exit 0
10fi
11
12#T7151 8#T7151
13if [ "$1" = "misc" ] || [ "$1" = "misc-disabled" ] ; then 9if [ "$1" = "misc" ] || [ "$1" = "misc-disabled" ] ; then
14 exit 0 10 exit 0
diff --git a/.ci/ci-make-checkbuild.sh b/.ci/ci-make-checkbuild.sh
index 0fb77b1ffc..fab8a43635 100755
--- a/.ci/ci-make-checkbuild.sh
+++ b/.ci/ci-make-checkbuild.sh
@@ -5,9 +5,6 @@ set -e
5if [ "$1" = "release-ready" ] ; then 5if [ "$1" = "release-ready" ] ; then
6 exit 0 6 exit 0
7fi 7fi
8if [ "$1" = "mingw" ] ; then
9 exit 0
10fi
11travis_fold check-build "make check-build" 8travis_fold check-build "make check-build"
12if [ "$DISTRO" != "" ] ; then 9if [ "$DISTRO" != "" ] ; then
13 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make check-build 10 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make check-build
diff --git a/.travis.yml b/.travis.yml
index 32c5629691..8ef3386d04 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,10 +32,6 @@ jobs:
32 - os: linux 32 - os: linux
33 - DISTRO=Fedora28 33 - DISTRO=Fedora28
34 - CI_BUILD_TYPE=misc-disabled 34 - CI_BUILD_TYPE=misc-disabled
35 - env:
36 - os: linux
37 - DISTRO=Fedora28
38 - CI_BUILD_TYPE=mingw
39 - if: type = cron 35 - if: type = cron
40 env: 36 env:
41 - os: linux 37 - os: linux