summaryrefslogtreecommitdiff
path: root/.ci
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2018-08-15 16:16:14 -0400
committerStefan Schmidt <s.schmidt@samsung.com>2018-08-17 22:11:07 +0200
commit31a625cb7d58b3aa2e9513c1be747ce4d38e05ad (patch)
tree6c34d832b8d1ad196f51b3a132277345c14ddfe6 /.ci
parent791fc27c4072a79b063f3c083b1acbbc0c275c58 (diff)
ci: always use same version numbering for every build
if the version number ever changes then this destroys the entire ccache as the version is used in various places in headers which are included throughout the tree Differential Revision: https://phab.enlightenment.org/D6848
Diffstat (limited to '.ci')
-rwxr-xr-x.ci/ci-configure.sh3
-rw-r--r--.ci/efl.m4.diff24
2 files changed, 27 insertions, 0 deletions
diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index 2fea243276..bf551f53e3 100755
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -29,6 +29,9 @@ 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
32patch -p1 < .ci/efl.m4.diff
33sed -i.orig 's/AC_INIT\(.*\)efl_version-[a-zA-Z0-9]\+/AC_INIT\1efl_version/g' configure.ac
34
32if [ "$DISTRO" != "" ] ; then 35if [ "$DISTRO" != "" ] ; then
33 # Normal build test of all targets 36 # Normal build test of all targets
34 OPTS="$DEFAULT_LINUX_COPTS" 37 OPTS="$DEFAULT_LINUX_COPTS"
diff --git a/.ci/efl.m4.diff b/.ci/efl.m4.diff
new file mode 100644
index 0000000000..fda939a8ed
--- /dev/null
+++ b/.ci/efl.m4.diff
@@ -0,0 +1,24 @@
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