summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2019-06-19 09:25:56 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-06-19 09:25:56 -0400
commita873ae6ea0134437bcafa76289f4aa74bd13d1cd (patch)
tree21e07f60a4b558718d90079851aad636fc68dedc
parent90f5d5e1f16513378fe5a39ef49ac793fb3fb254 (diff)
ci: remove no longer used scripts and patch file
Summary: With the autotools build system gone we now longer need these files in our CI system. Reviewers: zmike, bu5hm4n Reviewed By: zmike Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D9116
-rwxr-xr-x.ci/configure.sh11
-rwxr-xr-x.ci/distcheck.sh125
-rw-r--r--.ci/efl.m4.diff24
3 files changed, 0 insertions, 160 deletions
diff --git a/.ci/configure.sh b/.ci/configure.sh
deleted file mode 100755
index bdc2d85274..0000000000
--- a/.ci/configure.sh
+++ /dev/null
@@ -1,11 +0,0 @@
1#!/bin/bash +e
2
3set -o pipefail
4export TEST_VAR=1
5if ! ./configure $@ 2>&1 | tee -a configlog ; then
6 if grep -q 'configure: error: changes in the environment can compromise the build' configlog ; then
7 echo "clearing config.cache and retrying..."
8 rm -f configlog config.cache
9 ./configure $@
10 fi
11fi
diff --git a/.ci/distcheck.sh b/.ci/distcheck.sh
deleted file mode 100755
index 8c8e7cdf97..0000000000
--- a/.ci/distcheck.sh
+++ /dev/null
@@ -1,125 +0,0 @@
1#!/bin/bash
2
3. .ci/travis.sh
4
5scrape_makefile_variable() {
6 #try to scrape $1 from Makefile
7 num=0
8 var=
9 while true ; do
10 var="$(grep -A${num} -m1 -w $1 Makefile.am)"
11 #continually increment number of lines scraped if backslash is detected
12 if echo "$var" | tail -n1 | grep -q '\\' ; then
13 num=$((++num))
14 else
15 #cut out line wrapping
16 var=$(echo "$var" | tr -d '\n\\' | cut -d= -f2-)
17 break
18 fi
19 done
20 echo $var
21}
22
23#attempt to keep this as close to original makefile rule as possible
24#for ease of future updating
25
26set -e
27
28travis_fold dist "make dist"
29#create dist tarball
30make dist
31travis_endfold dist
32
33#set distdir variable to current package string
34distdir="$(grep '^PACKAGE_STRING' config.log|cut -d\' -f2|tr ' ' -)"
35DIST_ARCHIVES=${distdir}.tar.xz
36MAKE=make
37
38#unpack dist tarball
39xz -dc ${distdir}.tar.xz | tar -xf -
40
41chmod -R a-w ${distdir}
42chmod u+w ${distdir}
43mkdir ${distdir}/_build ${distdir}/_build/sub ${distdir}/_inst
44chmod a-w ${distdir}
45test -d ${distdir}/_build
46
47dc_install_base=`cd ${distdir}/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'`
48dc_destdir="${TMPDIR-/tmp}/am-dc-XXXX"
49am__cwd=`pwd`
50
51AM_DISTCHECK_CONFIGURE_FLAGS="$(scrape_makefile_variable AM_DISTCHECK_CONFIGURE_FLAGS)"
52AM_MAKEFLAGS="$(scrape_makefile_variable AM_MAKEFLAGS)"
53
54travis_fold configure "configuring distcheck build"
55cd ${distdir}/_build/sub
56../../configure \
57 ${AM_DISTCHECK_CONFIGURE_FLAGS} \
58 ${DISTCHECK_CONFIGURE_FLAGS} \
59 --srcdir=../.. --prefix="$dc_install_base"
60travis_endfold configure
61travis_fold make make
62make ${AM_MAKEFLAGS}
63travis_endfold make
64travis_fold dvi dvi
65make ${AM_MAKEFLAGS} dvi
66travis_endfold dvi
67travis_fold check-build check-build
68make ${AM_MAKEFLAGS} check-build
69travis_endfold check-build
70travis_fold check-TESTS check-TESTS
71set +e
72export EINA_LOG_BACKTRACE="0"
73NUM_TRIES=5
74for tries in $(seq 1 ${NUM_TRIES}); do
75 make ${AM_MAKEFLAGS} -C src/ -j1 check-TESTS && break
76 cat src/test-suite.log
77 if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; continue ; fi
78 exit 1
79done
80travis_endfold check-TESTS
81set -e
82travis_fold make_install "make install"
83make ${AM_MAKEFLAGS} install
84travis_endfold make_install
85travis_fold make_installcheck "make installcheck"
86make ${AM_MAKEFLAGS} installcheck
87travis_endfold make_installcheck
88travis_fold make_testapp "testing external compile"
89PKG_CONFIG_PATH=${dc_install_base}/lib/pkgconfig ${am__cwd}/.ci/build-efl-app.sh
90travis_endfold make_testapp
91travis_fold make_uninstall "make uninstall"
92make ${AM_MAKEFLAGS} uninstall
93travis_endfold make_uninstall
94travis_fold distuninstallcheck "make distuninstallcheck"
95make ${AM_MAKEFLAGS} distuninstallcheck_dir="$dc_install_base" \
96 distuninstallcheck
97travis_endfold distuninstallcheck
98chmod -R a-w "$dc_install_base"
99 (cd ../.. && umask 077 && mktemp -d "$dc_destdir")
100 travis_fold dist-install "make dist-install"
101 make ${AM_MAKEFLAGS} DESTDIR="$dc_destdir" install
102 travis_endfold dist-install
103 travis_fold dist-uninstall "make dist-uninstall"
104 make ${AM_MAKEFLAGS} DESTDIR="$dc_destdir" uninstall
105 travis_endfold dist-uninstall
106 travis_fold dist-distuninstallcheck "make dist-distuninstallcheck"
107 make ${AM_MAKEFLAGS} DESTDIR="$dc_destdir" \
108 distuninstallcheck_dir="$dc_destdir" distuninstallcheck \
109 || { rm -rf "$dc_destdir"; exit 1; }
110 travis_endfold dist-distuninstallcheck
111rm -rf "$dc_destdir"
112travis_fold dist-dist "make dist-dist"
113make ${AM_MAKEFLAGS} dist
114travis_endfold dist-dist
115rm -rf ${DIST_ARCHIVES}
116travis_fold dist-distcleancheck "make dist-distcleancheck"
117make ${AM_MAKEFLAGS} distcleancheck
118travis_endfold dist-distcleancheck
119cd "$am__cwd"
120#$(am__post_remove_distdir)
121if test -d "${distdir}"; then
122 find "${distdir}" -type d ! -perm -200 -exec chmod u+w {} ';' \
123 && rm -rf "${distdir}" \
124 || { rm -rf "${distdir}"; }; \
125else :; fi
diff --git a/.ci/efl.m4.diff b/.ci/efl.m4.diff
deleted file mode 100644
index fda939a8ed..0000000000
--- a/.ci/efl.m4.diff
+++ /dev/null
@@ -1,24 +0,0 @@
1diff --git a/m4/efl.m4 b/m4/efl.m4
2index d051155e56..4b91c60963 100644
3--- a/m4/efl.m4
4+++ b/m4/efl.m4
5@@ -22,14 +22,14 @@ dnl dev_version = development version (svn revision).
6 dnl def_build_profile = dev or release based on 'dev' release parameter.
7 AC_DEFUN([EFL_VERSION],
8 [dnl
9-m4_define([v_maj], [$1])dnl
10-m4_define([v_min], [$2])dnl
11-m4_define([v_mic], [$3])dnl
12-m4_define([dev_version], m4_esyscmd([(git rev-list --count HEAD 2>/dev/null || echo 0) | tr -d '\n']))dnl
13+m4_define([v_maj], [1])dnl
14+m4_define([v_min], [99])dnl
15+m4_define([v_mic], [99])dnl
16+m4_define([dev_version], [0])
17 m4_define([v_rev], m4_if($4, dev, [dev_version], [0]))dnl
18 m4_define([v_rel], [])dnl
19 m4_define([def_build_profile], m4_if($4, dev, [dev], [release]))dnl
20-m4_define([efl_version], m4_if($4, dev, [v_maj.v_min.v_mic.v_rev], [v_maj.v_min.v_mic]))dnl
21+m4_define([efl_version], [v_maj.v_min.v_mic])dnl
22 dnl m4_define([efl_version], [v_maj.v_min.v_mic])dnl
23 ])
24