summaryrefslogtreecommitdiff
path: root/.ci/ci-make-distcheck.sh
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-06-18 10:20:32 -0400
committerStefan Schmidt <s.schmidt@samsung.com>2019-06-19 13:26:06 +0200
commit90f5d5e1f16513378fe5a39ef49ac793fb3fb254 (patch)
tree105aad299b11e335bb1ab286e2e342200b746f46 /.ci/ci-make-distcheck.sh
parent47ada4f72c407ddf66a060e783030ff821233225 (diff)
ci: remove autotools-related conditionals
these are no longer used by anything Reviewed-by: Stefan Schmidt <stefan@datenfreihafen.org> Differential Revision: https://phab.enlightenment.org/D9108
Diffstat (limited to '.ci/ci-make-distcheck.sh')
-rwxr-xr-x.ci/ci-make-distcheck.sh27
1 files changed, 7 insertions, 20 deletions
diff --git a/.ci/ci-make-distcheck.sh b/.ci/ci-make-distcheck.sh
index 59b096a..9876671 100755
--- a/.ci/ci-make-distcheck.sh
+++ b/.ci/ci-make-distcheck.sh
@@ -6,27 +6,14 @@ if [ "$1" != "release-ready" ] ; then
6 exit 0 6 exit 0
7fi 7fi
8travis_fold distcheck "make distcheck" 8travis_fold distcheck "make distcheck"
9if [ "$BUILDSYSTEM" = "ninja" ] ; then
10if [ "$DISTRO" != "" ] ; then 9if [ "$DISTRO" != "" ] ; then
11 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \ 10 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \
12 --env CXX="ccache g++" \ 11 --env CXX="ccache g++" \
13 --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \ 12 --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
14 --env LD="ld.gold" $(cat $HOME/cid) dbus-launch ninja -C build dist || \ 13 --env LD="ld.gold" $(cat $HOME/cid) dbus-launch ninja -C build dist || \
15 (sudo cat efl-*/_build/sub/src/test-suite.log; false) 14 (sudo cat efl-*/_build/sub/src/test-suite.log; false)
16 else
17 export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
18 ninja -C build dist
19 fi
20else 15else
21 if [ "$DISTRO" != "" ] ; then 16 export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
22 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \ 17 ninja -C build dist
23 --env CXX="ccache g++" \
24 --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \
25 --env LD="ld.gold" $(cat $HOME/cid) bash -c .ci/distcheck.sh || \
26 (sudo cat efl-*/_build/sub/src/test-suite.log; false)
27 else
28 export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
29 make
30 fi
31fi 18fi
32travis_endfold distcheck 19travis_endfold distcheck